Subject: The Grand Reorganization Continues (#350 - 7 of 8) Index: MANY(mostly etc)/MANY 2.11BSD Description: This is a continuation of the directory reorganization started in updates #335 thru 342. That series of updates was aimed at cleaning up /usr/lib (and to a very small extent /etc). This series of updates (#344 thru 351) (almost) completes the reorganization by dispersing all but the config files from /etc into /sbin, /usr/sbin, /usr/libexec, usw. Repeat-By: This is extracted from #335: "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 #350 (part 7 of 8). Updates #344 thru #351 comprise the 8 part kit which moves everything that is not a config file out of /etc. NOTE: All executables in /etc *EXCEPT* /etc/init and /etc/autoconfig are relocated by this update. Those two programs were left in /etc because: /etc/init is known to the kernel - moving 'init' without changing the kernel would render the system unbootable. Even if the kernel were updated there would be a big problem if an older kernel were to be used. /etc/autoconfig is known to 'init' and a change to 'init' at this time (amidst all the other patching) was not thought to be a "good idea" at this time. 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 rebuild is because two pathnames are widely known and/or implicitly referenced by *many* programs in the system: /etc/zoneinfo is used by the ctime() routine in libc.a and there are tens (hundreds?) of programs which call the ctime() family of functions. Because /etc/zoneinfo is moved to /usr/share/zoneinfo any program which references ctime() directly or indirectly needs to be relinked. The utmp file's pathname /etc/utmp is explicitly referenced by many programs in the system and since /etc/utmp is moved to /var/run/utmp all programs which read/write the utmp file need to be recompiled. The manifest is as follows: Part Patch# Contents ---- ----- -------- 1 344 Manifest of files. Introduction/tour. Instructions. Shell script to perform the relocation of directories. Suggested changes to locally modified files in /etc. A 'shar' file containing a new 'whereis' program. 2 345 Shar archive of all the new Makefiles which are to be installed on the system. This is a separate part because it's ~60kb worth of makefiles. 3-8 346-351 Patch files. Broken into ~64kb pieces. As always these, and all previous updates to 2.11BSD, are available via anonymous FTP to either FTP.IIPO.GTEGSC.COM or MOE.2BSD.COM in the directory /pub/2.11BSD. -------------------------#350 Cut here------------------------ *** /usr/src/sys/pdpdist/ttys.old Mon Aug 27 14:32:59 1990 --- /usr/src/sys/pdpdist/ttys Sun Nov 17 22:24:26 1996 *************** *** 1,20 **** # # name getty type status comments # ! console "/etc/getty Console-1200" unknown on secure ! tty00 "/etc/getty std.9600" unknown on secure ! tty01 "/etc/getty std.9600" unknown on secure ! tty02 "/etc/getty std.9600" unknown on secure ! tty03 "/etc/getty std.9600" unknown on secure ! tty04 "/etc/getty std.9600" unknown on secure ! tty05 "/etc/getty std.9600" unknown on secure ! tty06 "/etc/getty std.9600" unknown on secure ! tty07 "/etc/getty std.9600" unknown on secure ! ttyp0 none network ! ttyp1 none network ! ttyp2 none network ! ttyp3 none network ! ttyp4 none network ttyp5 none network ttyp6 none network ttyp7 none network --- 1,21 ---- # # name getty type status comments # ! console "/usr/libexec/getty std.9600" vt100 on secure #special ! ttyS0 "/usr/libexec/getty std.9600" vt100 off secure ! ttyS1 "/usr/libexec/getty std.9600" vt100 off secure ! ttyS2 "/usr/libexec/getty std.9600" vt100 off secure ! ttyS3 "/usr/libexec/getty std.9600" vt100 off secure ! ttyS4 "/usr/libexec/getty std.9600" vt100 off secure ! ttyS5 "/usr/libexec/getty std.9600" vt100 off secure #printer ! ttyS6 "/usr/libexec/getty std.9600" vt100 off secure ! ttyS7 "/usr/libexec/getty std.9600" vt100 off secure ! ttyl1 "/usr/libexec/getty std.9600" vt100 off secure ! ttyp0 none network secure ! ttyp1 none network secure ! ttyp2 none network secure ! ttyp3 none network secure ! ttyp4 none network secure ttyp5 none network ttyp6 none network ttyp7 none network *** /usr/src/sys/pdpif/if_vv.c.old Wed Sep 13 22:30:09 1989 --- /usr/src/sys/pdpif/if_vv.c Sun Nov 17 22:26:28 1996 *************** *** 3,9 **** * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * ! * @(#)if_vv.c 2.0 (2.10.1BSD Berkeley) 8/25/89 */ #include "vv.h" --- 3,9 ---- * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * ! * @(#)if_vv.c 2.1 (2.11BSD) 1996/11/27 */ #include "vv.h" *************** *** 28,34 **** * * Of course, nothing but BSD UNIX supports trailers on ProNET. * If you need interoperability with anything else, turn off ! * trailers using the -trailers option to /etc/ifconfig! * * HARDWARE COMPATABILITY: This driver prefers that the HSBU (p1001) * have a serial number >= 040, which is about March, 1982. Older --- 28,34 ---- * * Of course, nothing but BSD UNIX supports trailers on ProNET. * If you need interoperability with anything else, turn off ! * trailers using the -trailers option to ifconfig! * * HARDWARE COMPATABILITY: This driver prefers that the HSBU (p1001) * have a serial number >= 040, which is about March, 1982. Older *** /usr/src/sys/pdpstand/Makefile.old Mon Oct 28 20:19:32 1996 --- /usr/src/sys/pdpstand/Makefile Sat Nov 16 20:56:09 1996 *************** *** 1,4 **** ! # Standalone Makefile # # The limitations on program size have been removed. The addition # of disklabel support pushed 'restor' over the limit. Even with --- 1,4 ---- ! # Makefile (2.11BSD) 2.0 1996/11/16 # # The limitations on program size have been removed. The addition # of disklabel support pushed 'restor' over the limit. Even with *************** *** 32,41 **** DUMP= /usr/root.dump ROOT= ! ETCSRC= ${ROOT}/usr/src/etc ! MKFS= ${ETCSRC}/mkfs.c ! RESTOR= ${ETCSRC}/restor/restor.c ! ICHECK= ${ETCSRC}/icheck.c DEFS= -DSTANDALONE -I${ROOT}/usr/include -I${ROOT}. CFLAGS= -O ${DEFS} --- 32,41 ---- DUMP= /usr/root.dump ROOT= ! SBINSRC=${ROOT}/usr/src/sbin ! MKFS= ${SBINSRC}/mkfs/mkfs.c ! RESTOR= ${SBINSRC}/restor/restor.c ! ICHECK= ${SBINSRC}/icheck/icheck.c DEFS= -DSTANDALONE -I${ROOT}/usr/include -I${ROOT}. CFLAGS= -O ${DEFS} *** /usr/src/sys/vaxif/if_vv.c.old Thu Jun 5 17:12:52 1986 --- /usr/src/sys/vaxif/if_vv.c Sun Nov 17 22:27:22 1996 *************** *** 28,34 **** * * Of course, nothing but BSD UNIX supports trailers on ProNET. * If you need interoperability with anything else, turn off ! * trailers using the -trailers option to /etc/ifconfig! * * HARDWARE COMPATABILITY: This driver prefers that the HSBU (p1001) * have a serial number >= 040, which is about March, 1982. Older --- 28,34 ---- * * Of course, nothing but BSD UNIX supports trailers on ProNET. * If you need interoperability with anything else, turn off ! * trailers using the -trailers option to ifconfig! * * HARDWARE COMPATABILITY: This driver prefers that the HSBU (p1001) * have a serial number >= 040, which is about March, 1982. Older *** /usr/src/ucb/Makefile.old Sat Feb 12 22:24:53 1994 --- /usr/src/ucb/Makefile Wed Nov 27 21:33:34 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.17.2 (2.11BSD GTE) 2/12/94 # DESTDIR= CFLAGS= -O --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.17.3 (2.11BSD GTE) 1996/11/27 # DESTDIR= CFLAGS= -O *************** *** 26,32 **** from gprof grep groups head last lastcomm leave logger mkstr \ printenv ruptime rwho sccs script soelim strings strcompact \ symcompact symdump symorder tail tcopy telnet unexpand unifdef users \ ! whereis whoami whois what wc xstr yes # C programs that live in the current directory and need explicit make lines. # --- 26,32 ---- from gprof grep groups head last lastcomm leave logger mkstr \ printenv ruptime rwho sccs script soelim strings strcompact \ symcompact symdump symorder tail tcopy telnet unexpand unifdef users \ ! whoami whois what wc xstr yes # C programs that live in the current directory and need explicit make lines. # *** /usr/src/ucb/PORT/sysline.1.old Sun Dec 14 15:06:46 1986 --- /usr/src/ucb/PORT/sysline.1 Wed Nov 27 21:25:58 1996 *************** *** 2,10 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)sysline.1 6.3 (Berkeley) 6/5/86 .\" ! .TH SYSLINE 1 "June 5, 1986" .UC 5 .SH NAME sysline \- display system status on status line of a terminal --- 2,10 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)sysline.1 6.3.1 (2.11BSD) 1996/11/27 .\" ! .TH SYSLINE 1 "November 27, 1996" .UC 5 .SH NAME sysline \- display system status on status line of a terminal *************** *** 135,141 **** .SH FILES .ta 2.4i .nf ! /etc/utmp names of people who are logged in /dev/kmem contains process table [VAX only] /usr/spool/rwho/whod.* who/uptime information for remote hosts [VAX only] ${HOME}/.who information to print on bottom line --- 135,141 ---- .SH FILES .ta 2.4i .nf ! /var/run/utmp names of people who are logged in /dev/kmem contains process table [VAX only] /usr/spool/rwho/whod.* who/uptime information for remote hosts [VAX only] ${HOME}/.who information to print on bottom line *** /usr/src/ucb/ex/ex_cmds.c.old Sun Sep 8 11:58:02 1991 --- /usr/src/ucb/ex/ex_cmds.c Tue Nov 19 21:04:23 1996 *************** *** 5,11 **** */ #if !defined(lint) && defined(DOSCCS) ! static char *sccsid = "@(#)ex_cmds.c 7.10 (Berkeley) 6/7/85"; #endif #include "ex.h" --- 5,11 ---- */ #if !defined(lint) && defined(DOSCCS) ! static char *sccsid = "@(#)ex_cmds.c 7.10.1 (2.11BSD) 1996/11/19"; #endif #include "ex.h" *************** *** 487,493 **** if (!exclam()) { ckaw(); if (chng && dol > zero) ! error("No write@since last chage (:rewind! overrides)"); } eol(); erewind(); --- 487,493 ---- if (!exclam()) { ckaw(); if (chng && dol > zero) ! error("No write@since last change (:rewind! overrides)"); } eol(); erewind(); *** /usr/src/ucb/finger/Makefile.old Sun Jan 28 19:54:22 1996 --- /usr/src/ucb/finger/Makefile Sun Dec 1 14:47:55 1996 *************** *** 14,25 **** # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND # FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.2.1 (2.11BSD) 1996/1/28 # SEPFLAG= -i CFLAGS= -O -DSECSPERDAY=86400 -DDAYSPERNYEAR=365 ${SEPFLAG} - LIBC= /lib/libc.a SRCS= finger.c lprint.c net.c sprint.c util.c OBJS= finger.o lprint.o net.o sprint.o util.o MAN= finger.0 --- 14,24 ---- # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND # FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.2.2 (2.11BSD) 1996/12/1 # SEPFLAG= -i CFLAGS= -O -DSECSPERDAY=86400 -DDAYSPERNYEAR=365 ${SEPFLAG} SRCS= finger.c lprint.c net.c sprint.c util.c OBJS= finger.o lprint.o net.o sprint.o util.o MAN= finger.0 *************** *** 26,32 **** all: finger ${MAN} ! finger: ${LIBC} ${OBJS} ${CC} -o $@ ${CFLAGS} ${OBJS} clean: --- 25,31 ---- all: finger ${MAN} ! finger: ${OBJS} ${CC} -o $@ ${CFLAGS} ${OBJS} clean: *** /usr/src/ucb/ftp/Makefile.old Sun Jan 28 18:46:08 1996 --- /usr/src/ucb/ftp/Makefile Sun Dec 1 14:48:11 1996 *************** *** 14,23 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.9.1 (2.11BSD) 1996/1/28 # CFLAGS= -O -I. - LIBC= /lib/libc.a SEPFLAG= -i SRCS= cmds.c cmdtab.c ftp.c glob.c main.c ruserpass.c domacro.c OBJS= cmds.o cmdtab.o ftp.o glob.o main.o ruserpass.o domacro.o --- 14,22 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.9.2 (2.11BSD) 1996/12/1 # CFLAGS= -O -I. SEPFLAG= -i SRCS= cmds.c cmdtab.c ftp.c glob.c main.c ruserpass.c domacro.c OBJS= cmds.o cmdtab.o ftp.o glob.o main.o ruserpass.o domacro.o *************** *** 26,32 **** all: ftp ${MAN} ! ftp: ${OBJS} ${LIBC} ${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS} ftp.0: ${MANSRC} --- 25,31 ---- all: ftp ${MAN} ! ftp: ${OBJS} ${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS} ftp.0: ${MANSRC} *** /usr/src/ucb/leave.c.old Mon Feb 16 22:11:07 1987 --- /usr/src/ucb/leave.c Sun Nov 17 22:34:13 1996 *************** *** 4,21 **** * 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[] = "@(#)leave.c 5.1 (Berkeley) 5/31/85"; ! #endif not lint #include #include /* * leave [[+]hhmm] * --- 4,23 ---- * 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[] = "@(#)leave.c 5.1.1 (2.11BSD) 1996/11/17"; ! #endif #include #include + #include + #include + #include + /* * leave [[+]hhmm] * *************** *** 24,32 **** * It nags you like a mother hen. */ char origlogin[20]; - char *getlogin(); char *whenleave; - char *ctime(); char buff[100]; main(argc, argv) --- 26,32 ---- *************** *** 34,42 **** { long when, tod, now, diff, hours, minutes; char *cp; ! int *nv; ! int atoi(); ! int *localtime(); strcpy(origlogin, getlogin()); if (argc < 2) { --- 34,40 ---- { long when, tod, now, diff, hours, minutes; char *cp; ! register struct tm *nv; strcpy(origlogin, getlogin()); if (argc < 2) { *************** *** 77,85 **** time(&now); nv = localtime(&now); when = 60*hours+minutes; ! if (nv[2] > 12) ! nv[2] -= 12; /* do am/pm bit */ ! now = 60*nv[2] + nv[1]; diff = when - now; while (diff < 0) diff += 12*60; --- 75,83 ---- time(&now); nv = localtime(&now); when = 60*hours+minutes; ! if (nv->tm_hour > 12) ! nv->tm_hour -= 12; /* do am/pm bit */ ! now = (60 * nv->tm_hour) + nv->tm_min; diff = when - now; while (diff < 0) diff += 12*60; *************** *** 184,201 **** exit(0); } } - - #ifdef V6 - char *getlogin() { - #include - - static struct utmp ubuf; - int ufd; - - ufd = open("/etc/utmp",0); - seek(ufd, ttyn(0)*sizeof(ubuf), 0); - read(ufd, &ubuf, sizeof(ubuf)); - ubuf.ut_name[sizeof(ubuf.ut_name)] = 0; - return(&ubuf.ut_name); - } - #endif --- 182,184 ---- *** /usr/src/ucb/lock/Makefile.old Sun Jan 28 19:54:35 1996 --- /usr/src/ucb/lock/Makefile Sun Dec 1 14:48:29 1996 *************** *** 14,25 **** # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND # FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.2.1 (2.11BSD) 1996/1/28 # CFLAGS= -O SEPFLAG= -i - LIBC= /lib/libc.a SRCS= lock.c OBJS= lock.o MAN= lock.0 --- 14,24 ---- # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND # FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.2.2 (2.11BSD) 1996/12/1 # CFLAGS= -O SEPFLAG= -i SRCS= lock.c OBJS= lock.o MAN= lock.0 *************** *** 27,33 **** all: lock ${MAN} ! lock: ${LIBC} ${OBJS} ${CC} ${SEPFLAG} -o $@ ${OBJS} lock.0: ${MANSRC} --- 26,32 ---- all: lock ${MAN} ! lock: ${OBJS} ${CC} ${SEPFLAG} -o $@ ${OBJS} lock.0: ${MANSRC} *** /usr/src/ucb/man/Makefile.old Sun Jan 28 19:44:46 1996 --- /usr/src/ucb/man/Makefile Sun Dec 1 14:48:47 1996 *************** *** 14,24 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.5.1 (2.11BSD) 1996/1/28 # CFLAGS= -O SEPFLAG= -i - LIBC= /lib/libc.a ASRCS= apropos.c AOBJS= apropos.o MSRCS= man.c --- 14,23 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.5.2 (2.11BSD) 1996/12/1 # CFLAGS= -O SEPFLAG= -i ASRCS= apropos.c AOBJS= apropos.o MSRCS= man.c *************** *** 26,35 **** all: man apropos ! apropos: ${LIBC} ${AOBJS} ${CC} ${SEPFLAG} -o $@ ${AOBJS} ! man: ${LIBC} ${MOBJS} ${CC} ${SEPFLAG} -o $@ ${MOBJS} clean: FRC --- 25,34 ---- all: man apropos ! apropos: ${AOBJS} ${CC} ${SEPFLAG} -o $@ ${AOBJS} ! man: ${MOBJS} ${CC} ${SEPFLAG} -o $@ ${MOBJS} clean: FRC *** /usr/src/ucb/netstat/Makefile.old Mon Jan 18 09:35:58 1993 --- /usr/src/ucb/netstat/Makefile Sun Dec 1 14:49:07 1996 *************** *** 8,24 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # @(#)Makefile 5.8 (Berkeley) 2/7/88 # # CFLAGS= -O -i - LIBC= /lib/libc.a SRCS= host.c inet.c if.c main.c mbuf.c route.c unix.c ns.c OBJS= host.o inet.o if.o main.o mbuf.o route.o unix.o ns.o all: netstat ! netstat: ${OBJS} ${LIBC} ${CC} -o $@ ${CFLAGS} ${OBJS} clean: FRC --- 8,23 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # @(#)Makefile 5.8.1 (2.11BSD) 1996/12/1 # # CFLAGS= -O -i SRCS= host.c inet.c if.c main.c mbuf.c route.c unix.c ns.c OBJS= host.o inet.o if.o main.o mbuf.o route.o unix.o ns.o all: netstat ! netstat: ${OBJS} ${CC} -o $@ ${CFLAGS} ${OBJS} clean: FRC *** /usr/src/ucb/tn3270/Makefile.old Fri Apr 8 23:34:53 1994 --- /usr/src/ucb/tn3270/Makefile Sun Dec 1 16:47:35 1996 *************** *** 1,5 **** # Makefile for tn3270 and friends... ! # @(#)Makefile 2.11 April 8, 1994 CC = cc SEPFLAG = -i --- 1,5 ---- # Makefile for tn3270 and friends... ! # @(#)Makefile 2.12 1996/11/16 CC = cc SEPFLAG = -i *************** *** 21,27 **** DESTDIR= BINDIR = $(DESTDIR)/usr/ucb - ETCDIR = $(DESTDIR)/etc # Names for the terminal libraries... LIBCURSES = -lcurses --- 21,26 ---- *************** *** 59,68 **** # /lib/cpp -E $< | as -o $@ ALLC = ${MOSTC} ${TNMAIN} ${MSMAIN} ${SUBS} ! ALLC = ${MOSTC} ${TNMAIN} ${MSMAIN} ALLS = ! ALLS = vaxbsubs.s MOSTO = tn3270.o ebctab.o asctab.o termin.o keyboard.o \ datastream.o screen.o map3270.o options.o \ --- 58,67 ---- # /lib/cpp -E $< | as -o $@ ALLC = ${MOSTC} ${TNMAIN} ${MSMAIN} ${SUBS} ! # ALLC = ${MOSTC} ${TNMAIN} ${MSMAIN} ALLS = ! #ALLS = vaxbsubs.s MOSTO = tn3270.o ebctab.o asctab.o termin.o keyboard.o \ datastream.o screen.o map3270.o options.o \ *************** *** 78,95 **** mset: mset.o map3270.o ${CC} ${CFLAGS} ${SEPFLAG} -o mset mset.o map3270.o $(LIBCURSES) ! install: tn3270 mset map3270 install -s tn3270 $(BINDIR) install -s mset $(BINDIR) - install -c -m 444 map3270 $(ETCDIR) clean: rm -f $(ALLO) mset tn3270 m4.out errs Makefile.bak - print: - print ${ALLH} ${M4FILE} ${MOSTC} ${TNMAIN} ${MSMAIN} ${SUBS} - fold default.map3270 | pr -f -h "` echo default.map3270 - ;date`" | lpr - tags: ${ALLC} ${ALLH} ctags -t ${ALLC} ${ALLH} --- 77,89 ---- mset: mset.o map3270.o ${CC} ${CFLAGS} ${SEPFLAG} -o mset mset.o map3270.o $(LIBCURSES) ! install: tn3270 mset install -s tn3270 $(BINDIR) install -s mset $(BINDIR) clean: rm -f $(ALLO) mset tn3270 m4.out errs Makefile.bak tags: ${ALLC} ${ALLH} ctags -t ${ALLC} ${ALLH} *************** *** 97,126 **** lint ${LINTFLAGS} ${TNMAIN} ${MOSTC} -lcurses lint ${LINTFLAGS} ${MSMAIN} map3270.c -lcurses - .DEFAULT: - sccs get $< - m4.out: termcodes.m4 ! /bin/rm -f m4.out m4 termcodes.m4 > m4.out ! /bin/chmod 444 m4.out ! depend: ! grep '^#include' ${ALLC} | grep -v '<' | \ ! sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' \ ! -e 's/\.c/.o/' \ ! -e 's,../[a-zA-Z]*/,,' | \ ! 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 '$$r makedep' >>eddep ! echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep ! echo '$$r makedep' >>eddep ! echo 'w' >>eddep ! cp Makefile Makefile.bak ! ed - Makefile < eddep ! rm eddep makedep # DO NOT DELETE THIS LINE --- 91,103 ---- lint ${LINTFLAGS} ${TNMAIN} ${MOSTC} -lcurses lint ${LINTFLAGS} ${MSMAIN} map3270.c -lcurses m4.out: termcodes.m4 ! rm -f m4.out m4 termcodes.m4 > m4.out ! chmod 444 m4.out ! depend: ${ALLC} ! mkdep ${CFLAGS} ${ALLC} # DO NOT DELETE THIS LINE *** /usr/src/ucb/tn3270/README.old Mon Feb 16 22:11:03 1987 --- /usr/src/ucb/tn3270/README Sat Nov 16 22:21:02 1996 *************** *** 15,21 **** for describing the mapping of key-strokes to 3270 keys (which file format might or might not be the one we currently use). ! It would be nice if the entire MAP3270/mset/"/etc/map3270"/etc. thing were generalized in some way. Anyway... --- 15,21 ---- for describing the mapping of key-strokes to 3270 keys (which file format might or might not be the one we currently use). ! It would be nice if the entire MAP3270/mset/map3270 thing were generalized in some way. Anyway... *** /usr/src/ucb/tn3270/default.map3270.old Mon Feb 16 22:11:06 1987 --- /usr/src/ucb/tn3270/default.map3270 Sat Nov 16 22:26:58 1996 *************** *** 1,6 **** /* default.map3270: This file is the system default for the key sequence * if neither the user's TERM nor "unknown" are found in either of ! * MAP3270 or /etc/map3270. * * @(#)default.map3270 1.1 * --- 1,6 ---- /* default.map3270: This file is the system default for the key sequence * if neither the user's TERM nor "unknown" are found in either of ! * MAP3270 or /usr/share/misc/map3270. * * @(#)default.map3270 1.1 * *** /usr/src/ucb/tn3270/map3270.c.old Sat Jan 1 02:08:06 1994 --- /usr/src/ucb/tn3270/map3270.c Sat Nov 16 22:29:50 1996 *************** *** 21,30 **** #if defined(DOSCCS) && !defined(lint) ! static char sccsid[] = "@(#)map3270.c 2.6"; #endif ! /* This program reads a description file, somewhat like /etc/termcap, that describes the mapping between the current terminals keyboard and a 3270 keyboard. */ --- 21,30 ---- #if defined(DOSCCS) && !defined(lint) ! static char sccsid[] = "@(#)map3270.c 2.6.1 (2.11BSD) 1996/11/16"; #endif ! /* This program reads a description file, somewhat like 'termcap', that describes the mapping between the current terminals keyboard and a 3270 keyboard. */ *************** *** 92,97 **** --- 92,99 ---- static int debug = 0; /* debug flag (for debuggin tables) */ #endif /* DEBUG */ + static char *Map3270 = "/usr/share/misc/map3270"; + static int doPaste = 1; /* should we have side effects */ static char usePointer; /* use pointer, or file */ static FILE *ourFile; *************** *** 801,807 **** GotIt = Position(environPointer, termPointer); } if (!GotIt) { ! GotIt = Position("/etc/map3270", termPointer); } } if (!GotIt) { --- 803,809 ---- GotIt = Position(environPointer, termPointer); } if (!GotIt) { ! GotIt = Position(Map3270, termPointer); } } if (!GotIt) { *************** *** 809,815 **** GotIt = Position(environPointer, "unknown"); } if (!GotIt) { ! GotIt = Position("/etc/map3270", "unknown"); } } if (!GotIt) { --- 811,817 ---- GotIt = Position(environPointer, "unknown"); } if (!GotIt) { ! GotIt = Position(Map3270, "unknown"); } } if (!GotIt) { *** /usr/src/ucb/users.c.old Mon Feb 16 22:11:17 1987 --- /usr/src/ucb/users.c Sun Nov 17 22:39:56 1996 *************** *** 4,23 **** * 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[] = "@(#)users.c 5.2 (Berkeley) 11/15/85"; ! #endif not lint /* * users */ - char *malloc(); #include #include --- 4,20 ---- * 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[] = "@(#)users.c 5.2.1 (2.11BSD) 1996/11/17"; ! #endif /* * users */ #include #include *************** *** 33,39 **** register char *tp, *s; register FILE *fi; ! s = "/etc/utmp"; if(argc == 2) s = argv[1]; if ((fi = fopen(s, "r")) == NULL) { --- 30,36 ---- register char *tp, *s; register FILE *fi; ! s = _PATH_UTMP; if(argc == 2) s = argv[1]; if ((fi = fopen(s, "r")) == NULL) { *************** *** 55,61 **** char temp[NMAX+1]; strncpy(temp, utmp.ut_name, NMAX); temp[NMAX] = 0; ! *namp = malloc(strlen(temp) + 1); strcpy(*namp++, temp); } --- 52,58 ---- char temp[NMAX+1]; strncpy(temp, utmp.ut_name, NMAX); temp[NMAX] = 0; ! *namp = (char *)malloc(strlen(temp) + 1); strcpy(*namp++, temp); } *** /usr/src/ucb/w.c.old Thu Jan 19 22:55:00 1995 --- /usr/src/ucb/w.c Sun Nov 17 22:43:04 1996 *************** *** 1,4 **** --- 1,6 ---- /* + * w.c (2.11BSD) 2.0 1996/11/17 + * * w - print system status (who and what) * * Rewritten using sysctl, no nlist used - 1/19/94 - sms. *************** *** 123,129 **** if (wcmd) readpr(); ! ut = fopen("/etc/utmp","r"); if (header) { /* Print time of day */ time(&now); --- 125,131 ---- if (wcmd) readpr(); ! ut = fopen(_PATH_UTMP, "r"); if (header) { /* Print time of day */ time(&now); *** /usr/src/usr.bin/Makefile.old Tue Oct 22 21:06:02 1996 --- /usr/src/usr.bin/Makefile Wed Nov 27 21:35:25 1996 *************** *** 1,4 **** ! # Makefile 1.5 (2.11BSD GTE) 1996/10/22 # DESTDIR= CFLAGS= -O --- 1,4 ---- ! # Makefile 1.6 (2.11BSD GTE) 1996/11/19 # DESTDIR= CFLAGS= -O *************** *** 6,15 **** # Programs that live in subdirectories, and have makefiles of their own. # ! SUBDIR= at calendar dc diction diff3 eqn f77 find graph learn lex lint \ m4 neqn plot printf prof ranlib ratfor refer roff spell struct tbl \ mkerrlst \ ! tip uucp uname yacc xargs xinstall # Shell scripts that need only be installed and are never removed. # --- 6,15 ---- # Programs that live in subdirectories, and have makefiles of their own. # ! SUBDIR= at calendar dc diction diff3 eqn fstat f77 find graph learn lex lint \ m4 neqn plot printf prof ranlib ratfor refer roff spell struct tbl \ mkerrlst \ ! renice tip uucp uname whereis yacc xargs xinstall # Shell scripts that need only be installed and are never removed. # *** /usr/src/usr.bin/renice/renice.8.old Sun Dec 14 15:08:43 1986 --- /usr/src/usr.bin/renice/renice.8 Sun Nov 17 20:29:54 1996 *************** *** 2,15 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)renice.8 6.2 (Berkeley) 5/19/86 .\" ! .TH RENICE 8 "May 19, 1986" .UC 4 .SH NAME renice \- alter priority of running processes .SH SYNOPSIS ! .B /etc/renice priority [ [ .B \-p ] pid ... ] [ [ --- 2,15 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)renice.8 6.2.1 (2.11BSD) 1996/11/17 .\" ! .TH RENICE 8 "November 17, 1996" .UC 4 .SH NAME renice \- alter priority of running processes .SH SYNOPSIS ! .B renice priority [ [ .B \-p ] pid ... ] [ [ *************** *** 47,53 **** interpretation to be (the default) process ID's. For example, .sp ! /etc/renice +1 987 -u daemon root -p 32 .sp would change the priority of process ID's 987 and 32, and all processes owned by users daemon and root. --- 47,53 ---- interpretation to be (the default) process ID's. For example, .sp ! renice +1 987 -u daemon root -p 32 .sp would change the priority of process ID's 987 and 32, and all processes owned by users daemon and root. *** /usr/src/usr.bin/renice/renice.c.old Sun Feb 15 20:51:21 1987 --- /usr/src/usr.bin/renice/renice.c Sun Nov 17 20:31:52 1996 *************** *** 4,23 **** * 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[] = "@(#)renice.c 5.1 (Berkeley) 5/28/85"; ! #endif not lint #include #include #include #include /* * Change the priority (nice) of processes --- 4,22 ---- * 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[] = "@(#)renice.c 5.1.1 (2.11BSD) 1996/11/17"; ! #endif #include #include #include #include + #include /* * Change the priority (nice) of processes *************** *** 81,87 **** int which, who, prio; { int oldprio; - extern int errno; errno = 0, oldprio = getpriority(which, who); if (oldprio == -1 && errno) { --- 80,85 ---- *** /usr/src/usr.bin/roff/nroff/Makefile.old Mon Jan 18 09:36:51 1993 --- /usr/src/usr.bin/roff/nroff/Makefile Sun Dec 1 14:49:31 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 4.4 (Berkeley) 6/19/87 # # Defined SHARED_DATA to be whatever will make your compiler make initialized --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 4.4.1 (2.11BSD) 1996/12/1 # # Defined SHARED_DATA to be whatever will make your compiler make initialized *************** *** 21,27 **** COMMON= ../common_source VPATH= ${COMMON} - LIBC= /lib/libc.a SRCS= ni.c nii.c n1.c n2.c n3.c n4.c n5.c n6.c n7.c n8.c n9.c n10.c \ hytab.c ntab.c suftab.c OBJS= ni.o nii.o n1.o n2.o n3.o n4.o n5.o n6.o n7.o n8.o n9.o n10.o \ --- 21,26 ---- *************** *** 29,35 **** all: nroff ! nroff: ${OBJS} ${LIBC} ${CC} ${CFLAGS} ${SEPFLAG} -o $@ ${OBJS} hytab.o: ${COMMON}/hytab.c ${COMMON}/textscript --- 28,34 ---- all: nroff ! nroff: ${OBJS} ${CC} ${CFLAGS} ${SEPFLAG} -o $@ ${OBJS} hytab.o: ${COMMON}/hytab.c ${COMMON}/textscript *** /usr/src/usr.bin/roff/nroff_term/Makefile.old Sun Oct 27 20:57:09 1996 --- /usr/src/usr.bin/roff/nroff_term/Makefile Sun Dec 1 14:49:51 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 4.7.1 (2.11BSD) 1996/10/23 # # Possible options: # make compile source for all terminal tables below --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 4.7.2 (2.11BSD) 1996/12/1 # # Possible options: # make compile source for all terminal tables below *************** *** 11,17 **** # make install move tables to ${DEST} # make clean remove tab*.o files lying around CFLAGS= -O - LIBC= /lib/libc.a DEST= ${DESTDIR}/usr/share/term SRCS= tab300-12.c tab300.c tab302-12.c tab302.c tab37.c tab382-12.c \ tab382.c tab450-12.c tab450.c tab833-12.c tab833.c tabepson.c \ --- 11,16 ---- *** /usr/src/usr.bin/roff/troff/Makefile.old Mon Jan 18 09:36:53 1993 --- /usr/src/usr.bin/roff/troff/Makefile Sun Dec 1 14:50:11 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.1 (Berkeley) 12/12/87 # # Defined SHARED_DATA to be whatever will make your compiler make initialized --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.1.1 (2.11BSD) 1996/12/1 # # Defined SHARED_DATA to be whatever will make your compiler make initialized *************** *** 21,27 **** COMMON= ../common_source VPATH= ${COMMON} - LIBC= /lib/libc.a SRCS= ni.c nii.c n1.c n2.c n3.c n4.c n5.c t6.c n7.c n8.c n9.c t10.c \ hytab.c suftab.c tab3.c OBJS= ni.o nii.o n1.o n2.o n3.o n4.o n5.o t6.o n7.o n8.o n9.o t10.o \ --- 21,26 ---- *** /usr/src/usr.bin/roff/troff_font/Makefile.old Mon Dec 26 13:05:23 1988 --- /usr/src/usr.bin/roff/troff_font/Makefile Sun Dec 1 14:50:36 1996 *************** *** 3,18 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.2 (Berkeley) 6/18/87 # CFLAGS= -O - LIBC= /lib/libc.a SRCS= mkfont.c OBJS= mkfont.o all: mkfont ! mkfont: ${OBJS} ${LIBC} ${CC} -o $@ ${CFLAGS} ${OBJS} clean: FRC --- 3,17 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.2.1 (2.11BSD) 1996/12/1 # CFLAGS= -O SRCS= mkfont.c OBJS= mkfont.o all: mkfont ! mkfont: ${OBJS} ${CC} -o $@ ${CFLAGS} ${OBJS} clean: FRC *** /usr/src/usr.bin/tip/Makefile.old Mon Jan 25 19:50:01 1993 --- /usr/src/usr.bin/tip/Makefile Sun Dec 1 14:51:01 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.4 (Berkeley) 6/18/87 # # make file for intermachine communications package # --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.4.1 (2.11BSD) 1996/12/1 # # make file for intermachine communications package # *************** *** 42,48 **** CONFIG= -DHAYES CFLAGS= -O -DDEFBR=1200 -DDEFFS=BUFSIZ -DACULOG -DPRISTINE SEPFLAG=-i - LIBC= /lib/libc.a SRCS= acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c partab.c remcap.c \ remote.c tip.c tipout.c uucplock.c value.c vars.c OBJS= acu.o acutab.o cmds.o cmdtab.o cu.o hunt.o log.o partab.o remcap.o \ --- 42,47 ---- *************** *** 50,56 **** all: aculib tip ! tip: ${OBJS} ${LIBC} ${CC} ${SEPFLAG} -o $@ ${OBJS} aculib/aculib.a remcap.o: remcap.c --- 49,55 ---- all: aculib tip ! tip: ${OBJS} ${CC} ${SEPFLAG} -o $@ ${OBJS} aculib/aculib.a remcap.o: remcap.c *** /usr/src/usr.bin/tip/aculib/Makefile.old Thu Jan 6 23:36:02 1994 --- /usr/src/usr.bin/tip/aculib/Makefile Sun Dec 1 14:51:17 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.3.1 (2.11BSD GTE) 1/06/94 # # make file for tip device drivers # --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.3.2 (2.11BSD GTE) 1996/12/1 # # make file for tip device drivers # *************** *** 18,24 **** # VADIC 831 RS232 adaptor # VADIC 3451 CFLAGS= -O -I.. - LIBC= /lib/libc.a SRCS= biz22.c biz31.c courier.c df.c dn11.c hayes.c ventel.c v831.c \ v3451.c penril.c OBJS= biz22.o biz31.o courier.o df.o dn11.o hayes.o ventel.o v831.o \ --- 18,23 ---- *** /usr/src/usr.bin/uucp/Makefile.old Fri Nov 1 19:22:25 1996 --- /usr/src/usr.bin/uucp/Makefile Sun Nov 17 22:44:42 1996 *************** *** 1,4 **** ! # Makefile 5.11.2 (2.11BSD GTE) 1996/10/24 # # LIBS can be set to reference other object modules and libraries needed # by uucico, such as -lunet (needed when UNET is defined). --- 1,4 ---- ! # Makefile 5.11.3 (2.11BSD GTE) 1996/11/17 # # LIBS can be set to reference other object modules and libraries needed # by uucico, such as -lunet (needed when UNET is defined). *************** *** 128,143 **** -for i in ${SPOOL} ${PUBDIR} ${XQTDIR} ${CORRUPT} \ ${AUDIT} ${LCK} ${LOG} ${STST} ; do \ rm -f $$i ; mkdir $$i ; \ ! chmod 755 $$i; /etc/chown ${OWNER} $$i; chgrp ${GROUP} $$i ; \ done chmod 777 ${PUBDIR} ${LCK} -cd ${LOG}; for i in uucico uux uuxqt uucp xferstats; do\ rm -f $$i ; mkdir $$i ; \ ! chmod 755 $$i; /etc/chown ${OWNER} $$i; chgrp ${GROUP} $$i ; \ done -cd ${SPOOL}; for i in ${SUBDIRS} ; do \ mkdir $$i; \ ! /etc/chown ${OWNER} $$i; chgrp ${GROUP} $$i; chmod 755 $$i; \ done uulib.a: ${COMMON} --- 128,143 ---- -for i in ${SPOOL} ${PUBDIR} ${XQTDIR} ${CORRUPT} \ ${AUDIT} ${LCK} ${LOG} ${STST} ; do \ rm -f $$i ; mkdir $$i ; \ ! chmod 755 $$i; chown ${OWNER} $$i; chgrp ${GROUP} $$i ; \ done chmod 777 ${PUBDIR} ${LCK} -cd ${LOG}; for i in uucico uux uuxqt uucp xferstats; do\ rm -f $$i ; mkdir $$i ; \ ! chmod 755 $$i; chown ${OWNER} $$i; chgrp ${GROUP} $$i ; \ done -cd ${SPOOL}; for i in ${SUBDIRS} ; do \ mkdir $$i; \ ! chown ${OWNER} $$i; chgrp ${GROUP} $$i; chmod 755 $$i; \ done uulib.a: ${COMMON} *** /usr/src/usr.bin/uucp/UUAIDS/L.sys.old Mon Feb 16 16:21:28 1987 --- /usr/src/usr.bin/uucp/UUAIDS/L.sys Wed Nov 27 21:51:54 1996 *************** *** 91,97 **** # # The next entry is for a 4.2BSD TCP-IP connection. # There must be a #define BSDTCP in uucp.h, and you must install ! # a 'uucpd' uucico server daemon in /etc. # Also, add an entry to /etc/services, such as: # uucp 540/tcp uucpd # The '540' is the port number chosen for uucpd. --- 91,97 ---- # # The next entry is for a 4.2BSD TCP-IP connection. # There must be a #define BSDTCP in uucp.h, and you must install ! # a 'uucpd' uucico server daemon in /usr/libexec. # Also, add an entry to /etc/services, such as: # uucp 540/tcp uucpd # The '540' is the port number chosen for uucpd. *** /usr/src/usr.bin/uucp/acucntrl.8.old Thu Oct 24 11:14:03 1996 --- /usr/src/usr.bin/uucp/acucntrl.8 Wed Nov 27 21:56:08 1996 *************** *** 1,6 **** ! .\" @(#)acucntrl.8c 6.2 (Berkeley) 7/29/85 .\" ! .TH acucntrl 8C "July 29, 1985" .UC 6 .SH NAME acucntrl \- turn around tty line between dialin and dialout --- 1,6 ---- ! .\" @(#)acucntrl.8 6.2.1 (2.11BSD) 1996/11/27 .\" ! .TH acucntrl 8 "November 27, 1996" .UC 6 .SH NAME acucntrl \- turn around tty line between dialin and dialout *************** *** 30,40 **** to condition a line for dialin. .PP When the line is conditioned for dialing out, the login name of the real uid ! of the process is placed in /etc/utmp in capitals. This declares that the line is in use and acts as an additional locking mechanism. .I Acucntrl ! will refuse to act if the /etc/utmp entry for the line is not null, is not the the user's login name (capitalized or not), and if the process is not running as the superuser. The last condition is to allow the superuser to clear the state of the line. --- 30,40 ---- to condition a line for dialin. .PP When the line is conditioned for dialing out, the login name of the real uid ! of the process is placed in /var/run/utmp in capitals. This declares that the line is in use and acts as an additional locking mechanism. .I Acucntrl ! will refuse to act if the /var/run/utmp entry for the line is not null, is not the the user's login name (capitalized or not), and if the process is not running as the superuser. The last condition is to allow the superuser to clear the state of the line. *************** *** 58,64 **** .IP 1) check input arguments .IP 2) ! look in /etc/utmp to check that the line is not in use by another user .IP 3) disable modem control on line .IP 4) --- 58,64 ---- .IP 1) check input arguments .IP 2) ! look in /var/run/utmp to check that the line is not in use by another user .IP 3) disable modem control on line .IP 4) *************** *** 70,76 **** .IP 7) send a hangup to process 1 to poke init to disable getty .IP 8) ! post uid name in capitals in /etc/utmp to let world know device has been grabbed .IP 9) make sure that DTR is on .PP --- 70,76 ---- .IP 7) send a hangup to process 1 to poke init to disable getty .IP 8) ! post uid name in capitals in /var/run/utmp to let world know device has been grabbed .IP 9) make sure that DTR is on .PP *************** *** 80,86 **** .IP 1) check input arguments .IP 2) ! look in /etc/utmp to check that the line is not in use by another user .IP 3) make sure modem control on line is disabled .IP 4) --- 80,86 ---- .IP 1) check input arguments .IP 2) ! look in /var/run/utmp to check that the line is not in use by another user .IP 3) make sure modem control on line is disabled .IP 4) *************** *** 94,100 **** .IP 8) send a hangup to process 1 to poke init to enable getty .IP 9) ! clear uid name for /etc/utmp .SH HISTORY .PP First written by Allan Wilkes (fisher!allan) --- 94,100 ---- .IP 8) send a hangup to process 1 to poke init to enable getty .IP 9) ! clear uid name for /var/run/utmp .SH HISTORY .PP First written by Allan Wilkes (fisher!allan) *************** *** 107,113 **** .RI ( i . e . hacked to death) .SH FILES ! /dev/kmem, /vmunix, /etc/ttys, /etc/utmp, /dev/tty* .SH BUGS .PP Sensing carrier requires the 4.2 BSD TIOCMGET ioctl call. Unfortunately this --- 107,113 ---- .RI ( i . e . hacked to death) .SH FILES ! /dev/kmem, /vmunix, /etc/ttys, /var/run/utmp, /dev/tty* .SH BUGS .PP Sensing carrier requires the 4.2 BSD TIOCMGET ioctl call. Unfortunately this *************** *** 124,132 **** .PP Previously there was similar synchronization problem with the init process. When dialins are disabled the capitalized name of the process cannot be posted ! into /etc/utmp until init has finished clearing /etc/utmp. However one does not know how long that will take, and, on a loaded system, it can take quite a while. This was solved by the strategy of 1) posting the name, 2) poking init, 3) going into a loop where the process repeatedly waits a second and ! checks whether the entry has been cleared from /etc/utmp, and 4) posting the name again. --- 124,132 ---- .PP Previously there was similar synchronization problem with the init process. When dialins are disabled the capitalized name of the process cannot be posted ! into /var/run/utmp until init has finished clearing /var/run/utmp. However one does not know how long that will take, and, on a loaded system, it can take quite a while. This was solved by the strategy of 1) posting the name, 2) poking init, 3) going into a loop where the process repeatedly waits a second and ! checks whether the entry has been cleared from /var/run/utmp, and 4) posting the name again. *** /usr/src/usr.bin/uucp/acucntrl.c.old Fri Mar 22 20:25:18 1996 --- /usr/src/usr.bin/uucp/acucntrl.c Sun Dec 1 22:59:59 1996 *************** *** 19,25 **** * 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 * (3) disable modem control on terminal * (4) check for carrier on device * (5) change owner of device to real id --- 19,25 ---- * Operation: * disable (i.e. setup for dialing out) * (1) check input arguments ! * (2) look at the utmp file that the line is not in use * (3) disable modem control on terminal * (4) check for carrier on device * (5) change owner of device to real id *************** *** 26,38 **** * (6) edit /etc/ttys, changing the first character of the appropriate * 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 * (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 * (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 --- 26,38 ---- * (6) edit /etc/ttys, changing the first character of the appropriate * line to 0 * (7) send a hangup to process 1 to poke init to disable getty ! * (8) post uid name in capitals in 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 ! * (2) look in 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 *************** *** 40,46 **** * (7) edit /etc/ttys, changing the first character of the appropriate * line to 1 * (8) send a hangup to process 1 to poke init to enable getty ! * (9) clear uid name for /etc/utmp */ /* #define SENSECARRIER */ --- 40,46 ---- * (7) edit /etc/ttys, changing the first character of the appropriate * line to 1 * (8) send a hangup to process 1 to poke init to enable getty ! * (9) clear uid name for utmp file */ /* #define SENSECARRIER */ *************** *** 115,121 **** #define ENABLE 1 #define DISABLE 0 ! char Etcutmp[] = "/etc/utmp"; char Etcttys[] = "/etc/ttys"; #ifdef BSD4_3 FILE *ttysfile, *nttysfile; --- 115,121 ---- #define ENABLE 1 #define DISABLE 0 ! char Etcutmp[] = _PATH_UTMP; char Etcttys[] = "/etc/ttys"; #ifdef BSD4_3 FILE *ttysfile, *nttysfile; *************** *** 348,357 **** 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", strerror(errno)); if (write(etcutmp, (char *)&utmp, sizeof(utmp)) < 0) ! fprintf(stderr, "on write in /etc/utmp: %s", strerror(errno)); } --- 348,357 ---- strncpy(utmp.ut_line, device, LINSIZ); strncpy(utmp.ut_name, name, NAMSIZ); if (lseek(etcutmp, utmploc, 0) < 0) ! fprintf(stderr, "on lseek in %s: %s", Etcutmp, strerror(errno)); if (write(etcutmp, (char *)&utmp, sizeof(utmp)) < 0) ! fprintf(stderr, "on write in %s: %s", Etcutmp, strerror(errno)); } *************** *** 382,391 **** do { sleep(1); if (lseek(etcutmp, utmploc, 0) < 0) ! fprintf(stderr, "On lseek in /etc/utmp: %s", strerror(errno)); if (read(etcutmp, (char *)&utmp, sizeof utmp) < 0) ! fprintf(stderr, "On read from /etc/utmp: %s", strerror(errno)); } while (utmp.ut_name[0] != '\0' && --i > 0); } --- 382,391 ---- do { sleep(1); if (lseek(etcutmp, utmploc, 0) < 0) ! fprintf(stderr, "On lseek in %s: %s", Etcutmp, strerror(errno)); if (read(etcutmp, (char *)&utmp, sizeof utmp) < 0) ! fprintf(stderr, "On read from %s: %s", Etcutmp, strerror(errno)); } while (utmp.ut_name[0] != '\0' && --i > 0); } *************** *** 605,612 **** /* ! * 2.10BSD NOTE: 2.10BSD doesn't use ui_flags. We've included the code ! * for correctness in case someone decides to change the way the 2.10BSD * tty drivers work. Mostly what needs to be done is have the tty drivers * do something like: * --- 605,612 ---- /* ! * 2.11BSD NOTE: 2.11BSD doesn't use ui_flags. We've included the code ! * for correctness in case someone decides to change the way the 2.11BSD * tty drivers work. Mostly what needs to be done is have the tty drivers * do something like: * *************** *** 617,626 **** * else * XXsoftCAR[unit] &= ~(1L << line); * ! * (2.10BSD uses a bit 0200 in the minor device number of a tty /dev node * to indicate soft carrier as opposed to compiling it into the kernel as * 4.3BSD does.) This code minus the check of ui_flags is already present ! * in all 2.10BSD drivers. */ setmodem(ttyline, enable) char *ttyline; int enable; --- 617,626 ---- * else * XXsoftCAR[unit] &= ~(1L << line); * ! * (2.11BSD uses a bit 0200 in the minor device number of a tty /dev node * to indicate soft carrier as opposed to compiling it into the kernel as * 4.3BSD does.) This code minus the check of ui_flags is already present ! * in all 2.11BSD drivers. */ setmodem(ttyline, enable) char *ttyline; int enable; *** /usr/src/usr.bin/uucp/uucp.h.old Thu Nov 14 20:07:04 1996 --- /usr/src/usr.bin/uucp/uucp.h Sun Dec 1 22:58:53 1996 *************** *** 1,4 **** ! /* uucp.h 5.11.4 96/10/24 */ #include #include --- 1,4 ---- ! /* uucp.h 5.11.5 96/12/1 */ #include #include *************** *** 122,128 **** /* * If you are running 4.3bsd, define BSD4_3 and BSD4_2 * If you are just running 4.2bsd, define BSD4_2 ! * If you are running 2.10bsd, define BSD4_3 and BSD4_2 * If you are running the BRL version of 4.2BSD define BRL4_2, NOT BSD4_3 */ #define BSD4_3 /**/ --- 122,128 ---- /* * If you are running 4.3bsd, define BSD4_3 and BSD4_2 * If you are just running 4.2bsd, define BSD4_2 ! * If you are running 2.11bsd, define BSD4_3 and BSD4_2 * If you are running the BRL version of 4.2BSD define BRL4_2, NOT BSD4_3 */ #define BSD4_3 /**/ *** /usr/src/usr.bin/uucp/uucpdefs.c.old Mon Feb 16 16:21:48 1987 --- /usr/src/usr.bin/uucp/uucpdefs.c Wed Nov 27 21:59:02 1996 *************** *** 1,5 **** ! #ifndef lint ! static char sccsid[] = "@(#)uucpdefs.c 5.5 (Berkeley) 10/9/85"; #endif #include "uucp.h" --- 1,5 ---- ! #if !defined(lint) && defined(DOSCCS) ! static char sccsid[] = "@(#)uucpdefs.c 5.5.1 (2.11BSD) 1996/11/27"; #endif #include "uucp.h" *************** *** 23,31 **** char MaxGrade = '\177'; char DefMaxGrade = '\177'; int nologinflag = 0; ! char NOLOGIN[] = "/etc/nologin"; /* Save some data space */ ! char DEVNULL[] = "/dev/null"; char CANTOPEN[] = "CAN'T OPEN"; char _FAILED[] = "FAILED"; --- 23,31 ---- char MaxGrade = '\177'; char DefMaxGrade = '\177'; int nologinflag = 0; ! char NOLOGIN[] = _PATH_NOLOGIN; /* Save some data space */ ! char DEVNULL[] = _PATH_DEVNULL; char CANTOPEN[] = "CAN'T OPEN"; char _FAILED[] = "FAILED"; *** /usr/src/usr.lib/libutil/pathnames.h.old Tue Sep 19 09:45:35 1989 --- /usr/src/usr.lib/libutil/pathnames.h Wed Nov 27 22:00:26 1996 *************** *** 16,22 **** */ #ifndef _PATH_UTMP ! #define _PATH_UTMP "/etc/utmp" #endif #ifndef _PATH_WTMP --- 16,22 ---- */ #ifndef _PATH_UTMP ! #define _PATH_UTMP "/var/run/utmp" #endif #ifndef _PATH_WTMP *** /usr/src/usr.sbin/Makefile.old Thu Nov 14 20:24:12 1996 --- /usr/src/usr.sbin/Makefile Sun Dec 1 17:51:36 1996 *************** *** 7,13 **** CFLAGS= -O SEPFLAG= -i ! SUBDIR= inetd lpr makewhatis sendmail all: ${SUBDIR} --- 7,20 ---- CFLAGS= -O SEPFLAG= -i ! SUBDIR= ac accton arff arp bad144 catman chown chroot config cron dev_mkdb \ ! diskpart edquota flcopy gettable htable implog implogd inetd kgmon \ ! lpr makewhatis mkhosts mklost+found mkproto named ntp pstat quot \ ! quotaon repquota rmt rwhod rxformat sa sendmail syslogd timed \ ! traceroute trpt update vipw ! ! # This is broken and doesn't compile - thus it is not included in SUBDIR above. ! BROKEN= trsp all: ${SUBDIR} *** /usr/src/usr.sbin/ac/ac.8.old Sun Dec 14 15:08:39 1986 --- /usr/src/usr.sbin/ac/ac.8 Sat Nov 16 22:40:03 1996 *************** *** 2,15 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)ac.8 6.1 (Berkeley) 4/27/85 .\" ! .TH AC 8 "April 27, 1985" .UC 4 .SH NAME ac \- login accounting .SH SYNOPSIS ! .B /etc/ac [ .B \-w wtmp ] [ --- 2,15 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)ac.8 6.1.1 (2.11BSD) 1996/11/16 .\" ! .TH AC 8 "November 16, 1996" .UC 4 .SH NAME ac \- login accounting .SH SYNOPSIS ! .B /usr/sbin/ac [ .B \-w wtmp ] [ *** /usr/src/usr.sbin/ac/ac.c.old Sun Feb 15 20:51:16 1987 --- /usr/src/usr.sbin/ac/ac.c Sat Nov 16 22:42:10 1996 *************** *** 1,5 **** ! #ifndef lint ! static char *sccsid = "@(#)ac.c 4.7 (Berkeley) 7/2/83"; #endif /* * ac [ -w wtmp ] [ -d ] [ -p ] [ people ] --- 1,5 ---- ! #if !defined(lint) && defined(DOSCCS) ! static char *sccsid = "@(#)ac.c 4.7.1 (2.11BSD) 1996/11/16"; #endif /* * ac [ -w wtmp ] [ -d ] [ -p ] [ people ] *************** *** 48,60 **** register i; FILE *wf; ! wtmp = "/usr/adm/wtmp"; while (--argc > 0 && **++argv == '-') switch(*++*argv) { case 'd': byday++; continue; ! case 'w': if (--argc>0) wtmp = *++argv; --- 48,60 ---- register i; FILE *wf; ! wtmp = _PATH_WTMP; while (--argc > 0 && **++argv == '-') switch(*++*argv) { case 'd': byday++; continue; ! case 'f': case 'w': if (--argc>0) wtmp = *++argv; *** /usr/src/usr.sbin/arff/arff.8.old Sun Dec 14 15:08:39 1986 --- /usr/src/usr.sbin/arff/arff.8 Sat Nov 16 22:48:25 1996 *************** *** 2,18 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)arff.8v 6.2 (Berkeley) 5/20/86 .\" ! .TH ARFF 8V "May 20, 1986" .UC 4 .SH NAME arff, flcopy \- archiver and copier for floppy .SH SYNOPSIS ! .B /etc/arff [ key ] [ name ... ] .br ! .B /etc/flcopy [ .B \-h ] [ --- 2,18 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)arff.8 6.2.1 (2.11BSD) 1996/11/16 .\" ! .TH ARFF 8 "November 16, 1996" .UC 4 .SH NAME arff, flcopy \- archiver and copier for floppy .SH SYNOPSIS ! .B /usr/sbin/arff [ key ] [ name ... ] .br ! .B /usr/sbin/flcopy [ .B \-h ] [ *************** *** 134,140 **** .br floppy (in current directory) .SH SEE ALSO ! crl(4), fl(4), rx(4), tu(4), rxformat(8V) .SH AUTHORS Keith Sklower, Richard Tuck .SH BUGS --- 134,140 ---- .br floppy (in current directory) .SH SEE ALSO ! crl(4), fl(4), rx(4), tu(4), rxformat(8) .SH AUTHORS Keith Sklower, Richard Tuck .SH BUGS *** /usr/src/usr.sbin/catman/catman.8.old Wed Oct 23 13:25:36 1996 --- /usr/src/usr.sbin/catman/catman.8 Sat Nov 16 17:09:10 1996 *************** *** 2,8 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)catman.8 6.5.1 (2.11BSD) 1996/10/23 .\" .TH CATMAN 8 "October 23, 1996" .UC 4 --- 2,8 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)catman.8 6.5.2 (2.11BSD) 1996/11/16 .\" .TH CATMAN 8 "October 23, 1996" .UC 4 *************** *** 9,15 **** .SH NAME catman \- create the cat files for the manual .SH SYNOPSIS ! .B /etc/catman [ .B \-p ] [ --- 9,15 ---- .SH NAME catman \- create the cat files for the manual .SH SYNOPSIS ! .B /usr/sbin/catman [ .B \-p ] [ *************** *** 113,115 **** --- 113,119 ---- man(1), cron(8), rdist(1) .SH BUGS Acts oddly on nights with full moons. + .PP + The need for catman(8) is almost but not quite gone. Most of the manpages + have been moved out of /usr/src/man into the sourcecode hierarchy. + The recreation of the whatis database is the main use of catman now. *** /usr/src/usr.sbin/chown/chown.8.old Sun Dec 14 15:08:40 1986 --- /usr/src/usr.sbin/chown/chown.8 Sun Nov 17 18:18:08 1996 *************** *** 2,8 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)chown.8 6.2 (Berkeley) 5/22/86 .\" .TH CHOWN 8 "May 22, 1986" .UC 4 --- 2,8 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)chown.8 6.2.1 (2.11BSD) 1996/11/17 .\" .TH CHOWN 8 "May 22, 1986" .UC 4 *************** *** 9,15 **** .SH NAME chown \- change owner .SH SYNOPSIS ! .B /etc/chown [ .B \-f .B \-R --- 9,15 ---- .SH NAME chown \- change owner .SH SYNOPSIS ! .B /usr/sbin/chown [ .B \-f .B \-R *** /usr/src/usr.sbin/chroot/Makefile.old Sun Jan 28 19:57:14 1996 --- /usr/src/usr.sbin/chroot/Makefile Sun Dec 1 14:52:04 1996 *************** *** 14,25 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.2.1 (2.11BSD) 1996/1/27 # CFLAGS= -O SEPFLAG= -i - LIBC= /lib/libc.a SRCS= chroot.c OBJS= chroot.o MAN= chroot.0 --- 14,24 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.2.2 (2.11BSD) 1996/11/16 # CFLAGS= -O SEPFLAG= -i SRCS= chroot.c OBJS= chroot.o MAN= chroot.0 *************** *** 27,33 **** all: chroot ${MAN} ! chroot: ${LIBC} ${OBJS} ${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS} chroot.0: ${MANSRC} --- 26,32 ---- all: chroot ${MAN} ! chroot: ${OBJS} ${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS} chroot.0: ${MANSRC} *************** *** 43,49 **** mkdep ${CFLAGS} ${SRCS} install: ${MAN} chroot ! install -s -o root -g bin -m 4751 chroot ${DESTDIR}/etc install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8 lint: ${SRCS} --- 42,48 ---- mkdep ${CFLAGS} ${SRCS} install: ${MAN} chroot ! install -s -o root -g bin -m 4751 chroot ${DESTDIR}/usr/sbin install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8 lint: ${SRCS}