Subject: The Grand Reorganization Begins (#340 - 6 of 8) Index: MANY/ 2.11BSD Description: The directory organization has never been brought up to date. UNIX systems for some time now have ceased using /usr/lib and /etc as dumping grounds for everything from fonts to print spoolers. For some time systems have used /sbin, /usr/sbin, /usr/libexec, /usr/share, and so on rather than dumping everything into /usr/lib or /etc. Repeat-By: By observation and/or having to admin a mixture of 2.11BSD systems and systems which use the post 1989/90 directory hierarchy. Alternatively you may have, over the years, been one of the folks who has asked me "when is the directory layout going to be updated to reflect current 'standards'?" Fix: This is #340 (part 6 of 8). Please see #335 (part 1) for the installation instructions. Updates #335 thru #342 comprise the 8 part kit which moves everything that is not a library out of /usr/lib. The relocation of misplaced items in /etc is not, with one exception, done at this time but will be forthcoming soon. The good news is that the update can be done "in place" - it will not be necessary to dump and reload the system. The "bad news" is that a "make world" (recompile of the system from sources) is necessary. The manifest is as follows: Part Patch# Contents ---- ----- -------- 1 335 Manifest of files. Introduction/tour. Instructions. Shell scripts to perform pre- and post- processing of the system. Suggested changes to configuration files in /etc. A 'shar' file containing new files to be added to the system (Makefiles mostly). 2-8 336-342 Patch files. Broken into ~64kb pieces. --------------------------cut here, save as /usr/tmp/340-------------------- *** /usr/src/sys/pdpdist/rc.local.old Thu Dec 24 18:22:07 1992 --- /usr/src/sys/pdpdist/rc.local Fri Oct 25 21:21:13 1996 *************** *** 10,21 **** #if [ $INET = YES -a -f /etc/timed ]; then # timed & echo -n ' timed' >/dev/console 2>&1 #fi ! if [ -f /usr/lib/sendmail ]; then (cd /usr/spool/mqueue; rm -f lf*) if [ $INET = YES ]; then ! /usr/lib/sendmail -bd -q30m; echo -n ' sendmail'>/dev/console 2>&1 else ! /usr/lib/sendmail -q30m; echo -n ' sendmail' >/dev/console 2>&1 fi fi echo '.' >/dev/console 2>&1 --- 10,21 ---- #if [ $INET = YES -a -f /etc/timed ]; then # timed & echo -n ' timed' >/dev/console 2>&1 #fi ! if [ -f /usr/sbin/sendmail ]; then (cd /usr/spool/mqueue; rm -f lf*) if [ $INET = YES ]; then ! /usr/sbin/sendmail -bd -q30m; echo -n ' sendmail'>/dev/console 2>&1 else ! /usr/sbin/sendmail -q30m; echo -n ' sendmail' >/dev/console 2>&1 fi fi echo '.' >/dev/console 2>&1 *** /usr/src/sys/pdpdist/rc.old Thu Dec 24 18:21:55 1992 --- /usr/src/sys/pdpdist/rc Wed Oct 23 15:28:48 1996 *************** *** 67,73 **** fi umount -a - cp /dev/null /etc/mtab mount -a >/dev/console 2>&1 if [ ${RAMSIZE} != 0 ] --- 67,72 ---- *************** *** 104,110 **** fi echo preserving editor files >/dev/console 2>&1 ! (cd /tmp; /usr/lib/ex3.7preserve -a) echo clearing /tmp >/dev/console 2>&1 (cd /tmp; find . ! -name . ! -name lost+found ! -name quotas -exec rm -r {} \; ) --- 103,109 ---- fi echo preserving editor files >/dev/console 2>&1 ! (cd /tmp; /usr/sbin/expreserve -a) echo clearing /tmp >/dev/console 2>&1 (cd /tmp; find . ! -name . ! -name lost+found ! -name quotas -exec rm -r {} \; ) *************** *** 136,147 **** rwhod; echo -n ' rwhod' >/dev/console 2>&1 fi rm -f /dev/printer ! /usr/lib/lpd; echo -n ' printer' >/dev/console 2>&1 echo '.' >/dev/console 2>&1 else # lpd will run even with out networking. echo starting lpd >/dev/console 2>&1 ! /usr/lib/lpd fi . /etc/rc.local --- 135,146 ---- rwhod; echo -n ' rwhod' >/dev/console 2>&1 fi rm -f /dev/printer ! /usr/sbin/lpd; echo -n ' printer' >/dev/console 2>&1 echo '.' >/dev/console 2>&1 else # lpd will run even with out networking. echo starting lpd >/dev/console 2>&1 ! /usr/sbin/lpd fi . /etc/rc.local *** /usr/src/sys/pdpstand/Makefile.old Tue Dec 5 20:26:35 1995 --- /usr/src/sys/pdpstand/Makefile Mon Oct 28 20:19:32 1996 *************** *** 17,22 **** --- 17,23 ---- # to install /sys/pdpdist/dtab (or /etc/dtab.save) as ${ROOT}/etc/dtab # so that the GENERIC kernel can find the tape device. # + # 1996/10/28 - added usr/sbin, usr/libexec and corresponding src directories. # 1995/12/05 - add RX02 driver. # 1995/06/05 - add disklabel program to Makefile. # 1995/06/01 - use split I/D for icheck and restor. *************** *** 63,83 **** ./maketape /dev/nr${TAPE} maketape.data dd if=${DUMP} of=/dev/nr${TAPE} bs=20b cd ${ROOT}/usr; tar cfb /dev/nr${TAPE} 20 \ ! adm bin dict doc games guest hosts include ingres lib \ ! local man msgs new old preserve pub skel spool tmp ucb cd ${ROOT}/usr/src; tar cfb /dev/nr${TAPE} 20 \ sys include cd ${ROOT}/usr/src; tar cfb /dev/r${TAPE} 20 \ Makefile asm.sed asm.sed.pdp asm.sed.vax bin etc games \ ! lib local man new old ucb usr.bin usr.lib tape1: ${ALL} ${DUMP} ./maketape /dev/nr${TAPE} maketape.data dd if=${DUMP} of=/dev/nr${TAPE} bs=20b cd ${ROOT}/usr; tar cfb /dev/nr${TAPE} 20 \ ! adm bin dict doc games guest hosts include ingres lib \ ! local man msgs new old preserve pub skel spool tmp ucb ! cd ${ROOT}/usr/src; tar cfb /dev/r${TAPE} 20 \ sys include switch_tapes: FRC --- 64,87 ---- ./maketape /dev/nr${TAPE} maketape.data dd if=${DUMP} of=/dev/nr${TAPE} bs=20b cd ${ROOT}/usr; tar cfb /dev/nr${TAPE} 20 \ ! adm bin crash dict doc games guest hosts include ingres \ ! lib libdata libexec local man msgs new old preserve pub \ ! sbin share skel spool tmp ucb cd ${ROOT}/usr/src; tar cfb /dev/nr${TAPE} 20 \ sys include cd ${ROOT}/usr/src; tar cfb /dev/r${TAPE} 20 \ Makefile asm.sed asm.sed.pdp asm.sed.vax bin etc games \ ! lib libexec local man new old sbin share ucb usr.bin \ ! usr.lib usr.sbin tape1: ${ALL} ${DUMP} ./maketape /dev/nr${TAPE} maketape.data dd if=${DUMP} of=/dev/nr${TAPE} bs=20b cd ${ROOT}/usr; tar cfb /dev/nr${TAPE} 20 \ ! adm bin crash dict doc games guest hosts include ingres \ ! lib libdata libexec local man msgs new old preserve pub \ ! sbin share skel spool tmp ucb ! cd ${ROOT}/usr/src; tar cfb /dev/nr${TAPE} 20 \ sys include switch_tapes: FRC *************** *** 89,95 **** tape2: cd ${ROOT}/usr/src; tar cfb /dev/r${TAPE} 20 \ Makefile asm.sed asm.sed.pdp asm.sed.vax bin etc games \ ! lib local man new old ucb usr.bin usr.lib ${DUMP}: @echo "You must make a dump of the root file system first." --- 93,100 ---- tape2: cd ${ROOT}/usr/src; tar cfb /dev/r${TAPE} 20 \ Makefile asm.sed asm.sed.pdp asm.sed.vax bin etc games \ ! lib libexec local man new old sbin share ucb usr.bin \ ! usr.lib usr.sbin ${DUMP}: @echo "You must make a dump of the root file system first." *** /usr/src/ucb/Mail/Makefile.old Thu Jan 6 21:53:20 1994 --- /usr/src/ucb/Mail/Makefile Tue Oct 22 20:14:19 1996 *************** *** 1,4 **** ! # @(#)Makefile 5.16 (Berkeley) 6/19/91 SRCS= version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \ getname.c head.c v7.local.c lex.c list.c main.c names.c popen.c \ --- 1,4 ---- ! # @(#)Makefile 5.16.1 (2.11BSD) 1996/10/22 SRCS= version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \ getname.c head.c v7.local.c lex.c list.c main.c names.c popen.c \ *************** *** 39,44 **** --- 39,45 ---- install -s Mail ${DESTDIR}/usr/ucb/Mail install -s fmt ${DESTDIR}/usr/ucb/fmt cd ${DESTDIR}/usr/ucb; rm -f mail; ln Mail mail + install -c -m 444 Mail.rc ${DESTDIR}/etc/Mail.rc tags: $(SRCS) ${CTAGS} $(SRCS); *** /usr/src/ucb/Mail/main.c.old Thu Oct 22 13:50:28 1992 --- /usr/src/ucb/Mail/main.c Wed Oct 23 15:37:45 1996 *************** *** 35,41 **** char copyright[] = "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; ! static char sccsid[] = "@(#)main.c 5.28 (Berkeley) 4/1/91"; #endif #include "rcv.h" --- 35,41 ---- char copyright[] = "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; ! static char sccsid[] = "@(#)main.c 5.28.1 (2.11BSD) 1996/10/23"; #endif #include "rcv.h" *************** *** 139,145 **** break; case 'n': /* ! * User doesn't want to source /usr/lib/Mail.rc */ nosrc++; break; --- 139,145 ---- break; case 'n': /* ! * User doesn't want to source /etc/Mail.rc */ nosrc++; break; *** /usr/src/ucb/Mail/pathnames.h.old Sat Jun 11 17:55:50 1994 --- /usr/src/ucb/Mail/pathnames.h Wed Oct 23 15:39:23 1996 *************** *** 30,36 **** * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ! * @(#)pathnames.h 5.14.1 (2.11BSD GTE) 6/11/94 */ #include --- 30,36 ---- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ! * @(#)pathnames.h 5.14.2 (2.11BSD GTE) 1996/10/23 */ #include *************** *** 37,45 **** #define _PATH_EX "/usr/ucb/ex" #define _PATH_VI "/usr/ucb/vi" ! #define _PATH_HELP "/usr/lib/Mail.help" ! #define _PATH_TILDE "/usr/lib/Mail.tildehelp" #define _PATH_MAIL_LOG "/usr/spool/mqueue/syslog" ! #define _PATH_MASTER_RC "/usr/lib/Mail.rc" #define _PATH_MORE "/usr/ucb/more" #define _PATH_MAILDIR "/usr/spool/mail" --- 37,45 ---- #define _PATH_EX "/usr/ucb/ex" #define _PATH_VI "/usr/ucb/vi" ! #define _PATH_HELP "/usr/share/misc/Mail.help" ! #define _PATH_TILDE "/usr/share/misc/Mail.tildehelp" #define _PATH_MAIL_LOG "/usr/spool/mqueue/syslog" ! #define _PATH_MASTER_RC "/etc/Mail.rc" #define _PATH_MORE "/usr/ucb/more" #define _PATH_MAILDIR "/usr/spool/mail" *** /usr/src/ucb/error/error.h.old Mon Feb 16 22:07:41 1987 --- /usr/src/ucb/error/error.h Wed Oct 23 15:40:55 1996 *************** *** 3,9 **** * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * ! * @(#)error.h 5.1 (Berkeley) 5/31/85 */ typedef int boolean; --- 3,9 ---- * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * ! * @(#)error.h 5.1.1 (2.11BSD) 1996/10/23 */ typedef int boolean; *************** *** 142,149 **** */ #define IG_FILE1 "llib-lc" #define IG_FILE2 "llib-port" ! #define IG_FILE3 "/usr/lib/llib-lc" ! #define IG_FILE4 "/usr/lib/llib-port" #define ERRORNAME "/.errorrc" int nignored; --- 142,149 ---- */ #define IG_FILE1 "llib-lc" #define IG_FILE2 "llib-port" ! #define IG_FILE3 "/usr/share/lint/llib-lc" ! #define IG_FILE4 "/usr/share/lint/llib-port" #define ERRORNAME "/.errorrc" int nignored; *** /usr/src/ucb/ex/Makefile.old Tue Dec 20 08:48:22 1994 --- /usr/src/ucb/ex/Makefile Sat Oct 26 22:26:38 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 7.13.1.2 (2.11BSD GTE) 12/9/94 # VERSION=3.7 # --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 7.13.1.3 (2.11BSD GTE) 1996/10/23 # VERSION=3.7 # *************** *** 24,31 **** # If your system expands tabs to 4 spaces you should -DTABS=4 below # BINDIR= /usr/ucb ! NBINDIR=/usr/new ! LIBDIR= /usr/lib FOLD= ${BINDIR}/fold CTAGS= ${BINDIR}/ctags XSTR= ${BINDIR}/xstr --- 24,31 ---- # If your system expands tabs to 4 spaces you should -DTABS=4 below # BINDIR= /usr/ucb ! SBINDIR= /usr/sbin ! MISCDIR= /usr/share/misc FOLD= ${BINDIR}/fold CTAGS= ${BINDIR}/ctags XSTR= ${BINDIR}/xstr *************** *** 63,69 **** # ifdef VMUNIX # ${CC} -E ${CFLAGS} $*.c | ${XSTR} -c - # else ! ${MKSTR} - ex${VERSION}strings x $*.c ${CC} -E ${CFLAGS} x$*.c | ${XSTR} -c - rm -f x$*.c # endif --- 63,69 ---- # ifdef VMUNIX # ${CC} -E ${CFLAGS} $*.c | ${XSTR} -c - # else ! ${MKSTR} - exstrings x $*.c ${CC} -E ${CFLAGS} x$*.c | ${XSTR} -c - rm -f x$*.c # endif *************** *** 122,128 **** clean: # If we dont have ex we cant make it so don't rm ex_vars.h ! -rm -f a.out exrecover expreserve ex${VERSION}strings strings -rm -f *.o x*.[cs] core errs trace # install in standard place (/usr/ucb) --- 122,128 ---- clean: # If we dont have ex we cant make it so don't rm ex_vars.h ! -rm -f a.out exrecover expreserve exstrings strings -rm -f *.o x*.[cs] core errs trace # install in standard place (/usr/ucb) *************** *** 130,148 **** -rm -f ${DESTDIR}/${BINDIR}/ex -rm -f ${DESTDIR}/${BINDIR}/vi -rm -f ${DESTDIR}/${BINDIR}/view - # -rm -f ${DESTDIR}/${BINDIR}/edit - # -rm -f ${DESTDIR}/${BINDIR}/e -rm -f ${DESTDIR}/usr/bin/ex install -s -m 1755 a.out ${DESTDIR}/${BINDIR}/ex ! cp ex${VERSION}strings ${DESTDIR}/${LIBDIR}/ex${VERSION}strings ! # ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/${BINDIR}/edit ! # ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/${BINDIR}/e ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/${BINDIR}/vi ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/${BINDIR}/view ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/usr/bin/ex chmod 1755 ${DESTDIR}/${BINDIR}/ex ! install -s -o root -m 4755 exrecover ${DESTDIR}/${LIBDIR}/ex${VERSION}recover ! install -s -o root -m 4755 expreserve ${DESTDIR}/${LIBDIR}/ex${VERSION}preserve # The following line normally fails. This is OK. -mkdir ${DESTDIR}/usr/preserve --- 130,144 ---- -rm -f ${DESTDIR}/${BINDIR}/ex -rm -f ${DESTDIR}/${BINDIR}/vi -rm -f ${DESTDIR}/${BINDIR}/view -rm -f ${DESTDIR}/usr/bin/ex install -s -m 1755 a.out ${DESTDIR}/${BINDIR}/ex ! install -c -m 444 exstrings ${DESTDIR}/${MISCDIR}/exstrings ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/${BINDIR}/vi ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/${BINDIR}/view ln ${DESTDIR}/${BINDIR}/ex ${DESTDIR}/usr/bin/ex chmod 1755 ${DESTDIR}/${BINDIR}/ex ! install -s -o root -m 4755 exrecover ${DESTDIR}/${SBINDIR}/exrecover ! install -s -o root -m 4755 expreserve ${DESTDIR}/${SBINDIR}/expreserve # The following line normally fails. This is OK. -mkdir ${DESTDIR}/usr/preserve *** /usr/src/ucb/ex/ex_tune.h.old Mon Jan 18 09:35:50 1993 --- /usr/src/ucb/ex/ex_tune.h Wed Oct 23 15:56:54 1996 *************** *** 3,9 **** * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * ! * @(#)ex_tune.h 7.8 (Berkeley) 5/31/85 */ /* --- 3,9 ---- * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * ! * @(#)ex_tune.h 7.8.1 (2.11BSD) 1996/10/23 */ /* *************** *** 12,31 **** /* * Pathnames. - * - * Only exstrings is looked at "+4", i.e. if you give - * "/usr/lib/..." here, "/lib" will be tried only for strings. */ - #define libpath(file) "/usr/lib/file" - #define loclibpath(file) "/usr/local/lib/file" - #define binpath(file) "/usr/ucb/file" - #define usrpath(file) "/usr/file" #define E_TERMCAP "/etc/termcap" #define B_CSH "/bin/csh" ! #define EXRECOVER libpath(ex3.7recover) ! #define EXPRESERVE libpath(ex3.7preserve) #ifndef VMUNIX ! #define EXSTRINGS libpath(ex3.7strings) #endif /* --- 12,24 ---- /* * Pathnames. */ #define E_TERMCAP "/etc/termcap" #define B_CSH "/bin/csh" ! #define EXRECOVER "/usr/sbin/exrecover" ! #define EXPRESERVE "/usr/sbin/expreserve" #ifndef VMUNIX ! #define EXSTRINGS "/usr/share/misc/exstrings" #endif /* *** /usr/src/ucb/ex/expreserve.c.old Fri Dec 31 22:50:10 1993 --- /usr/src/ucb/ex/expreserve.c Sat Oct 26 22:33:19 1996 *************** *** 9,15 **** "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; ! static char *sccsid = "@(#)expreserve.c 7.13.1 (2.11BSD GTE) 12/31/93"; #endif #include --- 9,15 ---- "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; ! static char *sccsid = "@(#)expreserve.c 7.13.2 (2.11BSD GTE) 1996/10/26"; #endif #include *************** *** 31,42 **** char xstr[1]; /* make loader happy */ /* ! * Expreserve - preserve a file in usrpath(preserve) * Bill Joy UCB November 13, 1977 * * This routine is very naive - it doesn't remove anything from ! * usrpath(preserve)... this may mean that we leave ! * stuff there... the danger in doing anything with usrpath(preserve) * is that the clock may be screwed up and we may get confused. * * We are called in two ways - first from the editor with no argumentss --- 31,42 ---- char xstr[1]; /* make loader happy */ /* ! * Expreserve - preserve a file in /usr/preserve * Bill Joy UCB November 13, 1977 * * This routine is very naive - it doesn't remove anything from ! * /usr/preserve... this may mean that we leave ! * stuff there... the danger in doing anything with /usr/preserve * is that the clock may be screwed up and we may get confused. * * We are called in two ways - first from the editor with no argumentss *************** *** 135,144 **** exit(0); } ! char pattern[] = usrpath(preserve/Exaa`XXXXX); /* ! * Copy file name into usrpath(preserve)/... * If name is (char *) 0, then do the standard input. * We make some checks on the input to make sure it is * really an editor temporary, generate a name for the --- 135,144 ---- exit(0); } ! char pattern[] = "/usr/preserve/Exaa`XXXXX"; /* ! * Copy file name into /usr/preserve/... * If name is (char *) 0, then do the standard input. * We make some checks on the input to make sure it is * really an editor temporary, generate a name for the *** /usr/src/ucb/ex/exrecover.c.old Fri Mar 22 17:31:38 1996 --- /usr/src/ucb/ex/exrecover.c Sat Oct 26 22:31:10 1996 *************** *** 9,15 **** "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; ! static char *sccsid = "@(#)exrecover.c 7.9.1 (2.11BSD) 1996/3/22"; #endif #include /* mjm: BUFSIZ: stdio = 512, VMUNIX = 1024 */ --- 9,15 ---- "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; ! static char *sccsid = "@(#)exrecover.c 7.9.2 (2.11BSD) 1996/10/26"; #endif #include /* mjm: BUFSIZ: stdio = 512, VMUNIX = 1024 */ *************** *** 29,35 **** /* * * This program searches through the specified directory and then ! * the directory usrpath(preserve) looking for an instance of the specified * file from a crashed editor or a crashed system. * If this file is found, it is unscrambled and written to * the standard output. --- 29,35 ---- /* * * This program searches through the specified directory and then ! * the directory /usr/preserve looking for an instance of the specified * file from a crashed editor or a crashed system. * If this file is found, it is unscrambled and written to * the standard output. *************** *** 52,58 **** * This directory definition also appears (obviously) in expreserve.c. * Change both if you change either. */ ! char mydir[] = usrpath(preserve); /* * Limit on the number of printed entries --- 52,58 ---- * This directory definition also appears (obviously) in expreserve.c. * Change both if you change either. */ ! char mydir[] = "/usr/preserve"; /* * Limit on the number of printed entries *************** *** 222,228 **** struct svfile *fp, svbuf[NENTRY]; /* ! * Open usrpath(preserve), and go there to make things quick. */ dir = opendir(dirname); if (dir == NULL) { --- 222,228 ---- struct svfile *fp, svbuf[NENTRY]; /* ! * Open /usr/preserve, and go there to make things quick. */ dir = opendir(dirname); if (dir == NULL) { *************** *** 235,241 **** } /* ! * Look at the candidate files in usrpath(preserve). */ fp = &svbuf[0]; ecount = 0; --- 235,241 ---- } /* ! * Look at the candidate files in /usr/preserve. */ fp = &svbuf[0]; ecount = 0; *************** *** 373,379 **** /* * Look for a file, both in the users directory option value ! * (i.e. usually /tmp) and in usrpath(preserve). * Want to find the newest so we search on and on. */ findtmp(dir) --- 373,379 ---- /* * Look for a file, both in the users directory option value ! * (i.e. usually /tmp) and in /usr/preserve. * Want to find the newest so we search on and on. */ findtmp(dir) *************** *** 387,393 **** bestfd = -1; /* ! * Search usrpath(preserve) and, if we can get there, /tmp * (actually the users "directory" option). */ searchdir(dir); --- 387,393 ---- bestfd = -1; /* ! * Search /usr/preserve and, if we can get there, /tmp * (actually the users "directory" option). */ searchdir(dir); *************** *** 424,430 **** * Don't chdir here, because the users directory * may be ".", and we would move away before we searched it. * Note that we actually chdir elsewhere (because it is too slow ! * to look around in usrpath(preserve) without chdir'ing there) so we * can't win, because we don't know the name of '.' and if the path * name of the file we want to unlink is relative, rather than absolute * we won't be able to find it again. --- 424,430 ---- * Don't chdir here, because the users directory * may be ".", and we would move away before we searched it. * Note that we actually chdir elsewhere (because it is too slow ! * to look around in /usr/preserve without chdir'ing there) so we * can't win, because we don't know the name of '.' and if the path * name of the file we want to unlink is relative, rather than absolute * we won't be able to find it again. *** /usr/src/ucb/ex/uparm.h.old Mon Feb 16 22:07:39 1987 --- /usr/src/ucb/ex/uparm.h Wed Oct 23 15:56:23 1996 *************** *** 1,6 **** - #define libpath(file) "/usr/lib/file" - #define loclibpath(file) "/usr/local/lib/file" - #define binpath(file) "/usr/ucb/file" - #define usrpath(file) "/usr/file" #define E_TERMCAP "/etc/termcap" #define B_CSH "/bin/csh" --- 1,2 ---- *** /usr/src/ucb/more/Makefile.old Mon Feb 16 23:16:01 1987 --- /usr/src/ucb/more/Makefile Wed Oct 23 15:58:27 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.1 (Berkeley) 6/4/85 # CFLAGS= -O SEPFLAG= -i --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.1.1 (2.11BSD) 1996/10/23 # CFLAGS= -O SEPFLAG= -i *************** *** 16,22 **** install -s more ${DESTDIR}/usr/ucb/more rm -f ${DESTDIR}/usr/ucb/page ln ${DESTDIR}/usr/ucb/more ${DESTDIR}/usr/ucb/page ! install -c more.help ${DESTDIR}/usr/lib/more.help more.o: more.c more.o: /usr/include/stdio.h --- 16,22 ---- install -s more ${DESTDIR}/usr/ucb/more rm -f ${DESTDIR}/usr/ucb/page ln ${DESTDIR}/usr/ucb/more ${DESTDIR}/usr/ucb/page ! install -c more.help ${DESTDIR}/usr/share/misc/more.help more.o: more.c more.o: /usr/include/stdio.h *** /usr/src/ucb/more/more.c.old Wed Feb 18 00:54:34 1987 --- /usr/src/ucb/more/more.c Wed Oct 23 15:59:26 1996 *************** *** 4,18 **** * specifies the terms and conditions for redistribution. */ ! #ifndef lint char copyright[] = "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; - #endif not lint ! #ifndef lint ! static char sccsid[] = "@(#)more.c 5.4 (Berkeley) 4/3/86"; ! #endif not lint /* ** more.c - General purpose tty output filter and file perusal program --- 4,16 ---- * specifies the terms and conditions for redistribution. */ ! #if !defined(lint) && defined(DOSCCS) char copyright[] = "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; ! static char sccsid[] = "@(#)more.c 5.4.1 (2.11BSD) 1996/10/23"; ! #endif /* ** more.c - General purpose tty output filter and file perusal program *************** *** 32,38 **** #include #include ! #define HELPFILE "/usr/lib/more.help" #define VI "/usr/ucb/vi" #define Fopen(s,m) (Currline = 0,file_pos=0,fopen(s,m)) --- 30,36 ---- #include #include ! #define HELPFILE "/usr/share/misc/more.help" #define VI "/usr/ucb/vi" #define Fopen(s,m) (Currline = 0,file_pos=0,fopen(s,m)) *** /usr/src/ucb/pascal/Makefile.old Mon Jan 25 19:51:51 1993 --- /usr/src/ucb/pascal/Makefile Wed Oct 23 16:01:16 1996 *************** *** 1,6 **** DESTDIR= BINDIR= /usr/ucb - LIBDIR= /usr/lib CFLAGS= -O -w LDFLAGS= -X --- 1,5 ---- *************** *** 16,22 **** ${ALL}: FRC cd $@; make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SEPFLAG=${SEPFLAG} \ ! BINDIR=${BINDIR} LIBDIR=${LIBDIR} install: ${UTILS} for i in ${PASCAL}; do \ --- 15,21 ---- ${ALL}: FRC cd $@; make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SEPFLAG=${SEPFLAG} \ ! BINDIR=${BINDIR} install: ${UTILS} for i in ${PASCAL}; do \ *** /usr/src/ucb/pascal/pi/Makefile.old Sat Mar 30 23:10:55 1996 --- /usr/src/ucb/pascal/pi/Makefile Wed Oct 23 16:09:01 1996 *************** *** 1,5 **** # ! # pi Makefile - 1.2 1996/3/22 # DESTDIR= --- 1,5 ---- # ! # pi Makefile - 1.2.1 1996/10/23 # DESTDIR= *************** *** 87,97 **** ./version > Version.c install: ${ALL} ! install -c ${ERRORSTRINGS} ${DESTDIR}/usr/lib ! install -c how_pi ${DESTDIR}/usr/lib ! install -c how_pix ${DESTDIR}/usr/lib ! dd if=px_header.out of=${DESTDIR}/usr/lib/npx_header conv=sync ! chmod a+r $(DESTDIR)/usr/lib/npx_header install -s pi ${DESTDIR}/usr/ucb install -s pix ${DESTDIR}/usr/ucb --- 87,99 ---- ./version > Version.c install: ${ALL} ! -mkdir -p ${DESTDIR}/usr/share/pascal ! chmod 755 ${DESTDIR}/usr/share/pascal ! install -c ${ERRORSTRINGS} ${DESTDIR}/usr/share/pascal ! install -c how_pi ${DESTDIR}/usr/share/pascal ! install -c how_pix ${DESTDIR}/usr/share/pascal ! dd if=px_header.out of=${DESTDIR}/usr/share/pascal/npx_header conv=sync ! chmod a+r $(DESTDIR)/usr/share/pascal/npx_header install -s pi ${DESTDIR}/usr/ucb install -s pix ${DESTDIR}/usr/ucb *** /usr/src/ucb/pascal/pi/main.c.old Sat Jul 25 13:14:00 1987 --- /usr/src/ucb/pascal/pi/main.c Wed Oct 23 16:08:39 1996 *************** *** 1,9 **** ! static char sccsid[] = "%W%"; /* SCCS id keyword */ /* Copyright (c) 1979 Regents of the University of California */ # /* * pi - Pascal interpreter code translator * * Charles Haley, Bill Joy UCB * Version 1.2 November 1978 */ --- 1,12 ---- ! /* static char sccsid[] = "%W%"; /* SCCS id keyword */ /* Copyright (c) 1979 Regents of the University of California */ # /* * pi - Pascal interpreter code translator * + * Steven Schultz, GTE + * Version 1.2.1 October 1996 + * * Charles Haley, Bill Joy UCB * Version 1.2 November 1978 */ *************** *** 33,43 **** * There are the "magic" constants err_pathlen and how_pathlen * immediately below. */ ! char *err_file = "/usr/lib/pi1.2strings"; ! int err_pathlen = 9; /* "/usr/lib/" */ ! char *how_file = "/usr/lib/how_pi\0"; /* room for 'x' in pix */ ! int how_pathlen = 9; /* "/usr/lib/" */ int onintr(); --- 36,46 ---- * There are the "magic" constants err_pathlen and how_pathlen * immediately below. */ ! char *err_file = "/usr/share/pascal/pi1.2strings"; ! int err_pathlen = 18; /* "/usr/share/pascal/" */ ! char *how_file = "/usr/share/pascal/how_pi\0"; /* room for 'x' in pix */ ! int how_pathlen = 18; /* "/usr/share/pascal/" */ int onintr(); *** /usr/src/ucb/pascal/pi/yymain.c.old Sat Jul 25 13:35:24 1987 --- /usr/src/ucb/pascal/pi/yymain.c Wed Oct 23 16:08:01 1996 *************** *** 1,9 **** ! /* @(#)yymain.c 2.2 SCCS id keyword */ /* Copyright (c) 1979 Regents of the University of California */ # /* * pi - Pascal interpreter code translator * * Charles Haley, Bill Joy UCB * Version 1.2 November 1978 * --- 1,12 ---- ! /* @(#)yymain.c 2.2.1 SCCS id keyword */ /* Copyright (c) 1979 Regents of the University of California */ # /* * pi - Pascal interpreter code translator * + * Steven Schultz, GTE + * Version 1.2.1 October 1996 + * * Charles Haley, Bill Joy UCB * Version 1.2 November 1978 * *************** *** 134,140 **** unsigned *ubuf = buf; register int hf, i; ! hf = open("/usr/lib/npx_header", 0); if (hf >= 0 && read(hf, buf, HEAD_BYTES) > sizeof header) { header.magic = ubuf[0]; header.txt_size = ubuf[1]; --- 137,143 ---- unsigned *ubuf = buf; register int hf, i; ! hf = open("/usr/share/pascal/npx_header", 0); if (hf >= 0 && read(hf, buf, HEAD_BYTES) > sizeof header) { header.magic = ubuf[0]; header.txt_size = ubuf[1]; *** /usr/src/ucb/pascal/px/Makefile.old Mon Jan 18 09:36:01 1993 --- /usr/src/ucb/pascal/px/Makefile Wed Oct 23 16:10:37 1996 *************** *** 49,55 **** install: ${ALL} install -s px ${DESTDIR}/usr/ucb/px ! install -s gather ${DESTDIR}/usr/lib/gather tags: FRC --- 49,55 ---- install: ${ALL} install -s px ${DESTDIR}/usr/ucb/px ! install -s gather ${DESTDIR}/usr/libexec/gather tags: FRC *** /usr/src/ucb/pascal/px/exit.c.old Sat Jul 25 13:06:45 1987 --- /usr/src/ucb/pascal/px/exit.c Wed Oct 23 16:10:50 1996 *************** *** 12,18 **** cp[1] |= c; cp[2] = 0; } ! execl("/usr/lib/gather", "gather", cp, "px", 0); } */ _exit(c); --- 12,18 ---- cp[1] |= c; cp[2] = 0; } ! execl("/usr/libexec/gather", "gather", cp, "px", 0); } */ _exit(c); *** /usr/src/ucb/pascal/pxp/Makefile.old Mon Jan 18 09:36:02 1993 --- /usr/src/ucb/pascal/pxp/Makefile Wed Oct 23 16:12:09 1996 *************** *** 52,58 **** install: pxp how_pxp install -s pxp ${DESTDIR}/usr/ucb/pxp ! install -c how_pxp ${DESTDIR}/usr/lib/how_pxp tags: FRC ctags ${HDRS} ${SRCS} --- 52,58 ---- install: pxp how_pxp install -s pxp ${DESTDIR}/usr/ucb/pxp ! install -c how_pxp ${DESTDIR}/usr/share/pascal/how_pxp tags: FRC ctags ${HDRS} ${SRCS} *** /usr/src/ucb/pascal/pxp/main.c.old Sat Jul 25 13:11:38 1987 --- /usr/src/ucb/pascal/pxp/main.c Wed Oct 23 16:12:55 1996 *************** *** 2,7 **** --- 2,10 ---- /* * pxp - Pascal execution profiler * + * Steven Schultz GTE + * Version 1.2.1 October 1996 + * * Bill Joy UCB * Version 1.2 January 1979 */ *************** *** 29,36 **** char usagestr[] = "pxp [ -acdefjntuw_ ] [ -23456789 ] [ -z [ name ... ] ] name.p"; ! char *how_file = "/usr/lib/how_pxp"; ! int how_pathlen = 9; /* "/usr/lib/" */ char *stdoutn = "Standard output"; --- 32,39 ---- char usagestr[] = "pxp [ -acdefjntuw_ ] [ -23456789 ] [ -z [ name ... ] ] name.p"; ! char *how_file = "/usr/share/pascal/how_pxp"; ! int how_pathlen = 18; /* "/usr/share/pascal/" */ char *stdoutn = "Standard output"; *** /usr/src/ucb/pascal/pxp/yymain.c.old Sat Jul 25 13:35:24 1987 --- /usr/src/ucb/pascal/pxp/yymain.c Wed Oct 23 16:13:23 1996 *************** *** 2,7 **** --- 2,10 ---- /* * pi - Pascal interpreter code translator * + * Steven Schultz GTE + * Version 1.2.1 October 1996 + * * Charles Haley, Bill Joy UCB * Version 1.2 January 1979 * *************** *** 119,125 **** int buf[512]; register int hf, i; ! hf = open("/usr/lib/npx_header", 0); if (hf >= 0 && read(hf, buf, 1024) > 16) { header.magic = buf[0]; header.txt_size = buf[1]; --- 122,128 ---- int buf[512]; register int hf, i; ! hf = open("/usr/share/pascal/npx_header", 0); if (hf >= 0 && read(hf, buf, 1024) > 16) { header.magic = buf[0]; header.txt_size = buf[1]; *** /usr/src/ucb/sendbug/Makefile.old Sat Nov 28 17:16:00 1992 --- /usr/src/ucb/sendbug/Makefile Wed Oct 23 16:17:29 1996 *************** *** 3,33 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.7 (GTE) 11/28/92 # # Bug report processor and associated programs # BUGS_NAME = sms ! BUGS_HOME = @WLV.IIPO.GTEGSC.COM DEFS = -DBUGS_NAME='"$(BUGS_NAME)"' -DBUGS_HOME='"$(BUGS_HOME)"' CFLAGS = -O -DUNIXCOMP $(DEFS) - LIBDIR= /usr/lib DESTDIR= all: bugfiler unixtomh bugfiler: bugfiler.c ! ${CC} ${CFLAGS} ${SEPFLAG} -DUNIXTOMH='"${LIBDIR}/unixtomh"' -o bugfiler bugfiler.c unixtomh: unixtomh.c ${CC} ${SEPFLAG} ${CFLAGS} -o unixtomh unixtomh.c install: bugfiler sendbug.sh bugformat unixtomh ! install -s bugfiler ${DESTDIR}${LIBDIR}/bugfiler install -c -m 555 sendbug.sh ${DESTDIR}/usr/ucb/sendbug ! install -s unixtomh ${DESTDIR}${LIBDIR}/unixtomh ! install -c -m 644 bugformat ${DESTDIR}/usr/lib/bugformat clean: rm -f *.o bugfiler unixtomh --- 3,32 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.7.1 (GTE) 1996/10/23 # # Bug report processor and associated programs # BUGS_NAME = sms ! BUGS_HOME = @MOE.2BSD.COM DEFS = -DBUGS_NAME='"$(BUGS_NAME)"' -DBUGS_HOME='"$(BUGS_HOME)"' CFLAGS = -O -DUNIXCOMP $(DEFS) DESTDIR= all: bugfiler unixtomh bugfiler: bugfiler.c ! ${CC} ${CFLAGS} ${SEPFLAG} -DUNIXTOMH='"/usr/libexec/unixtomh"' -o bugfiler bugfiler.c unixtomh: unixtomh.c ${CC} ${SEPFLAG} ${CFLAGS} -o unixtomh unixtomh.c install: bugfiler sendbug.sh bugformat unixtomh ! install -s bugfiler ${DESTDIR}/usr/libexec/bugfiler install -c -m 555 sendbug.sh ${DESTDIR}/usr/ucb/sendbug ! install -s unixtomh ${DESTDIR}/usr/libexec/unixtomh ! install -c -m 644 bugformat ${DESTDIR}/usr/share/misc/bugformat clean: rm -f *.o bugfiler unixtomh *** /usr/src/ucb/sendbug/bugfiler.c.old Sat Jun 11 18:06:43 1994 --- /usr/src/ucb/sendbug/bugfiler.c Wed Oct 23 16:18:44 1996 *************** *** 9,15 **** "@(#) Copyright (c) 1983 Regents of the University of California.\n\ All rights reserved.\n"; ! static char sccsid[] = "@(#)bugfiler.c 5.5.1 (2.11BSD GTE) 6/11/94"; #endif /* --- 9,15 ---- "@(#) Copyright (c) 1983 Regents of the University of California.\n\ All rights reserved.\n"; ! static char sccsid[] = "@(#)bugfiler.c 5.5.2 (2.11BSD GTE) 1996/10/23"; #endif /* *************** *** 29,42 **** #include #ifndef BUGS_NAME ! #define BUGS_NAME "4bsd-bugs" #endif #ifndef BUGS_HOME ! #define BUGS_HOME "@ucbvax.BERKELEY.EDU" #endif #ifndef UNIXTOMH ! #define UNIXTOMH "/usr/lib/unixtomh" #endif char *bugperson = "bugs"; char *maildir = "mail"; --- 29,42 ---- #include #ifndef BUGS_NAME ! #define BUGS_NAME "2bsd-bugs" #endif #ifndef BUGS_HOME ! #define BUGS_HOME "@moe.2bsd.com" #endif #ifndef UNIXTOMH ! #define UNIXTOMH "/usr/libexec/unixtomh" #endif char *bugperson = "bugs"; char *maildir = "mail"; *** /usr/src/ucb/sendbug/sendbug.sh.old Sat Nov 28 17:02:00 1992 --- /usr/src/ucb/sendbug/sendbug.sh Fri Oct 25 20:39:28 1996 *************** *** 4,20 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)sendbug.sh 6.0 (GTE) 11/20/92 # # Create a bug report and mail to the 2bsd maintainer. # TEMP=/tmp/bug$$ ! FORMAT=/usr/lib/bugformat # uucp sites should use ": ${BUGADDR=wlbr!wlv!sms}" with a suitable path. # Use of the uucp address is not recommended. ! : ${BUGADDR=sms@WLV.IIPO.GTEGSC.COM} : ${EDITOR=/usr/ucb/vi} trap '/bin/rm -f $TEMP ; exit 1' 1 2 3 13 15 --- 4,20 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)sendbug.sh 6.1 (2.11BSD) 1996/10/25 # # Create a bug report and mail to the 2bsd maintainer. # TEMP=/tmp/bug$$ ! FORMAT=/usr/share/misc/bugformat # uucp sites should use ": ${BUGADDR=wlbr!wlv!sms}" with a suitable path. # Use of the uucp address is not recommended. ! : ${BUGADDR=sms@MOE.2BSD.COM} : ${EDITOR=/usr/ucb/vi} trap '/bin/rm -f $TEMP ; exit 1' 1 2 3 13 15 *************** *** 28,35 **** exit fi case "$#" in ! 0) /usr/lib/sendmail -t -oi $BUGADDR < $TEMP ;; ! *) /usr/lib/sendmail -t -oi "$@" < $TEMP ;; esac fi --- 28,35 ---- exit fi case "$#" in ! 0) /usr/sbin/sendmail -t -oi $BUGADDR < $TEMP ;; ! *) /usr/sbin/sendmail -t -oi "$@" < $TEMP ;; esac fi *** /usr/src/ucb/vacation.c.old Sat Jun 11 18:09:57 1994 --- /usr/src/ucb/vacation.c Wed Oct 23 16:20:59 1996 *************** *** 9,15 **** */ #if !defined(lint) && defined(DOSCCS) ! static char SccsId[] = "@(#)vacation.c 5.3.1 (2.11BSD GTE) 6/11/94"; #endif # include --- 9,15 ---- */ #if !defined(lint) && defined(DOSCCS) ! static char SccsId[] = "@(#)vacation.c 5.3.2 (2.11BSD GTE) 1996/10/23"; #endif # include *************** *** 345,351 **** f = freopen(msgf, "r", stdin); if (f == NULL) { ! f = freopen("/usr/lib/vacation.def", "r", stdin); if (f == NULL) syserr("No message to send"); } --- 345,351 ---- f = freopen(msgf, "r", stdin); if (f == NULL) { ! f = freopen("/usr/share/misc/vacation.def", "r", stdin); if (f == NULL) syserr("No message to send"); } *** /usr/src/ucb/vgrind/Makefile.old Mon Feb 16 23:54:02 1987 --- /usr/src/ucb/vgrind/Makefile Wed Oct 23 16:23:58 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.1 (Berkeley) 6/6/85 # DESTDIR= CFLAGS=-O --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.1.1 (2.11BSD) 1996/10/23 # DESTDIR= CFLAGS=-O *************** *** 20,29 **** cc ${SEPFLAG} ${CFLAGS} -o retest retest.c regexp.o install: all ! install -s vfontedpr ${DESTDIR}/usr/lib/vfontedpr install -c vgrind.sh ${DESTDIR}/usr/ucb/vgrind ! install -c vgrindefs.src ${DESTDIR}/usr/lib/vgrindefs ! install -c tmac.vgrind ${DESTDIR}/usr/lib/tmac/tmac.vgrind clean: rm -f ${CMDS} ${OBJS} --- 20,29 ---- cc ${SEPFLAG} ${CFLAGS} -o retest retest.c regexp.o install: all ! install -s vfontedpr ${DESTDIR}/usr/libexec/vfontedpr install -c vgrind.sh ${DESTDIR}/usr/ucb/vgrind ! install -c -m 444 vgrindefs.src ${DESTDIR}/usr/share/misc/vgrindefs ! install -c -m 444 tmac.vgrind ${DESTDIR}/usr/share/tmac/tmac.vgrind clean: rm -f ${CMDS} ${OBJS} *** /usr/src/ucb/vgrind/vfontedpr.c.old Mon Feb 16 22:08:23 1987 --- /usr/src/ucb/vgrind/vfontedpr.c Wed Oct 23 16:24:48 1996 *************** *** 4,12 **** * specifies the terms and conditions for redistribution. */ ! #ifndef lint ! static char sccsid[] = "@(#)vfontedpr.c 5.1 (Berkeley) 6/5/85"; ! #endif not lint #include #include --- 4,12 ---- * specifies the terms and conditions for redistribution. */ ! #if !defined(lint) && defined(DOSCCS) ! static char sccsid[] = "@(#)vfontedpr.c 5.1.1 (2.11BSD) 1996/10/23"; ! #endif #include #include *************** *** 64,70 **** char pstack[PSMAX][PNAMELEN+1]; /* the procedure name stack */ int plstack[PSMAX]; /* the procedure nesting level stack */ int blklevel; /* current nesting level */ ! char *defsfile = "/usr/lib/vgrindefs"; /* name of language definitions file */ char pname[BUFSIZ+1]; /* --- 64,70 ---- char pstack[PSMAX][PNAMELEN+1]; /* the procedure name stack */ int plstack[PSMAX]; /* the procedure nesting level stack */ int blklevel; /* current nesting level */ ! char *defsfile = "/usr/share/misc/vgrindefs"; /* name of language definitions file */ char pname[BUFSIZ+1]; /* *** /usr/src/ucb/vgrind/vgrind.sh.old Mon Feb 16 22:08:22 1987 --- /usr/src/ucb/vgrind/vgrind.sh Tue Oct 29 22:26:44 1996 *************** *** 4,14 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)vgrind.sh 5.3 (Berkeley) 11/13/85 # # vgrind # ! set b=/usr/lib set voptions= set options= set files= --- 4,15 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)vgrind.sh 5.3.1 (2.11BSD) 1996/10/29 # # vgrind # ! set b=/usr/libexec ! set s=/usr/share set voptions= set options= set files= *************** *** 82,90 **** sed -f nindex index >xindex if ($f == 'filter') then if ("$head" != "") then ! $b/vfontedpr $options -h "$head" $files | cat $b/tmac/tmac.vgrind - else ! $b/vfontedpr $options $files | cat $b/tmac/tmac.vgrind - endif else if ("$head" != "") then --- 83,91 ---- sed -f nindex index >xindex if ($f == 'filter') then if ("$head" != "") then ! $b/vfontedpr $options -h "$head" $files | cat $s/tmac/tmac.vgrind - else ! $b/vfontedpr $options $files | cat $s/tmac/tmac.vgrind - endif else if ("$head" != "") then *************** *** 100,108 **** else if ($f == 'filter') then if ("$head" != "") then ! $b/vfontedpr $options -h "$head" $files | cat $b/tmac/tmac.vgrind - else ! $b/vfontedpr $options $files | cat $b/tmac/tmac.vgrind - endif else if ("$head" != "") then --- 101,109 ---- else if ($f == 'filter') then if ("$head" != "") then ! $b/vfontedpr $options -h "$head" $files | cat $s/tmac/tmac.vgrind - else ! $b/vfontedpr $options $files | cat $s/tmac/tmac.vgrind - endif else if ("$head" != "") then *** /usr/src/ucb/whereis.c.old Mon Feb 16 22:11:17 1987 --- /usr/src/ucb/whereis.c Wed Oct 23 16:28:53 1996 *************** *** 4,18 **** * specifies the terms and conditions for redistribution. */ ! #ifndef lint char copyright[] = "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; - #endif not lint ! #ifndef lint ! static char sccsid[] = "@(#)whereis.c 5.1 (Berkeley) 5/31/85"; ! #endif not lint #include #include --- 4,16 ---- * specifies the terms and conditions for redistribution. */ ! #if !defined(lint) && defined(DOSCCS) char copyright[] = "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; ! static char sccsid[] = "@(#)whereis.c 5.1.1 (2.11BSD) 1996/10/23"; ! #endif #include #include *************** *** 22,37 **** static char *bindirs[] = { "/etc", "/bin", "/usr/bin", "/usr/games", - "/lib", "/usr/ucb", ! "/usr/lib", "/usr/local", "/usr/new", - "/usr/old", - "/usr/hosts", - "/usr/include", 0 }; static char *mandirs[] = { --- 20,34 ---- static char *bindirs[] = { "/etc", "/bin", + "/sbin", "/usr/bin", + "/usr/sbin", "/usr/games", "/usr/ucb", ! "/usr/libexec", "/usr/local", + "/usr/local/bin", "/usr/new", 0 }; static char *mandirs[] = { *************** *** 50,74 **** }; static char *srcdirs[] = { "/usr/src/bin", "/usr/src/usr.bin", "/usr/src/etc", "/usr/src/ucb", "/usr/src/games", "/usr/src/usr.lib", "/usr/src/lib", "/usr/src/local", "/usr/src/new", - "/usr/src/old", "/usr/src/include", "/usr/src/lib/libc/gen", "/usr/src/lib/libc/stdio", "/usr/src/lib/libc/sys", - "/usr/src/lib/libc/net/common", "/usr/src/lib/libc/net/inet", "/usr/src/lib/libc/net/misc", "/usr/src/ucb/pascal", "/usr/src/ucb/pascal/utilities", - "/usr/src/undoc", 0 }; --- 47,71 ---- }; static char *srcdirs[] = { "/usr/src/bin", + "/usr/src/sbin", "/usr/src/usr.bin", + "/usr/src/usr.sbin", "/usr/src/etc", "/usr/src/ucb", "/usr/src/games", "/usr/src/usr.lib", "/usr/src/lib", + "/usr/src/libexec", "/usr/src/local", "/usr/src/new", "/usr/src/include", "/usr/src/lib/libc/gen", "/usr/src/lib/libc/stdio", "/usr/src/lib/libc/sys", "/usr/src/lib/libc/net/inet", "/usr/src/lib/libc/net/misc", "/usr/src/ucb/pascal", "/usr/src/ucb/pascal/utilities", 0 }; *** /usr/src/usr.bin/Makefile.old Wed Mar 20 21:54:19 1996 --- /usr/src/usr.bin/Makefile Tue Oct 22 21:06:02 1996 *************** *** 1,4 **** ! # Makefile 1.4 (2.11BSD GTE) 1996/03/20 # DESTDIR= CFLAGS= -O --- 1,4 ---- ! # Makefile 1.5 (2.11BSD GTE) 1996/10/22 # DESTDIR= CFLAGS= -O *************** *** 48,54 **** ${STD} ${KMEM}: ${CC} ${CFLAGS} ${SEPFLAG} -o $@ $@.c ! install: ${STD} ${NSTD} ${KMEM} units.lib -for i in ${SUBDIR}; do \ (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done -for i in ${SCRIPT}; do \ --- 48,54 ---- ${STD} ${KMEM}: ${CC} ${CFLAGS} ${SEPFLAG} -o $@ $@.c ! install: ${STD} ${NSTD} ${KMEM} -for i in ${SUBDIR}; do \ (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done -for i in ${SCRIPT}; do \ *************** *** 56,62 **** -for i in ${KMEM}; do \ (install -s -g kmem -m 2755 $$i ${DESTDIR}/usr/bin/$$i); done install -s ${STD} ${NSTD} ${DESTDIR}/usr/bin - install -c -m 755 units.lib ${DESTDIR}/usr/lib/units clean: for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done --- 56,61 ---- *** /usr/src/usr.bin/at/Makefile.old Mon Feb 16 16:38:10 1987 --- /usr/src/usr.bin/at/Makefile Wed Oct 23 19:54:21 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.4 (Berkeley) 10/9/85 # # Makefile for at, atq, atrm, and atrun # --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.4.1 (2.11BSD) 1996/10/23 # # Makefile for at, atq, atrm, and atrun # *************** *** 10,18 **** ALL= atq atrm at atrun SRCS= atq.c atrm.c at.c atrun.c CFLAGS= -O - INCPATH= DESTDIR= - ATRUNDIR= /usr/lib SPOOLDIRS= /usr/spool/at /usr/spool/at/past SPOOLFILES= /usr/spool/at/lasttimedone SEPFLAG= -i --- 10,16 ---- *************** *** 44,50 **** chown daemon $(DESTDIR)/$$i; \ chgrp daemon $(DESTDIR)/$$i; \ done ! install -s atrun $(DESTDIR)/$(ATRUNDIR) install -s -o daemon -m 4755 atq $(DESTDIR)/usr/bin install -s -o daemon -m 4755 at $(DESTDIR)/usr/bin install -s -o daemon -m 4755 atrm $(DESTDIR)/usr/bin --- 42,48 ---- chown daemon $(DESTDIR)/$$i; \ chgrp daemon $(DESTDIR)/$$i; \ done ! install -s -o daemon atrun $(DESTDIR)/usr/libexec install -s -o daemon -m 4755 atq $(DESTDIR)/usr/bin install -s -o daemon -m 4755 at $(DESTDIR)/usr/bin install -s -o daemon -m 4755 atrm $(DESTDIR)/usr/bin *************** *** 52,90 **** clean: rm -f $(ALL) errs *.o - print: - lpr ${SRCS} - depend: ! cc -M ${INCPATH} ${SRCS} | \ ! awk ' { if ($$1 != prev) { print rec; rec = $$0; prev = $$1; } \ ! else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \ ! else rec = rec " " $$2 } } \ ! END { print rec } ' > makedep ! echo '/^# DO NOT DELETE THIS LINE/+2,$$d' >eddep ! echo '$$r makedep' >>eddep ! echo 'w' >>eddep ! cp Makefile Makefile.bak ! ed - Makefile < eddep ! rm eddep makedep ! echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile ! echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile ! echo '# see make depend above' >> Makefile ! ! # DO NOT DELETE THIS LINE -- make depend uses it ! ! ! atq.o: atq.c /usr/include/stdio.h /usr/include/sys/types.h ! atq.o: /usr/include/sys/file.h /usr/include/sys/dir.h /usr/include/sys/stat.h ! atq.o: /usr/include/sys/time.h /usr/include/pwd.h /usr/include/ctype.h ! atrm.o: atrm.c /usr/include/stdio.h /usr/include/pwd.h /usr/include/ctype.h ! atrm.o: /usr/include/sys/types.h /usr/include/sys/dir.h /usr/include/sys/file.h ! atrm.o: /usr/include/sys/stat.h ! at.o: at.c /usr/include/stdio.h /usr/include/ctype.h /usr/include/signal.h ! at.o: /usr/include/sys/time.h /usr/include/sys/file.h ! atrun.o: atrun.c /usr/include/stdio.h /usr/include/sys/types.h ! atrun.o: /usr/include/sys/dir.h /usr/include/sys/file.h /usr/include/sys/time.h ! atrun.o: /usr/include/sys/stat.h /usr/include/pwd.h ! # DEPENDENCIES MUST END AT END OF FILE ! # IF YOU PUT STUFF HERE IT WILL GO AWAY ! # see make depend above --- 50,55 ---- clean: rm -f $(ALL) errs *.o depend: ! chmod u+w Makefile ! mkdep ${CFLAGS} ${SRCS} *** /usr/src/usr.bin/bc.y.old Sun Jan 9 00:10:07 1994 --- /usr/src/usr.bin/bc.y Wed Oct 23 19:55:17 1996 *************** *** 1,5 **** %{ ! static char *sccsid = "@(#)bc.y 4.3 (Berkeley) 85/11/28"; int *getout(); %} %right '=' --- 1,5 ---- %{ ! static char *sccsid = "@(#)bc.y 4.3.1 (2.11BSD) 1996/10/23"; int *getout(); %} %right '=' *************** *** 589,595 **** fflush(stdout); exit(); } ! argv[1] = "/usr/lib/lib.b"; } pipe(p); if (fork()==0) { --- 589,595 ---- fflush(stdout); exit(); } ! argv[1] = "/usr/share/misc/lib.b"; } pipe(p); if (fork()==0) { *** /usr/src/usr.bin/calendar/Makefile.old Mon Jan 18 09:36:46 1993 --- /usr/src/usr.bin/calendar/Makefile Wed Oct 23 19:56:29 1996 *************** *** 1,4 **** ! # Makefile 4.1 83/08/13 # DESTDIR= CFLAGS= -O --- 1,4 ---- ! # Makefile 4.1.1 (2.11BSD) 1996/10/23 # DESTDIR= CFLAGS= -O *************** *** 8,14 **** ${CC} ${CFLAGS} ${SEPFLAG} -o calendar calendar.c install: calendar calendar.sh ! install -s calendar $(DESTDIR)/usr/lib install -c -m 755 calendar.sh $(DESTDIR)/usr/bin/calendar clean: --- 8,14 ---- ${CC} ${CFLAGS} ${SEPFLAG} -o calendar calendar.c install: calendar calendar.sh ! install -s calendar $(DESTDIR)/usr/libexec install -c -m 755 calendar.sh $(DESTDIR)/usr/bin/calendar clean: *** /usr/src/usr.bin/calendar/calendar.c.old Mon Feb 16 16:22:17 1987 --- /usr/src/usr.bin/calendar/calendar.c Wed Oct 23 19:57:56 1996 *************** *** 1,5 **** ! static char *sccsid = "@(#)calendar.c 4.5 (Berkeley) 84/05/07"; ! /* /usr/lib/calendar produces an egrep -f file that will select today's and tomorrow's calendar entries, with special weekend provisions --- 1,8 ---- ! #if !defined(lint) && defined(DOSCCS) ! static char *sccsid = "@(#)calendar.c 4.5.1 (2.11BSD) 1996/10/23"; ! #endif ! ! /* /usr/libexec/calendar produces an egrep -f file that will select today's and tomorrow's calendar entries, with special weekend provisions *** /usr/src/usr.bin/calendar/calendar.sh.old Mon Feb 16 16:22:17 1987 --- /usr/src/usr.bin/calendar/calendar.sh Wed Oct 23 19:58:49 1996 *************** *** 1,9 **** ! : calendar.sh 4.5 84/02/14 PATH=/bin:/usr/bin: tmp=/tmp/cal0$$ trap "rm -f $tmp /tmp/cal1$$ /tmp/cal2$$" trap exit 1 2 13 15 ! /usr/lib/calendar >$tmp case $# in 0) trap "rm -f $tmp ; exit" 0 1 2 13 15 --- 1,12 ---- ! #!/bin/sh ! # ! # calendar.sh 4.5.1 (2.11BSD) 1996/10/23 ! # PATH=/bin:/usr/bin: tmp=/tmp/cal0$$ trap "rm -f $tmp /tmp/cal1$$ /tmp/cal2$$" trap exit 1 2 13 15 ! /usr/libexec/calendar >$tmp case $# in 0) trap "rm -f $tmp ; exit" 0 1 2 13 15 *** /usr/src/usr.bin/crypt.c.old Sun Jun 28 13:11:27 1987 --- /usr/src/usr.bin/crypt.c Wed Oct 23 20:00:25 1996 *************** *** 1,4 **** ! static char *sccsid = "@(#)crypt.c 4.3 (Berkeley) 1/25/85"; /* * A one-rotor machine designed along the lines of Enigma --- 1,6 ---- ! #if !defined(lint) && defined(DOSCCS) ! static char *sccsid = "@(#)crypt.c 4.3.1 (2.11BSD) 1996/10/23"; ! #endif /* * A one-rotor machine designed along the lines of Enigma *************** *** 35,42 **** close(1); dup(pf[0]); dup(pf[1]); ! execl("/usr/lib/makekey", "-", 0); ! execl("/lib/makekey", "-", 0); exit(1); } write(pf[1], buf, 10); --- 37,43 ---- close(1); dup(pf[0]); dup(pf[1]); ! execl("/usr/libexec/makekey", "-", 0); exit(1); } write(pf[1], buf, 10); *** /usr/src/usr.bin/diction/Makefile.old Mon Feb 16 16:47:49 1987 --- /usr/src/usr.bin/diction/Makefile Wed Oct 23 20:17:04 1996 *************** *** 1,10 **** # ! # @(#)Makefile 4.5 (Berkeley) 83/06/30 # # make file for STYLE and DICTION # - # BIN is the directory for storing the object code - # for the 3 programs that make up style # DICT is the full pathname of the file dict.d, the # dictionary file used by DICTION # --- 1,8 ---- # ! # @(#)Makefile 4.5.1 (2.11BSD) 1996/10/23 # # make file for STYLE and DICTION # # DICT is the full pathname of the file dict.d, the # dictionary file used by DICTION # *************** *** 19,26 **** style.h style.sh explain.sh ydict.c \ README ! BIN = ${DESTDIR}/usr/lib ! DICT= -DDICT=\"/usr/lib/dict.d\" all: diction style --- 17,23 ---- style.h style.sh explain.sh ydict.c \ README ! DICT= -DDICT=\"/usr/share/misc/dict.d\" all: diction style *************** *** 27,42 **** style: style1 style2 style3 install: style diction style.sh diction.sh explain.sh dict.d explain.d ! install -s style1 ${DESTDIR}/usr/lib ! install -s style2 ${DESTDIR}/usr/lib ! install -s style3 ${DESTDIR}/usr/lib ! install -s dprog ${DESTDIR}/usr/lib ! install -c style.sh ${DESTDIR}/usr/bin/style ! install -c diction.sh ${DESTDIR}/usr/bin/diction ! install -c explain.sh ${DESTDIR}/usr/bin/explain ! install -c dict.d ${DESTDIR}/usr/lib ! install -c explain.d ${DESTDIR}/usr/lib ! # ln ${DESTDIR}/usr/bin/explain ${DESTDIR}/usr/bin/suggest clean: rm -f prtlex.c wdslex.c endlex.c --- 24,39 ---- style: style1 style2 style3 install: style diction style.sh diction.sh explain.sh dict.d explain.d ! -mkdir -p ${DESTDIR}/usr/libexec/diction ! install -s -m 755 style1 ${DESTDIR}/usr/libexec/diction ! install -s -m 755 style2 ${DESTDIR}/usr/libexec/diction ! install -s -m 755 style3 ${DESTDIR}/usr/libexec/diction ! install -s -m 755 dprog ${DESTDIR}/usr/libexec/diction ! install -c -m 755 style.sh ${DESTDIR}/usr/bin/style ! install -c -m 755 diction.sh ${DESTDIR}/usr/bin/diction ! install -c -m 755 explain.sh ${DESTDIR}/usr/bin/explain ! install -c -m 444 dict.d ${DESTDIR}/usr/share/misc ! install -c -m 444 explain.d ${DESTDIR}/usr/share/misc clean: rm -f prtlex.c wdslex.c endlex.c *** /usr/src/usr.bin/diction/diction.sh.old Mon Feb 16 16:22:16 1987 --- /usr/src/usr.bin/diction/diction.sh Fri Oct 25 21:06:52 1996 *************** *** 1,9 **** #! /bin/sh # ! # @(#)diction.sh 4.5 (Berkeley) 82/11/06 # D=/usr/bin ! B=/usr/lib echo $* rest= flag= --- 1,9 ---- #! /bin/sh # ! # @(#)diction.sh 4.5.1 (2.11BSD) 1996/10/25 # D=/usr/bin ! B=/usr/libexec/diction echo $* rest= flag= *** /usr/src/usr.bin/diction/explain.sh.old Mon Feb 16 16:22:16 1987 --- /usr/src/usr.bin/diction/explain.sh Fri Oct 25 21:03:57 1996 *************** *** 1,8 **** #! /bin/sh # ! # @(#)explain.sh 4.5 (Berkeley) 83/05/27 # ! D=/usr/lib/explain.d while echo 'phrase?' read x do --- 1,8 ---- #! /bin/sh # ! # @(#)explain.sh 4.5.1 (2.11BSD) 1996/10/25 # ! D=/usr/share/misc/explain.d while echo 'phrase?' read x do *** /usr/src/usr.bin/diction/style.sh.old Mon Feb 16 16:22:16 1987 --- /usr/src/usr.bin/diction/style.sh Fri Oct 25 21:11:10 1996 *************** *** 1,8 **** #! /bin/sh # ! # @(#)style.sh 4.5 (Berkeley) 82/11/06 # ! L=/usr/lib B=/usr/bin echo " " $* sflag=-s --- 1,8 ---- #! /bin/sh # ! # @(#)style.sh 4.5.1 (2.11BSD) 1996/10/25 # ! L=/usr/libexec/diction B=/usr/bin echo " " $* sflag=-s *** /usr/src/usr.bin/diction/suggest.sh.old Mon Feb 16 16:22:14 1987 --- /usr/src/usr.bin/diction/suggest.sh Fri Oct 25 21:08:19 1996 *************** *** 1,9 **** #! /bin/sh # ! # @(#)suggest.sh 4.4 (Berkeley) 82/11/06 # trap 'rm $$; exit' 1 2 3 15 ! D=/usr/lib/explain.d while echo "phrase?";read x do cat >$$ <$$ </tmp/d3a$$ diff $2 $3 >/tmp/d3b$$ ! /usr/lib/diff3 $e /tmp/d3[ab]$$ $1 $2 $3 --- 18,21 ---- trap "rm -f /tmp/d3[ab]$$" 0 1 2 13 15 diff $1 $3 >/tmp/d3a$$ diff $2 $3 >/tmp/d3b$$ ! /usr/libexec/diff3 $e /tmp/d3[ab]$$ $1 $2 $3 *** /usr/src/usr.bin/f77/BUG?.old Sat Sep 5 13:47:02 1987 --- /usr/src/usr.bin/f77/BUG? Fri Oct 25 22:40:25 1996 *************** *** 22,28 **** When this is compiled via "f77 -d junk.r", the following results: ratfor junk.r >junk.f ! /lib/f77pass1 -d junk.f /tmp/fort6926.s /tmp/fort6926.d /tmp/fort6926.x junk.f: MAIN test: /lib/c1 /tmp/fort6926.x - /tmp/fort6926.a --- 22,28 ---- When this is compiled via "f77 -d junk.r", the following results: ratfor junk.r >junk.f ! f77pass1 -d junk.f /tmp/fort6926.s /tmp/fort6926.d /tmp/fort6926.x junk.f: MAIN test: /lib/c1 /tmp/fort6926.x - /tmp/fort6926.a *************** *** 34,42 **** Note especially the message about "No code table" -- this comes from /lib/c1. ! While it is certainly possible that /lib/f77pass1 is generating something which /lib/c1 doesn't understand, I believe (from a somewhat ! cursory inspection of the source of /lib/f77pass1) that the problem does lie in /lib/c1. I am writing to inquire whether this is a known bug, and whether there --- 34,42 ---- Note especially the message about "No code table" -- this comes from /lib/c1. ! While it is certainly possible that f77pass1 is generating something which /lib/c1 doesn't understand, I believe (from a somewhat ! cursory inspection of the source of f77pass1) that the problem does lie in /lib/c1. I am writing to inquire whether this is a known bug, and whether there *** /usr/src/usr.bin/f77/Makefile.old Sun Jan 28 16:26:41 1996 --- /usr/src/usr.bin/f77/Makefile Fri Oct 25 22:42:51 1996 *************** *** 2,8 **** # generating code for the PDP11, # using the Ritchie pass 2 # ! # 1996/1/28 - 2.11BSD # AS= as -V --- 2,8 ---- # generating code for the PDP11, # using the Ritchie pass 2 # ! # 1996/10/25 - 2.11BSD # AS= as -V *************** *** 95,102 **** install: all install -s f77 ${DESTDIR}/usr/bin ! install -s f77pass1 ${DESTDIR}/lib ! install -c -m 644 ${STRINGS} ${DESTDIR}/lib clean: -rm -f f77 f77pass1 *.o gram.c x.c xs.c f77_strings strings --- 95,102 ---- install: all install -s f77 ${DESTDIR}/usr/bin ! install -s f77pass1 ${DESTDIR}/usr/libexec ! install -c -m 644 ${STRINGS} ${DESTDIR}/usr/share/misc clean: -rm -f f77 f77pass1 *.o gram.c x.c xs.c f77_strings strings *** /usr/src/usr.bin/f77/drivedefs.old Fri Feb 27 10:41:40 1987 --- /usr/src/usr.bin/f77/drivedefs Fri Oct 25 22:41:18 1996 *************** *** 8,14 **** Wrong Definitions File! #endif ! #define PASS1NAME "/lib/f77pass1" #define PASS2NAME "/lib/c1" #define PASS2OPT "/lib/c2" #define NOFLPASS2 "/lib/fc1" --- 8,14 ---- Wrong Definitions File! #endif ! #define PASS1NAME "/usr/libexec/f77pass1" #define PASS2NAME "/lib/c1" #define PASS2OPT "/lib/c2" #define NOFLPASS2 "/lib/fc1" *** /usr/src/usr.bin/f77/error.c.old Thu Apr 30 16:30:06 1987 --- /usr/src/usr.bin/f77/error.c Fri Oct 25 22:44:29 1996 *************** *** 2,8 **** #include "string_defs" #ifdef C_OVERLAY ! char efilname[] = "/lib/f77_strings"; int efil = -1; error(index,t,u,type) --- 2,8 ---- #include "string_defs" #ifdef C_OVERLAY ! char efilname[] = "/usr/share/misc/f77_strings"; int efil = -1; error(index,t,u,type)