diff options
| -rw-r--r-- | include/paths.h | 1 | ||||
| -rw-r--r-- | sbin/dump/pathnames.h | 3 | ||||
| -rw-r--r-- | sbin/restore/dirs.c | 2 | ||||
| -rw-r--r-- | sbin/restore/main.c | 2 | ||||
| -rw-r--r-- | sbin/restore/pathnames.h | 43 | ||||
| -rw-r--r-- | sbin/restore/tape.c | 2 | ||||
| -rw-r--r-- | usr.bin/tcopy/pathnames.h | 36 | ||||
| -rw-r--r-- | usr.bin/tcopy/tcopy.c | 3 |
8 files changed, 7 insertions, 85 deletions
diff --git a/include/paths.h b/include/paths.h index 0109ac6..9894e00 100644 --- a/include/paths.h +++ b/include/paths.h @@ -49,6 +49,7 @@ #define _PATH_BSHELL "/bin/sh" #define _PATH_CONSOLE "/dev/console" #define _PATH_CSHELL "/bin/csh" +#define _PATH_DEFTAPE "/dev/sa0" #define _PATH_DEVDB "/var/run/dev.db" #define _PATH_DEVNULL "/dev/null" #define _PATH_DEVZERO "/dev/zero" diff --git a/sbin/dump/pathnames.h b/sbin/dump/pathnames.h index 5a4448b..10defb2 100644 --- a/sbin/dump/pathnames.h +++ b/sbin/dump/pathnames.h @@ -31,11 +31,12 @@ * SUCH DAMAGE. * * @(#)pathnames.h 8.1 (Berkeley) 6/5/93 + * $FreeBSD$ */ #include <paths.h> -#define _PATH_DEFTAPE "/dev/rsa0" +#define _PATH_DEFTAPE "/dev/sa0" #define _PATH_DTMP "/etc/dtmp" #define _PATH_DUMPDATES "/etc/dumpdates" #define _PATH_LOCK "/tmp/dumplockXXXXXX" diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c index d7faa16..53743a8 100644 --- a/sbin/restore/dirs.c +++ b/sbin/restore/dirs.c @@ -55,12 +55,12 @@ static const char rcsid[] = #include <err.h> #include <errno.h> +#include <paths.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include "pathnames.h" #include "restore.h" #include "extern.h" diff --git a/sbin/restore/main.c b/sbin/restore/main.c index f6a6872..4637269 100644 --- a/sbin/restore/main.c +++ b/sbin/restore/main.c @@ -52,11 +52,11 @@ static const char rcsid[] = #include <protocols/dumprestore.h> #include <err.h> +#include <paths.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include "pathnames.h" #include "restore.h" #include "extern.h" diff --git a/sbin/restore/pathnames.h b/sbin/restore/pathnames.h deleted file mode 100644 index 37da075..0000000 --- a/sbin/restore/pathnames.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)pathnames.h 8.2 (Berkeley) 1/21/94 - */ - -#include <paths.h> - -#define _PATH_DEFTAPE "/dev/rsa0" diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c index fdae506..07d565c 100644 --- a/sbin/restore/tape.c +++ b/sbin/restore/tape.c @@ -54,6 +54,7 @@ static const char rcsid[] = #include <protocols/dumprestore.h> #include <errno.h> +#include <paths.h> #include <setjmp.h> #include <stdio.h> #include <stdlib.h> @@ -63,7 +64,6 @@ static const char rcsid[] = #include "restore.h" #include "extern.h" -#include "pathnames.h" static long fssize = MAXBSIZE; static int mt = -1; diff --git a/usr.bin/tcopy/pathnames.h b/usr.bin/tcopy/pathnames.h deleted file mode 100644 index 7c08559..0000000 --- a/usr.bin/tcopy/pathnames.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)pathnames.h 8.1 (Berkeley) 6/6/93 - */ - -#define _PATH_DEFTAPE "/dev/rsa0" diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c index 18be38f..d291537 100644 --- a/usr.bin/tcopy/tcopy.c +++ b/usr.bin/tcopy/tcopy.c @@ -53,14 +53,13 @@ static const char rcsid[] = #include <err.h> #include <errno.h> #include <fcntl.h> +#include <paths.h> #include <signal.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include "pathnames.h" - #define MAXREC (64 * 1024) #define NOCOUNT (-2) |
