file reorg, pathnames.h, paths.h

SCCS-vsn: usr.bin/su/Makefile 5.3
SCCS-vsn: usr.bin/su/pathnames.h 5.2
SCCS-vsn: usr.bin/tail/Makefile 5.2
SCCS-vsn: usr.bin/talk/Makefile 5.10
SCCS-vsn: usr.bin/tee/Makefile 5.2
SCCS-vsn: usr.bin/time/Makefile 5.2
SCCS-vsn: usr.bin/true/Makefile 5.2
SCCS-vsn: usr.bin/uucp/uucico/cico.c 5.19
SCCS-vsn: usr.bin/uucp/acucntrl/acucntrl.c 5.16
SCCS-vsn: libexec/uucpd/uucpd.c 5.7
SCCS-vsn: usr.bin/uucp/libuu/uucpdefs.c 5.6
SCCS-vsn: usr.bin/uucp/uusend/uusend.c 5.3
SCCS-vsn: usr.bin/uucp/uucico/condevs.c 5.21
SCCS-vsn: usr.bin/wall/Makefile 5.2
SCCS-vsn: usr.bin/wc/Makefile 5.2
SCCS-vsn: usr.bin/what/Makefile 5.2
SCCS-vsn: usr.bin/who/Makefile 5.2

diff --git a/usr/src/libexec/uucpd/uucpd.c b/usr/src/libexec/uucpd/uucpd.c
index 6529db5..27f41c6 100644 (file)
--- a/usr/src/libexec/uucpd/uucpd.c
+++ b/usr/src/libexec/uucpd/uucpd.c
@@ -25,7 +25,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)uucpd.c    5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)uucpd.c    5.7 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -42,9 +42,8 @@ static char sccsid[] = "@(#)uucpd.c   5.6 (Berkeley) %G%";
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <pwd.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <pwd.h>

-#include <lastlog.h>
+#include "pathnames.h"

 
 

-char lastlog[] = "/usr/adm/lastlog";

 struct sockaddr_in hisctladdr;
 int hisaddrlen = sizeof hisctladdr;
 struct sockaddr_in myctladdr;
 struct sockaddr_in hisctladdr;
 int hisaddrlen = sizeof hisctladdr;
 struct sockaddr_in myctladdr;


@@ -90,7 +89,7 @@ char **argv;
        }
        if (fork())
                exit(0);
        }
        if (fork())
                exit(0);

-       if ((s=open("/dev/tty", 2)) >= 0){
+       if ((s=open(_PATH_TTY, 2)) >= 0){

                ioctl(s, TIOCNOTTY, (char *)0);
                close(s);
        }
                ioctl(s, TIOCNOTTY, (char *)0);
                close(s);
        }


@@ -222,7 +221,7 @@ dologout()
 #else  !BSDINETD
        while ((pid=wait3(&status,WNOHANG,0)) > 0) {
 #endif !BSDINETD
 #else  !BSDINETD
        while ((pid=wait3(&status,WNOHANG,0)) > 0) {
 #endif !BSDINETD

-               wtmp = open("/usr/adm/wtmp", O_WRONLY|O_APPEND);
+               wtmp = open(_PATH_WTMP, O_WRONLY|O_APPEND);

                if (wtmp >= 0) {
                        sprintf(utmp.ut_line, "uucp%.4d", pid);
                        SCPYN(utmp.ut_name, "");
                if (wtmp >= 0) {
                        sprintf(utmp.ut_line, "uucp%.4d", pid);
                        SCPYN(utmp.ut_name, "");


@@ -253,7 +252,7 @@ struct sockaddr_in *sin;
        } else
                strncpy(remotehost, inet_ntoa(sin->sin_addr),
                    sizeof (remotehost));
        } else
                strncpy(remotehost, inet_ntoa(sin->sin_addr),
                    sizeof (remotehost));

-       wtmp = open("/usr/adm/wtmp", O_WRONLY|O_APPEND);
+       wtmp = open(_PATH_WTMP, O_WRONLY|O_APPEND);

        if (wtmp >= 0) {
                /* hack, but must be unique and no tty line */
                sprintf(line, "uucp%.4d", getpid());
        if (wtmp >= 0) {
                /* hack, but must be unique and no tty line */
                sprintf(line, "uucp%.4d", getpid());


@@ -264,7 +263,7 @@ struct sockaddr_in *sin;
                (void) write(wtmp, (char *)&utmp, sizeof (utmp));
                (void) close(wtmp);
        }
                (void) write(wtmp, (char *)&utmp, sizeof (utmp));
                (void) close(wtmp);
        }

-       if ((f = open(lastlog, 2)) >= 0) {
+       if ((f = open(_PATH_LASTLOG, O_RDWR)) >= 0) {

                struct lastlog ll;
 
                time(&ll.ll_time);
                struct lastlog ll;
 
                time(&ll.ll_time);

diff --git a/usr/src/usr.bin/su/Makefile b/usr/src/usr.bin/su/Makefile
index 3ded5c8..cca1b13 100644 (file)
--- a/usr/src/usr.bin/su/Makefile
+++ b/usr/src/usr.bin/su/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.2 (Berkeley) %G%
+# @(#)Makefile 5.3 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o root -g bin -m 4755 su ${DESTDIR}/bin/su
+       install -s -o root -g bin -m 4755 su ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 su.0 ${DESTDIR}/usr/man/cat1/su.0
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 su.0 ${DESTDIR}/usr/man/cat1/su.0
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/su/pathnames.h b/usr/src/usr.bin/su/pathnames.h
index 060f0f1..b4d6596 100644 (file)
--- a/usr/src/usr.bin/su/pathnames.h
+++ b/usr/src/usr.bin/su/pathnames.h
@@ -14,8 +14,9 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)pathnames.h 5.1 (Berkeley) %G%
+ *     @(#)pathnames.h 5.2 (Berkeley) %G%

  */
 
  */
 

-#define        _PATH_BSHELL            "/bin/sh"
-#define        _PATH_SEARCHPATH        "PATH=:/usr/ucb:/bin:/usr/bin"
+#include <paths.h>
+
+#define        _PATH_SEARCHPATH        "PATH=:/bin:/usr/bin"

diff --git a/usr/src/usr.bin/tail/Makefile b/usr/src/usr.bin/tail/Makefile
index ecc3c33..64128d3 100644 (file)
--- a/usr/src/usr.bin/tail/Makefile
+++ b/usr/src/usr.bin/tail/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 tail ${DESTDIR}/usr/ucb
+       install -s -o bin -g bin -m 755 tail ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/talk/Makefile b/usr/src/usr.bin/talk/Makefile
index af3d42e..1f20cfe 100644 (file)
--- a/usr/src/usr.bin/talk/Makefile
+++ b/usr/src/usr.bin/talk/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    5.9 (Berkeley) %G%
+#      @(#)Makefile    5.10 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a


@@ -39,7 +39,7 @@ depend: ${SRCS}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 talk ${DESTDIR}/usr/ucb/talk
+       install -s -o bin -g bin -m 755 talk ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 talk.0 ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 talk.0 ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/tee/Makefile b/usr/src/usr.bin/tee/Makefile
index b31cf0a..25746b6 100644 (file)
--- a/usr/src/usr.bin/tee/Makefile
+++ b/usr/src/usr.bin/tee/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 tee ${DESTDIR}/bin
+       install -s -o bin -g bin -m 755 tee ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/time/Makefile b/usr/src/usr.bin/time/Makefile
index 6cbccb0..0bbf981 100644 (file)
--- a/usr/src/usr.bin/time/Makefile
+++ b/usr/src/usr.bin/time/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 time ${DESTDIR}/bin
+       install -s -o bin -g bin -m 755 time ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/true/Makefile b/usr/src/usr.bin/true/Makefile
index bd9b60f..1d3912a 100644 (file)
--- a/usr/src/usr.bin/true/Makefile
+++ b/usr/src/usr.bin/true/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 true ${DESTDIR}/bin
+       install -s -o bin -g bin -m 755 true ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/uucp/acucntrl/acucntrl.c b/usr/src/usr.bin/uucp/acucntrl/acucntrl.c
index 463ce9d..20f180f 100644 (file)
--- a/usr/src/usr.bin/uucp/acucntrl/acucntrl.c
+++ b/usr/src/usr.bin/uucp/acucntrl/acucntrl.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)acucntrl.c 5.15    (Berkeley) %G%";
+static char sccsid[] = "@(#)acucntrl.c 5.16    (Berkeley) %G%";

 #endif
 
 /*  acucntrl - turn around tty line between dialin and dialout
 #endif
 
 /*  acucntrl - turn around tty line between dialin and dialout


@@ -19,28 +19,28 @@ static char sccsid[] = "@(#)acucntrl.c      5.15    (Berkeley) %G%";
  * Operation:
  *   disable (i.e. setup for dialing out)
  *     (1) check input arguments
  * Operation:
  *   disable (i.e. setup for dialing out)
  *     (1) check input arguments

- *     (2) look in /etc/utmp to check that the line is not in use by another
+ *     (2) look in _PATH_UTMP to check that the line is not in use by another

  *     (3) disable modem control on terminal
  *     (4) check for carrier on device
  *     (5) change owner of device to real id
  *     (3) disable modem control on terminal
  *     (4) check for carrier on device
  *     (5) change owner of device to real id

- *     (6) edit /etc/ttys,  changing the first character of the appropriate
+ *     (6) edit _PATH_TTYS, changing the first character of the appropriate

  *         line to 0
  *     (7) send a hangup to process 1 to poke init to disable getty
  *         line to 0
  *     (7) send a hangup to process 1 to poke init to disable getty

- *     (8) post uid name in capitals in /etc/utmp to let world know device has
- *         been grabbed
+ *     (8) post uid name in capitals in _PATH_UTMP to let world know device
+ *         has been grabbed

  *     (9) make sure that DTR is on
  *
  *   enable (i.e.) restore for dialin
  *     (1) check input arguments
  *     (9) make sure that DTR is on
  *
  *   enable (i.e.) restore for dialin
  *     (1) check input arguments

- *     (2) look in /etc/utmp to check that the line is not in use by another
+ *     (2) look in _PATH_UTMP to check that the line is not in use by another

  *     (3) make sure modem control on terminal is disabled
  *     (4) turn off DTR to make sure line is hung up
  *     (5) condition line: clear exclusive use and set hangup on close modes
  *     (6) turn on modem control
  *     (3) make sure modem control on terminal is disabled
  *     (4) turn off DTR to make sure line is hung up
  *     (5) condition line: clear exclusive use and set hangup on close modes
  *     (6) turn on modem control

- *     (7) edit /etc/ttys,  changing the first character of the appropriate
+ *     (7) edit _PATH_TTYS, changing the first character of the appropriate

  *         line to 1
  *     (8) send a hangup to process 1 to poke init to enable getty
  *         line to 1
  *     (8) send a hangup to process 1 to poke init to enable getty

- *     (9) clear uid name for /etc/utmp
+ *     (9) clear uid name for _PATH_UTMP

  */
 
 /* #define SENSECARRIER */
  */
 
 /* #define SENSECARRIER */


@@ -64,6 +64,7 @@ static char sccsid[] = "@(#)acucntrl.c        5.15    (Berkeley) %G%";
 #include <pwd.h>
 #include <stdio.h>
 #include <sys/file.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <sys/file.h>

+#include "pathnames.h"

 
 #define NDZLINE        8       /* lines/dz */
 #define NDHLINE        16      /* lines/dh */
 
 #define NDZLINE        8       /* lines/dz */
 #define NDHLINE        16      /* lines/dh */


@@ -112,14 +113,13 @@ struct nlist nl[] = {
 #define ENABLE 1
 #define DISABLE        0
 
 #define ENABLE 1
 #define DISABLE        0
 

-char Etcutmp[] = "/etc/utmp";
-char Etcttys[] = "/etc/ttys";
+char Etcttys[] = _PATH_TTYS;

 #ifdef BSD4_3
 FILE *ttysfile, *nttysfile;
 #ifdef BSD4_3
 FILE *ttysfile, *nttysfile;

-char NEtcttys[] = "/etc/ttys.new";
+char NEtcttys[] = _PATH_NEWTTYS;

 extern long ftell();
 #endif BSD4_3
 extern long ftell();
 #endif BSD4_3

-char Devhome[] = "/dev";
+char Devhome[] = _PATH_DEV;

 
 char usage[] = "Usage: acucntrl {dis|en}able ttydX\n";
 
 
 char usage[] = "Usage: acucntrl {dis|en}able ttydX\n";
 


@@ -171,7 +171,7 @@ int argc; char *argv[];
 
 #ifdef vax
        /* Get nlist info */
 
 #ifdef vax
        /* Get nlist info */

-       nlist("/vmunix", nl);
+       nlist(_PATH_UNIX, nl);

 #endif vax
 
        /* Chdir to /dev */
 #endif vax
 
        /* Chdir to /dev */


@@ -202,9 +202,9 @@ int argc; char *argv[];
        } while (*p++ && i<NAMSIZ);
 
        /* check to see if line is being used */
        } while (*p++ && i<NAMSIZ);
 
        /* check to see if line is being used */

-       if( (etcutmp = open(Etcutmp, 2)) < 0) {
+       if( (etcutmp = open(_PATH_UTMP, 2)) < 0) {

                fprintf(stderr, "On open %s open: %s\n",
                fprintf(stderr, "On open %s open: %s\n",

-                       Etcutmp, sys_errlist[errno]);
+                       _PATH_UTMP, sys_errlist[errno]);

                exit(1);
        }
 
                exit(1);
        }
 


@@ -364,11 +364,11 @@ char *device, *name;
        strncpy(utmp.ut_line, device, LINSIZ);
        strncpy(utmp.ut_name, name,  NAMSIZ);
        if (lseek(etcutmp, utmploc, 0) < 0)
        strncpy(utmp.ut_line, device, LINSIZ);
        strncpy(utmp.ut_name, name,  NAMSIZ);
        if (lseek(etcutmp, utmploc, 0) < 0)

-               fprintf(stderr, "on lseek in /etc/utmp: %s",
-                       sys_errlist[errno]);
+               fprintf(stderr, "on lseek in %s: %s",
+                       _PATH_UTMP, sys_errlist[errno]);

        if (write(etcutmp, (char *)&utmp, sizeof(utmp)) < 0)
        if (write(etcutmp, (char *)&utmp, sizeof(utmp)) < 0)

-               fprintf(stderr, "on write in /etc/utmp: %s",
-                       sys_errlist[errno]);
+               fprintf(stderr, "on write in %s: %s",
+                       _PATH_UTMP, sys_errlist[errno]);

 }
        
 /* poke process 1 and wait for it to do its thing */
 }
        
 /* poke process 1 and wait for it to do its thing */


@@ -398,11 +398,11 @@ char *uname, *device; int enable;
        do {
                sleep(1);
                if (lseek(etcutmp, utmploc, 0) < 0)
        do {
                sleep(1);
                if (lseek(etcutmp, utmploc, 0) < 0)

-                       fprintf(stderr, "On lseek in /etc/utmp: %s",
-                               sys_errlist[errno]);
+                       fprintf(stderr, "On lseek in %s: %s",
+                               _PATH_UTMP, sys_errlist[errno]);

                if (read(etcutmp, (char *)&utmp, sizeof utmp) < 0)
                if (read(etcutmp, (char *)&utmp, sizeof utmp) < 0)

-                       fprintf(stderr, "On read from /etc/utmp: %s",
-                               sys_errlist[errno]);
+                       fprintf(stderr, "On read from %s: %s",
+                               _PATH_UTMP, sys_errlist[errno]);

        } while (utmp.ut_name[0] != '\0' && --i > 0);
 }
 
        } while (utmp.ut_name[0] != '\0' && --i > 0);
 }
 


@@ -460,7 +460,7 @@ char *device;
        exit(1);
 }
 
        exit(1);
 }
 

-/* modify appropriate line in /etc/ttys to turn on/off the device */
+/* modify appropriate line in _PATH_TTYS to turn on/off the device */

 settys(enable)
 int enable;
 {
 settys(enable)
 int enable;
 {


@@ -494,7 +494,8 @@ int enable;
                        cp++;
        }
        if (*cp == '\0') {
                        cp++;
        }
        if (*cp == '\0') {

-               fprintf(stderr,"Badly formatted line in /etc/ttys:\n%s", lbuf);
+               fprintf(stderr,"Badly formatted line in %s:\n%s",
+                   _PATH_TTYS, lbuf);

                exit(1);
        }
        c1 = *--cp;
                exit(1);
        }
        c1 = *--cp;


@@ -503,7 +504,8 @@ int enable;
        while (*cp && *cp != ' ' && *cp != '\t' && *cp != '\n')
                cp++;
        if (*cp == '\0') {
        while (*cp && *cp != ' ' && *cp != '\t' && *cp != '\n')
                cp++;
        if (*cp == '\0') {

-               fprintf(stderr,"Badly formatted line in /etc/ttys:\n%s", lbuf);
+               fprintf(stderr,"Badly formatted line in %s:\n%s",
+                   _PATH_TTYS, lbuf);

                exit(1);
        }
        c2 = *cp;
                exit(1);
        }
        c2 = *cp;


@@ -582,7 +584,7 @@ char *device;
        exit(1);
 }
 
        exit(1);
 }
 

-/* modify appropriate line in /etc/ttys to turn on/off the device */
+/* modify appropriate line in _PATH_TTYS to turn on/off the device */

 settys(enable)
 int enable;
 {
 settys(enable)
 int enable;
 {


@@ -657,8 +659,9 @@ char *ttyline; int enable;
                return(-1);
        }
 
                return(-1);
        }
 

-       if((kmem = open("/dev/kmem", 2)) < 0) {
-               fprintf(stderr, "/dev/kmem open: %s\n", sys_errlist[errno]);
+       if((kmem = open(_PATH_KMEM, 2)) < 0) {
+               fprintf(stderr, "%s open: %s\n", _PATH_KMEM,
+                   sys_errlist[errno]);

                return(-1);
        }
 
                return(-1);
        }
 

diff --git a/usr/src/usr.bin/uucp/libuu/uucpdefs.c b/usr/src/usr.bin/uucp/libuu/uucpdefs.c
index ce88068..4a99eb1 100644 (file)
--- a/usr/src/usr.bin/uucp/libuu/uucpdefs.c
+++ b/usr/src/usr.bin/uucp/libuu/uucpdefs.c
@@ -1,8 +1,9 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)uucpdefs.c 5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)uucpdefs.c 5.6 (Berkeley) %G%";

 #endif
 
 #include "uucp.h"
 #endif
 
 #include "uucp.h"

+#include "pathnames.h"

 
 char Progname[64];
 int Ifn, Ofn;
 
 char Progname[64];
 int Ifn, Ofn;


@@ -23,9 +24,9 @@ int IsTcpIp = 0;      /* 1 == TCP/IP connection, else 0.  kludge to suppress ioctl */
 char MaxGrade = '\177';
 char DefMaxGrade = '\177';
 int nologinflag = 0;
 char MaxGrade = '\177';
 char DefMaxGrade = '\177';
 int nologinflag = 0;

-char NOLOGIN[] = "/etc/nologin";
+char NOLOGIN[] = _PATH_NOLOGIN;

 
 /* Save some data space */
 
 /* Save some data space */

-char DEVNULL[] = "/dev/null";
+char DEVNULL[] = _PATH_DEVNULL;

 char CANTOPEN[] = "CAN'T OPEN";
 char _FAILED[] = "FAILED";
 char CANTOPEN[] = "CAN'T OPEN";
 char _FAILED[] = "FAILED";

diff --git a/usr/src/usr.bin/uucp/uucico/cico.c b/usr/src/usr.bin/uucp/uucico/cico.c
index 2db8ff9..0a10f6e 100644 (file)
--- a/usr/src/usr.bin/uucp/uucico/cico.c
+++ b/usr/src/usr.bin/uucp/uucico/cico.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)cico.c     5.18    (Berkeley) %G%";
+static char sccsid[] = "@(#)cico.c     5.19    (Berkeley) %G%";

 #endif
 
 #include <signal.h>
 #endif
 
 #include <signal.h>


@@ -26,6 +26,7 @@ static char sccsid[] = "@(#)cico.c    5.18    (Berkeley) %G%";
 #endif
 #include "uust.h"
 #include "uusub.h"
 #endif
 #include "uust.h"
 #include "uusub.h"

+#include "pathnames.h"

 
 #if defined(VMS) && defined(BSDTCP)
 #define NOGETPEER
 
 #if defined(VMS) && defined(BSDTCP)
 #define NOGETPEER


@@ -208,7 +209,7 @@ char **envp;
         * detach uucico from controlling terminal
         * to defend against rlogind sending us a SIGKILL (!!!)
         */
         * detach uucico from controlling terminal
         * to defend against rlogind sending us a SIGKILL (!!!)
         */

-       if (Role == MASTER && (ret = open("/dev/tty", 2)) >= 0) {
+       if (Role == MASTER && (ret = open(_PATH_TTY, 2)) >= 0) {

                ioctl(ret, TIOCNOTTY, STBNULL);
                close(ret);
        }
                ioctl(ret, TIOCNOTTY, STBNULL);
                close(ret);
        }

diff --git a/usr/src/usr.bin/uucp/uucico/condevs.c b/usr/src/usr.bin/uucp/uucico/condevs.c
index 31d7997..9308af3 100644 (file)
--- a/usr/src/usr.bin/uucp/uucico/condevs.c
+++ b/usr/src/usr.bin/uucp/uucico/condevs.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)condevs.c  5.20    (Berkeley) %G%";
+static char sccsid[] = "@(#)condevs.c  5.21    (Berkeley) %G%";

 #endif
 
 extern int errno;
 #endif
 
 extern int errno;


@@ -28,6 +28,7 @@ extern char *sys_errlist[];
  */
 
 #include "condevs.h"
  */
 
 #include "condevs.h"

+#include "pathnames.h"

 
 struct condev condevs[] = {
        { "DIR", "direct", diropn, nulldev, dircls },
 
 struct condev condevs[] = {
        { "DIR", "direct", diropn, nulldev, dircls },


@@ -195,7 +196,7 @@ register char *flds[];
                return CF_NODEV;
        }
 
                return CF_NODEV;
        }
 

-       sprintf(dcname, "/dev/%s", dev.D_line);
+       sprintf(dcname, "%s/%s", _PATH_DEV, dev.D_line);

        if (setjmp(Sjbuf)) {
                DEBUG(4, "Open timed out\n", CNULL);
                delock(dev.D_line);
        if (setjmp(Sjbuf)) {
                DEBUG(4, "Open timed out\n", CNULL);
                delock(dev.D_line);


@@ -546,7 +547,7 @@ char *type, *dev;
                DEBUG(4, " %s\n", dev);
                close(fildes[0]);
                close(0); close(1); close(2);
                DEBUG(4, " %s\n", dev);
                close(fildes[0]);
                close(0); close(1); close(2);

-               open("/dev/null",0);
+               open(_PATH_DEVNULL,0);

                dup(fildes[1]); dup(fildes[1]);
                setuid(geteuid());      /* for chown(uid()) in acu program */
                execl(DIALINOUT, "acu", type, dev, Rmtname, (char *)0);
                dup(fildes[1]); dup(fildes[1]);
                setuid(geteuid());      /* for chown(uid()) in acu program */
                execl(DIALINOUT, "acu", type, dev, Rmtname, (char *)0);

diff --git a/usr/src/usr.bin/uucp/uusend/uusend.c b/usr/src/usr.bin/uucp/uusend/uusend.c
index a028505..0966066 100644 (file)
--- a/usr/src/usr.bin/uucp/uusend/uusend.c
+++ b/usr/src/usr.bin/uucp/uusend/uusend.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)uusend.c   5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)uusend.c   5.3 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -22,10 +22,10 @@ static char sccsid[] = "@(#)uusend.c        5.2 (Berkeley) %G%";
  * can now be a directory.     June 1983  CCW
  */
 
  * can now be a directory.     June 1983  CCW
  */
 

-#include <stdio.h>
-#include <pwd.h>

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/stat.h>

+#include <stdio.h>
+#include <pwd.h>

 
 /*
  * define RECOVER to permit requests like 'uusend file sys1!sys2!~uucp'
 
 /*
  * define RECOVER to permit requests like 'uusend file sys1!sys2!~uucp'

diff --git a/usr/src/usr.bin/wall/Makefile b/usr/src/usr.bin/wall/Makefile
index 54cc20a..d06e515 100644 (file)
--- a/usr/src/usr.bin/wall/Makefile
+++ b/usr/src/usr.bin/wall/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -37,8 +37,8 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g tty -m 2755 wall ${DESTDIR}/bin/wall
-       install -c -o bin -g bin -m 444 wall.0 ${DESTDIR}/usr/man/cat8/wall.0
+       install -s -o bin -g tty -m 2755 wall ${DESTDIR}/usr/bin
+       install -c -o bin -g bin -m 444 wall.0 ${DESTDIR}/usr/man/cat1

 
 lint: ${SRCS}
        lint ${CFLAGS} ${SRCS}
 
 lint: ${SRCS}
        lint ${CFLAGS} ${SRCS}

diff --git a/usr/src/usr.bin/wc/Makefile b/usr/src/usr.bin/wc/Makefile
index a2f1c49..b66725c 100644 (file)
--- a/usr/src/usr.bin/wc/Makefile
+++ b/usr/src/usr.bin/wc/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 wc ${DESTDIR}/usr/ucb
+       install -s -o bin -g bin -m 755 wc ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/what/Makefile b/usr/src/usr.bin/what/Makefile
index 055e554..9a2a126 100644 (file)
--- a/usr/src/usr.bin/what/Makefile
+++ b/usr/src/usr.bin/what/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 what ${DESTDIR}/usr/ucb
+       install -s -o bin -g bin -m 755 what ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/usr.bin/who/Makefile b/usr/src/usr.bin/who/Makefile
index 0ed65a3..0e5b3fa 100644 (file)
--- a/usr/src/usr.bin/who/Makefile
+++ b/usr/src/usr.bin/who/Makefile
@@ -14,7 +14,7 @@
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #
 # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
 # FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#)Makefile 5.1 (Berkeley) %G%
+# @(#)Makefile 5.2 (Berkeley) %G%

 #
 
 CFLAGS=        -O
 #
 
 CFLAGS=        -O


@@ -38,7 +38,7 @@ depend: ${SRCS}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep -p ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 who ${DESTDIR}/bin
+       install -s -o bin -g bin -m 755 who ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}