Subject: mount(8) options, !/etc/mtab, libkern.a, MANY others (#297 part 6 of 8) Index: many/many 2.11BSD Description: Mount(8) does not pass options other than 'readonly' thru to the kernel even though the kernel understands many more options than that. /etc/mtab is not needed any longer because applications (mount, umount, others) can obtain the list of mounted filesystems via getmntinfo(3), or getfsstat(2) There are copies of 15 libc routines in the kernel directories. These are invariant but nevertheless are always being recompiled/assembled whenever a kernel is built. Repeat-By: It sounds inadequate, but, "observation". Fix: This is #297 (part 6 of 8). Please refer to part 1 (#292) for detailed instructions and a description of contents. ----------------------------cut here------------------------- *** /usr/src/games/battlestar/Makefile.old Mon Jan 18 08:55:59 1993 --- /usr/src/games/battlestar/Makefile Sun Jan 28 01:22:49 1996 *************** *** 4,10 **** # the terms of the Berkeley Software License Agreement. # ! # @(#)Makefile 1.7 4/25/85 CFLAGS= -O SEPFLAG= -i --- 4,10 ---- # the terms of the Berkeley Software License Agreement. # ! # @(#)Makefile 1.7.1 1996/1/28 CFLAGS= -O SEPFLAG= -i *************** *** 20,27 **** DIR= $(DESTDIR)/usr/games LIB= $(DESTDIR)/usr/games/lib LOGFILE= $(LIB)/battlestar.log ! MAN= batlestar.0 battlestar: $(OBJS) cc -o battlestar ${SEPFLAG} $(OBJS) $(LIBS) --- 20,29 ---- DIR= $(DESTDIR)/usr/games LIB= $(DESTDIR)/usr/games/lib LOGFILE= $(LIB)/battlestar.log ! MAN= battlestar.0 + all: battlestar ${MAN} + battlestar: $(OBJS) cc -o battlestar ${SEPFLAG} $(OBJS) $(LIBS) *************** *** 58,64 **** install: battlestar $(MAN) $(LOGFILE) $(STRINGFILE) install -s battlestar $(DIR)/battlestar ! install -m 444 -o bin -g bin battlestar.0 ${DESTDIR}/usr/man/cat6 stringfile $(STRINGFILE): battle_strings install -c -m 644 battle_strings $(LIB) --- 60,66 ---- install: battlestar $(MAN) $(LOGFILE) $(STRINGFILE) install -s battlestar $(DIR)/battlestar ! install -m 444 -o bin -g bin ${MAN} ${DESTDIR}/usr/man/cat6 stringfile $(STRINGFILE): battle_strings install -c -m 644 battle_strings $(LIB) *** /usr/src/games/cribbage/Makefile.old Wed Feb 25 19:18:36 1987 --- /usr/src/games/cribbage/Makefile Sun Jan 28 01:28:01 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.2 (Berkeley) 5/15/86 # # make file for cribbage # --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.2.1 (2.11BSD) 1996/1/28 # # make file for cribbage # *************** *** 11,24 **** OBJS= extern.o crib.o support.o cards.o score.o io.o CFILES= extern.c crib.c support.c cards.c score.c io.c TOBJS= test.o cards.o score.o io.o extern.o SEPFLAG= -i CFLAGS= -O DESTDIR= cribbage: ${OBJS} ${CC} ${SEPFLAG} ${CFLAGS} -o cribbage ${OBJS} -lcurses -ltermlib ! all: cribbage crib.instr crib.o io.o support.o: cribcur.h --- 11,27 ---- OBJS= extern.o crib.o support.o cards.o score.o io.o CFILES= extern.c crib.c support.c cards.c score.c io.c TOBJS= test.o cards.o score.o io.o extern.o + MAN= crib.0 SEPFLAG= -i CFLAGS= -O DESTDIR= + all: cribbage ${MAN} + cribbage: ${OBJS} ${CC} ${SEPFLAG} ${CFLAGS} -o cribbage ${OBJS} -lcurses -ltermlib ! all: cribbage ${MAN} crib.o io.o support.o: cribcur.h *************** *** 25,32 **** test: ${TOBJS} ${CC} ${SEPFLAG} ${CFLAGS} -o test ${TOBJS} -lcurses -ltermlib ! crib.instr: cribbage.n macro ! nroff cribbage.n > crib.instr tags: ${HDRS} ${CFILES} ctags -u $? --- 28,35 ---- test: ${TOBJS} ${CC} ${SEPFLAG} ${CFLAGS} -o test ${TOBJS} -lcurses -ltermlib ! crib.0: cribbage.n macro ! nroff cribbage.n > crib.0 tags: ${HDRS} ${CFILES} ctags -u $? *************** *** 34,40 **** sort tags -o tags clean: ! rm -f ${OBJS} ? a.out core crib.instr cribbage errs crib.o: deck.h cribbage.h cribcur.h support.o: deck.h cribbage.h cribcur.h --- 37,43 ---- sort tags -o tags clean: ! rm -f ${OBJS} ? a.out core crib.0 cribbage errs crib.o: deck.h cribbage.h cribcur.h support.o: deck.h cribbage.h cribcur.h *************** *** 43,48 **** score.o: deck.h io.o: deck.h cribcur.h ! install: cribbage crib.instr install -s cribbage $(DESTDIR)/usr/games ! install -m 644 crib.instr $(DESTDIR)/usr/games/lib --- 46,51 ---- score.o: deck.h io.o: deck.h cribcur.h ! install: cribbage crib.0 install -s cribbage $(DESTDIR)/usr/games ! install -m 644 crib.0 $(DESTDIR)/usr/games/lib/crib.instr *** /usr/src/games/phantasia/Makefile.old Mon Jan 18 08:56:16 1993 --- /usr/src/games/phantasia/Makefile Sun Jan 28 01:32:05 1996 *************** *** 1,4 **** ! # Makefile for Phantasia 3.2 # # MODIFIED TO COMPILE WITHOUT 'XSTR'. # --- 1,4 ---- ! # Makefile for Phantasia 3.2 (1.1 2.11BSD - 1996/1/28) # # MODIFIED TO COMPILE WITHOUT 'XSTR'. # *************** *** 54,60 **** OFILES = main.o func0.o func1.o func2.o NOOPT= fight.o ! all: phantasia setfiles phant.help # need separate i/d space on small machines #phantasia: ${OFILES} ${NOOPT} strings.o --- 54,60 ---- OFILES = main.o func0.o func1.o func2.o NOOPT= fight.o ! all: phantasia setfiles phant.help phantasia.0 # need separate i/d space on small machines #phantasia: ${OFILES} ${NOOPT} strings.o *** /usr/src/lib/Makefile.old Wed Jan 20 15:58:57 1993 --- /usr/src/lib/Makefile Thu Jan 11 20:30:41 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.4 (Berkeley) 8/26/85 # DESTDIR= CFLAGS= -O --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.4.1 (2.11BSD) 1996/1/11 # DESTDIR= CFLAGS= -O *************** *** 12,18 **** # Programs that live in subdirectories, and have makefiles of their own. # ! SUBDIR= ccom c2 cpp libc all: ${SUBDIR} --- 12,18 ---- # Programs that live in subdirectories, and have makefiles of their own. # ! SUBDIR= ccom c2 cpp libc libkern all: ${SUBDIR} *** /usr/src/lib/libc/Makefile.old Sat Jan 23 18:01:40 1993 --- /usr/src/lib/libc/Makefile Sat Jan 27 00:06:26 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 4.19 (Berkeley) 3/9/86 # # The system has two monitoring schemes, utilizing either ``prof'' # or ``gprof''. DFLMON determines the default profiler; mon.o --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 4.19.1 (2.11BSD) 1996/1/12 # # The system has two monitoring schemes, utilizing either ``prof'' # or ``gprof''. DFLMON determines the default profiler; mon.o *************** *** 49,60 **** MACHINE=pdp DEFS= COMPAT= compat-4.1 compat-sys5 ! ALL= gen inet net ns stdio ${MACHINE} ${COMPAT} TAGSFILE=tags libc.a libc_p.a: ${MACHINE}/csu ${ALL} net/${HOSTLOOKUP} rm -rf tmp ! -mkdir tmp cd tmp; \ for i in ${ALL}; do ar x ../$$i/$${i}lib; done; \ ar x ../net/${HOSTLOOKUP}/hostlib; \ --- 49,60 ---- MACHINE=pdp DEFS= COMPAT= compat-4.1 compat-sys5 ! ALL= gen inet net ns stdio stdlib string ${MACHINE} ${COMPAT} TAGSFILE=tags libc.a libc_p.a: ${MACHINE}/csu ${ALL} net/${HOSTLOOKUP} rm -rf tmp ! mkdir tmp cd tmp; \ for i in ${ALL}; do ar x ../$$i/$${i}lib; done; \ ar x ../net/${HOSTLOOKUP}/hostlib; \ *************** *** 65,71 **** ar ma fltpr.o libc.a doprnt.o ar ma doprnt.o libc.a ffltpr.o rm -rf tmp ! -mkdir tmp cd tmp; \ for i in ${ALL}; do ar x ../$$i/$${i}lib_p; done; \ ar x ../net/${HOSTLOOKUP}/hostlib_p; \ --- 65,71 ---- ar ma fltpr.o libc.a doprnt.o ar ma doprnt.o libc.a ffltpr.o rm -rf tmp ! mkdir tmp cd tmp; \ for i in ${ALL}; do ar x ../$$i/$${i}lib_p; done; \ ar x ../net/${HOSTLOOKUP}/hostlib_p; \ *************** *** 99,106 **** clean: for i in ${MACHINE}/csu ${ALL} net/hosttable net/named; \ do (cd $$i; make ${MFLAGS} clean); done ! rm -f t1 tmp/*.o ! -rmdir tmp depend: for i in ${MACHINE}/csu ${ALL} net/hosttable net/named; \ --- 99,105 ---- clean: for i in ${MACHINE}/csu ${ALL} net/hosttable net/named; \ do (cd $$i; make ${MFLAGS} clean); done ! rm -rf tmp depend: for i in ${MACHINE}/csu ${ALL} net/hosttable net/named; \ *** /usr/src/lib/libc/compat-sys5/Makefile.old Tue Jul 31 14:10:48 1990 --- /usr/src/lib/libc/compat-sys5/Makefile Fri Jan 12 00:05:02 1996 *************** *** 1,12 **** ! # Makefile 1.5 85/09/05 # CFLAGS= -O ${DEFS} ! SRCS= getopt.c memccpy.c memchr.c memcmp.c memcpy.c memset.c \ ! strcatn.c strchr.c strcmpn.c strcpyn.c strcspn.c strpbrk.c \ ! strrchr.c strspn.c strtok.c strtol.c tmpnam.c ! OBJS= getopt.o memccpy.o memchr.o memcmp.o memcpy.o memset.o \ ! strcatn.o strchr.o strcmpn.o strcpyn.o strcspn.o strpbrk.o \ ! strrchr.o strspn.o strtok.o strtol.o tmpnam.o TAGSFILE=tags .c.o: --- 1,10 ---- ! # Makefile 1.6 1996/1/11 # CFLAGS= -O ${DEFS} ! # strchr and strrchr.c are not used. The assembly versions in pdp/gen are ! # used instead. ! SRCS= memccpy.c memchr.c memcmp.c memcpy.c memset.c tmpnam.c ! OBJS= memccpy.o memchr.o memcmp.o memcpy.o memset.o tmpnam.o TAGSFILE=tags .c.o: *************** *** 33,75 **** rm -f compat-sys5lib compat-sys5lib_p *.o profiled/*.o Makefile.bak depend: ! for i in ${SRCS}; do \ ! cc -M ${CFLAGS} $$i | awk ' { if ($$1 != prev) \ ! { if (rec != "") print rec; rec = $$0; prev = $$1; } \ ! else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \ ! else rec = rec " " $$2 } } \ ! END { print rec } ' >> makedep; done ! 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 ! ! getopt.o: getopt.c /usr/include/stdio.h ! memccpy.o: memccpy.c ! memchr.o: memchr.c ! memcmp.o: memcmp.c ! memcpy.o: memcpy.c ! memset.o: memset.c ! strcatn.o: strcatn.c ! strchr.o: strchr.c ! strcmpn.o: strcmpn.c ! strcpyn.o: strcpyn.c ! strcspn.o: strcspn.c ! strpbrk.o: strpbrk.c ! strrchr.o: strrchr.c ! strspn.o: strspn.c ! strtok.o: strtok.c /usr/include/stdio.h ! strtol.o: strtol.c /usr/include/ctype.h ! tmpnam.o: tmpnam.c /usr/include/sys/param.h /usr/include/sys/localopts.h ! tmpnam.o: /usr/include/machine/machparam.h /usr/include/signal.h ! tmpnam.o: /usr/include/sys/types.h /usr/include/stdio.h ! # DEPENDENCIES MUST END AT END OF FILE ! # IF YOU PUT STUFF HERE IT WILL GO AWAY ! # see make depend above --- 31,34 ---- rm -f compat-sys5lib compat-sys5lib_p *.o profiled/*.o Makefile.bak depend: ! mkdep ${CFLAGS} ${SRCS} *** /usr/src/lib/libc/gen/getpwent.c.old Tue Jul 24 18:43:21 1990 --- /usr/src/lib/libc/gen/getpwent.c Fri Jan 12 20:48:12 1996 *************** *** 16,25 **** */ #if defined(LIBC_SCCS) && !defined(lint) ! static char sccsid[] = "@(#)getpwent.c 5.9 (Berkeley) 4/1/89"; #endif /* LIBC_SCCS and not lint */ #include #include #include #include --- 16,27 ---- */ #if defined(LIBC_SCCS) && !defined(lint) ! static char sccsid[] = "@(#)getpwent.c 5.9.1 (2.11BSD) 1996/1/12"; #endif /* LIBC_SCCS and not lint */ #include + #include + #include #include #include #include *************** *** 38,44 **** getpwent() { datum key; ! int rval; if (!_pw_db && !_pw_fp && !start_pw()) return((struct passwd *)NULL); --- 40,46 ---- getpwent() { datum key; ! register int rval; if (!_pw_db && !_pw_fp && !start_pw()) return((struct passwd *)NULL); *************** *** 58,64 **** getpwnam(nam) char *nam; { ! int rval; if (!start_pw()) return((struct passwd *)NULL); --- 60,66 ---- getpwnam(nam) char *nam; { ! register int rval; if (!start_pw()) return((struct passwd *)NULL); *************** *** 85,91 **** getpwuid(uid) int uid; { ! int rval; if (!start_pw()) return((struct passwd *)NULL); --- 87,93 ---- getpwuid(uid) int uid; { ! register int rval; if (!start_pw()) return((struct passwd *)NULL); *************** *** 111,117 **** static start_pw() { ! char *p; if (_pw_db) { _pw_rewind = 1; --- 113,119 ---- static start_pw() { ! register char *p; if (_pw_db) { _pw_rewind = 1; *************** *** 172,209 **** scanpw() { register char *cp; ! long atol(); ! char *fgets(), *strsep(), *index(); for (;;) { if (!(fgets(line, sizeof(line), _pw_fp))) return(0); /* skip lines that are too big */ ! if (!index(line, '\n')) { ! int ch; ! ! while ((ch = getc(_pw_fp)) != '\n' && ch != EOF) ; continue; } ! _pw_passwd.pw_name = strsep(line, ":\n"); ! _pw_passwd.pw_passwd = strsep((char *)NULL, ":\n"); ! if (!(cp = strsep((char *)NULL, ":\n"))) continue; _pw_passwd.pw_uid = atoi(cp); ! if (!(cp = strsep((char *)NULL, ":\n"))) continue; _pw_passwd.pw_gid = atoi(cp); ! _pw_passwd.pw_class = strsep((char *)NULL, ":\n"); ! if (!(cp = strsep((char *)NULL, ":\n"))) continue; _pw_passwd.pw_change = atol(cp); ! if (!(cp = strsep((char *)NULL, ":\n"))) continue; _pw_passwd.pw_expire = atol(cp); ! _pw_passwd.pw_gecos = strsep((char *)NULL, ":\n"); ! _pw_passwd.pw_dir = strsep((char *)NULL, ":\n"); ! _pw_passwd.pw_shell = strsep((char *)NULL, ":\n"); if (!_pw_passwd.pw_shell) continue; return(1); --- 174,210 ---- scanpw() { register char *cp; ! char *bp = line; ! register int ch; for (;;) { if (!(fgets(line, sizeof(line), _pw_fp))) return(0); /* skip lines that are too big */ ! if (!(cp = index(line, '\n'))) { ! while ((ch = fgetc(_pw_fp)) != '\n' && ch != EOF) ; continue; } ! *cp = '\0'; ! _pw_passwd.pw_name = strsep(&bp, ":"); ! _pw_passwd.pw_passwd = strsep(&bp, ":"); ! if (!(cp = strsep(&bp, ":"))) continue; _pw_passwd.pw_uid = atoi(cp); ! if (!(cp = strsep(&bp, ":"))) continue; _pw_passwd.pw_gid = atoi(cp); ! _pw_passwd.pw_class = strsep(&bp, ":"); ! if (!(cp = strsep(&bp, ":"))) continue; _pw_passwd.pw_change = atol(cp); ! if (!(cp = strsep(&bp, ":"))) continue; _pw_passwd.pw_expire = atol(cp); ! _pw_passwd.pw_gecos = strsep(&bp, ":"); ! _pw_passwd.pw_dir = strsep(&bp, ":"); ! _pw_passwd.pw_shell = strsep(&bp, ":"); if (!_pw_passwd.pw_shell) continue; return(1); *************** *** 259,267 **** { static char pwbuf[50]; off_t lseek(); ! long pos, atol(); int fd, n; ! char *p; if (geteuid()) return; --- 260,268 ---- { static char pwbuf[50]; off_t lseek(); ! long pos; int fd, n; ! register char *p; if (geteuid()) return; *** /usr/src/lib/libc/pdp/gen/index.s.old Sun Jan 25 05:03:31 1987 --- /usr/src/lib/libc/pdp/gen/index.s Fri Jan 12 00:23:54 1996 *************** *** 5,11 **** */ #ifdef LIBC_SCCS ! <@(#)index.s 1.1 (Berkeley) 1/20/87\0> .even #endif LIBC_SCCS --- 5,11 ---- */ #ifdef LIBC_SCCS ! <@(#)index.s 1.2 (2.11BSD) 1996/1/12\0> .even #endif LIBC_SCCS *************** *** 19,24 **** --- 19,27 ---- */ #include "DEFS.h" + .globl _strchr + _strchr = _index ^ . + ENTRY(index) mov 2(sp),r0 / r0 = cp mov 4(sp),r1 / r1 = c *************** *** 36,38 **** --- 39,42 ---- bne 3b dec r0 / back up to '\0' rts pc / and return pointer + *** /usr/src/lib/libc/pdp/gen/rindex.s.old Sun Jan 25 05:03:31 1987 --- /usr/src/lib/libc/pdp/gen/rindex.s Fri Jan 12 00:26:15 1996 *************** *** 5,11 **** */ #ifdef LIBC_SCCS ! <@(#)rindex.s 1.1 (Berkeley) 1/20/87\0> .even #endif LIBC_SCCS --- 5,11 ---- */ #ifdef LIBC_SCCS ! <@(#)rindex.s 1.2 (2.11BSD) 1996/1/12\0> .even #endif LIBC_SCCS *************** *** 18,23 **** --- 18,26 ---- * char *cp, c; */ #include "DEFS.h" + + .globl _strrchr + _strrchr = _rindex ^ . ENTRY(rindex) mov 2(sp),r0 / r0 = cp *** /usr/src/local/less/makefile.old Sun Jan 16 20:34:29 1994 --- /usr/src/local/less/makefile Sun Jan 28 16:45:13 1996 *************** *** 1,3 **** --- 1,5 ---- + # Revised 1996/1/28 + # # Makefile for "less" # # Invoked as: *************** *** 13,19 **** # Also provided: # make lint # Runs "lint" on all the sources. # make clean # Removes "less" and the .o files. - # make clobber # Pretty much the same as make "clean". ########################################################################## --- 15,20 ---- *************** *** 130,159 **** CFLAGS = $(OPTIM) $(DEFS) ! all: less less: $(OBJ) cc $(OPTIM) -o less $(OBJ) $(LIBS) ! install: install_man install_less install_help ! install_less: less ! for f in $(INSTALL_LESS); do rm -f $$f; cp less $$f; done ! chmod 751 $(INSTALL_LESS) ! touch install_less - install_help: less.help - for f in $(INSTALL_HELP); do rm -f $$f; cp less.help $$f; done - chmod 444 $(INSTALL_HELP) - touch install_help - - install_man: $(MANUAL) - rm -f $(INSTALL_MAN) - /usr/man/manroff $(MANUAL) > $(INSTALL_MAN) - chmod 444 $(INSTALL_MAN) - chown bin.bin $(INSTALL_MAN) - touch install_man - $(OBJ): less.h funcs.h # help.o depends on makefile for the definition of HELPFILE. --- 131,149 ---- CFLAGS = $(OPTIM) $(DEFS) ! all: less less.0 less: $(OBJ) cc $(OPTIM) -o less $(OBJ) $(LIBS) ! less.0: less.nro ! /usr/man/manroff $(MANUAL) > less.0 ! install: less less.0 less.help ! install -s -m 751 less ${INSTALL_LESS} ! install -c -m 444 less.help ${INSTALL_HELP} ! install -c -m 444 -o bin -g bin less.0 $(INSTALL_MAN) $(OBJ): less.h funcs.h # help.o depends on makefile for the definition of HELPFILE. *************** *** 167,176 **** awk -f mkfuncs.awk $(SRC) >funcs.h clean: ! rm -f $(OBJ) less install_help install_less install_man core ! ! clobber: ! rm -f *.o less install_less install_man shar: shar -v README install less.man less.help makefile.* *.h *.awk > less.shar.a --- 157,163 ---- awk -f mkfuncs.awk $(SRC) >funcs.h clean: ! rm -f $(OBJ) less less.0 shar: shar -v README install less.man less.help makefile.* *.h *.awk > less.shar.a *** /usr/src/local/mkovmake/Makefile.old Fri Jan 22 21:42:44 1993 --- /usr/src/local/mkovmake/Makefile Sun Jan 28 16:51:56 1996 *************** *** 1,3 **** --- 1,6 ---- + # + # Revised 1996/1/28 + # CFLAGS= -O SEPFLAG= -i SRCS= mkovmake.c *************** *** 5,11 **** MANSRC= mkovmake.1 MAN= mkovmake.0 ! all: mkovmake mkovmake: ${OBJS} ${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS} --- 8,14 ---- MANSRC= mkovmake.1 MAN= mkovmake.0 ! all: mkovmake ${MAN} mkovmake: ${OBJS} ${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS} *************** *** 15,24 **** install: all ${MAN} install -s -o bin -g bin -m 755 mkovmake ${DESTDIR}/usr/local ! install -m 444 -o bin -g bin ${MAN} ${DESTDIR}/usr/local/man/cat1 ${MAN}: ${MANSRC} - rm -f ${MAN} /usr/man/manroff ${MANSRC} > ${MAN} lint: ${SRCS} --- 18,26 ---- install: all ${MAN} install -s -o bin -g bin -m 755 mkovmake ${DESTDIR}/usr/local ! install -c -m 444 -o bin -g bin ${MAN} ${DESTDIR}/usr/local/man/cat1 ${MAN}: ${MANSRC} /usr/man/manroff ${MANSRC} > ${MAN} lint: ${SRCS} *** /usr/src/local/popper/Makefile.old Mon Jun 13 20:12:30 1994 --- /usr/src/local/popper/Makefile Sun Jan 28 17:03:12 1996 *************** *** 1,7 **** ! #@(#)@(#)Makefile 2.5 2.5 4/3/91 DESTDIR = - CSRCS = pop_dele.c pop_dropcopy.c pop_dropinfo.c \ pop_get_command.c pop_get_subcommand.c pop_init.c \ pop_last.c pop_list.c pop_log.c pop_lower.c \ --- 1,6 ---- ! #@(#)@(#)Makefile 2.6 1996/1/28 DESTDIR = CSRCS = pop_dele.c pop_dropcopy.c pop_dropinfo.c \ pop_get_command.c pop_get_subcommand.c pop_init.c \ pop_last.c pop_list.c pop_log.c pop_lower.c \ *************** *** 8,14 **** pop_msg.c pop_parse.c pop_pass.c pop_quit.c \ pop_rset.c pop_send.c pop_stat.c pop_updt.c \ pop_user.c pop_xtnd.c pop_xmit.c popper.c - OBJS = pop_dele.o pop_dropcopy.o pop_dropinfo.o \ pop_get_command.o pop_get_subcommand.o pop_init.o \ pop_last.o pop_list.o pop_log.o pop_lower.o \ --- 7,12 ---- *************** *** 15,31 **** pop_msg.o pop_parse.o pop_pass.o pop_quit.o \ pop_rset.o pop_send.o pop_stat.o pop_updt.o \ pop_user.o pop_xtnd.o pop_xmit.o popper.o - DOCS = README pop3.rfc1081 pop3e.rfc1082 popper.8 - INCLUDES = popper.h version.h - SRCS = ${CSRCS} ${INCLUDES} - SCCS = /usr/ucb/sccs - REL = - MAKEFILE = Makefile # Options are: --- 13,23 ---- *************** *** 41,61 **** # STRNCASECMP - If you do not have strncasecmp() CFLAGS = -O -DBIND43 - TARGET = popper - TAR = ${TARGET}.tar - INSTALLDIR = ${DESTDIR}/usr/local - MANPAGE = popper.8 - CATPAGE = popper.0 - MANDIR = ${DESTDIR}/usr/local/man/cat8 - ${TARGET}: ${OBJS} cc -i ${OBJS} -o ${TARGET} --- 33,47 ---- # STRNCASECMP - If you do not have strncasecmp() CFLAGS = -O -DBIND43 TARGET = popper TAR = ${TARGET}.tar INSTALLDIR = ${DESTDIR}/usr/local MANPAGE = popper.8 CATPAGE = popper.0 MANDIR = ${DESTDIR}/usr/local/man/cat8 + all: ${TARGET} ${CATPAGE} ${TARGET}: ${OBJS} cc -i ${OBJS} -o ${TARGET} *************** *** 72,86 **** mv xae ${TAR}.Z.uuencoded.xae clean: ! rm -f core *.o *.Z* ${CATPAGE} popper ! install: ${TARGET} installman install -c -m 700 -o root -g staff ${TARGET} ${INSTALLDIR} ! installman: ! rm -f ${CATPAGE} ! nroff -man ${MANPAGE} > ${CATPAGE} ! install -c -m 644 -o root -g staff ${CATPAGE} ${MANDIR} edit: ${SCCS} edit ${REL} ${SRCS} --- 58,71 ---- mv xae ${TAR}.Z.uuencoded.xae clean: ! rm -f core *.o *.Z* ${CATPAGE} ${TARGET} ! install: ${TARGET} ${CATPAGE} install -c -m 700 -o root -g staff ${TARGET} ${INSTALLDIR} + install -c -m 444 -o root -g staff ${CATPAGE} ${MANDIR} ! ${CATPAGE}: ${MANPAGE} ! nroff -h -man ${MANPAGE} > ${CATPAGE} edit: ${SCCS} edit ${REL} ${SRCS} *** /usr/src/local/welcome/Makefile.old Mon Jan 16 22:40:36 1995 --- /usr/src/local/welcome/Makefile Sun Jan 28 19:52:22 1996 *************** *** 1,5 **** # ! # Makefile for welcome # DESTDIR= BINDIR= /usr/local --- 1,5 ---- # ! # Makefile for welcome. Revised 1996/1/28 # DESTDIR= BINDIR= /usr/local *************** *** 7,19 **** SEPFLAG= -i PROGRAM= welcome SRCS= welcome.c LIBS= ! ${PROGRAM}: ${SRCS} ! ${CC} ${SEPFLAG} ${CFLAGS} -o $@ $@.c ${LIBS} install: ${PROGRAM} welcome.0 ! install ${PROGRAM} ${DESTDIR}/${BINDIR} install -c -m 444 -o bin -g bin welcome.0 ${DESTDIR}/usr/local/man/cat1 welcome.0: welcome.1 --- 7,23 ---- SEPFLAG= -i PROGRAM= welcome SRCS= welcome.c + OBJS= welcome.o + MAN= welcome.0 LIBS= ! all: ${PROGRAM} ${MAN} + ${PROGRAM}: ${OBJS} + ${CC} ${SEPFLAG} ${CFLAGS} -o $@ ${OBJS} ${LIBS} + install: ${PROGRAM} welcome.0 ! install -s -m 755 ${PROGRAM} ${DESTDIR}/${BINDIR} install -c -m 444 -o bin -g bin welcome.0 ${DESTDIR}/usr/local/man/cat1 welcome.0: welcome.1 *************** *** 26,29 **** rm -f a.out core *.o welcome.0 ${PROGRAM} depend: ! echo 'Welcome Compiled.' --- 30,33 ---- rm -f a.out core *.o welcome.0 ${PROGRAM} depend: ! mkdep welcome.c *** /usr/src/local/zmodem/Makefile.old Fri Jan 22 21:44:42 1993 --- /usr/src/local/zmodem/Makefile Sun Jan 28 17:29:29 1996 *************** *** 1,52 **** # Driver makefile for zmodem. Calls makefile.generic. ! PREFIX = CC=cc ! OFLAG=-O ! MANSUFF = 1 ! CATSUFF = 0 ROFF = /usr/man/manroff ! DESTBIN = $(PREFIX)/usr/local ! DESTMAN = $(PREFIX)/usr/local/man/cat$(MANSUFF) INSTALL = /usr/bin/install OBJ = sz rz ! all: $(OBJ) ! sz: ! $(CC) $(CFLAGS) $(OFLAG) -DV7 -DTXBSIZE=8192 -DNFGVMIN sz.c -o sz size sz ! rz: ! $(CC) $(CFLAGS) $(OFLAG) -DMD=2 -Dstrchr=index -DV7 rz.c -o rz size rz ! install: $(OBJ) ! for f in $(OBJ); do\ ! $(INSTALL) -c -m 755 $$f ${DESTDIR}$(DESTBIN); \ ! rm -f ${DESTDIR}$(DESTMAN)/$$f.$(CATSUFF); \ ! $(ROFF) ./$$f.1 > ${DESTDIR}$(DESTMAN)/$$f.$(CATSUFF); \ ! chmod 444 ${DESTDIR}$(DESTMAN)/$$f.$(CATSUFF); \ ! chown bin.bin ${DESTDIR}$(DESTMAN)/$$f.$(CATSUFF); \ ! done ! rm -f ${DESTDIR}$(DESTBIN)/sb ${DESTDIR}$(DESTBIN)/sx ! ln ${DESTDIR}$(DESTBIN)/sz ${DESTDIR}$(DESTBIN)/sb ! ln ${DESTDIR}$(DESTBIN)/sz ${DESTDIR}$(DESTBIN)/sx ! rm -f ${DESTDIR}$(DESTBIN)/rb ${DESTDIR}$(DESTBIN)/rx ! ln ${DESTDIR}$(DESTBIN)/rz ${DESTDIR}$(DESTBIN)/rb ! ln ${DESTDIR}$(DESTBIN)/rz ${DESTDIR}$(DESTBIN)/rx ! rm -f ${DESTDIR}$(DESTMAN)/sb.$(CATSUFF) ${DESTDIR}$(DESTMAN)/sx.$(CATSUFF) ! ln ${DESTDIR}$(DESTMAN)/sz.$(CATSUFF) ${DESTDIR}$(DESTMAN)/sb.$(CATSUFF) ! ln ${DESTDIR}$(DESTMAN)/sz.$(CATSUFF) ${DESTDIR}$(DESTMAN)/sx.$(CATSUFF) ! rm -f ${DESTDIR}$(DESTMAN)/rb.$(CATSUFF) ${DESTDIR}$(DESTMAN)/rx.$(CATSUFF) ! ln ${DESTDIR}$(DESTMAN)/rz.$(CATSUFF) ${DESTDIR}$(DESTMAN)/rb.$(CATSUFF) ! ln ${DESTDIR}$(DESTMAN)/rz.$(CATSUFF) ${DESTDIR}$(DESTMAN)/rx.$(CATSUFF) clean: ! rm -f $(OBJ) ! rm -f sb sx rb rx rz sz ! rm -f *.o --- 1,51 ---- # Driver makefile for zmodem. Calls makefile.generic. ! DESTDIR= CC=cc ! CFLAGS=-O -DV7 -DMD=2 -DTXBSIZE=8192 -DNFGVMIN ! SEPFLAG=-i ROFF = /usr/man/manroff ! DESTBIN = $(DESTDIR)/usr/local ! DESTMAN = $(DESTDIR)/usr/local/man/cat1 INSTALL = /usr/bin/install OBJ = sz rz ! all: $(OBJ) rz.0 sz.0 ! sz: sz.o ! $(CC) ${SEPFLAG} sz.o -o sz size sz ! rz: rz.o ! $(CC) ${SEPFLAG} rz.o -o rz size rz ! rz.0: rz.1 ! /usr/man/manroff rz.1 > rz.0 ! sz.0: sz.1 ! /usr/man/manroff sz.1 > sz.0 ! install: rz sz rz.0 sz.0 ! install -c -s -m 755 rz ${DESTBIN} ! install -c -s -m 755 sz ${DESTBIN} ! install -c -m 444 rz.0 ${DESTMAN} ! install -c -m 444 -o bin -g bin sz.0 ${DESTMAN} ! rm -f $(DESTBIN)/sb $(DESTBIN)/sx ! ln $(DESTBIN)/sz $(DESTBIN)/sb ! ln $(DESTBIN)/sz $(DESTBIN)/sx ! rm -f $(DESTBIN)/rb $(DESTBIN)/rx ! ln $(DESTBIN)/rz $(DESTBIN)/rb ! ln $(DESTBIN)/rz $(DESTBIN)/rx + rm -f $(DESTMAN)/sb.0 $(DESTMAN)/sx.0 + ln $(DESTMAN)/sz.0 $(DESTMAN)/sb.0 + ln $(DESTMAN)/sz.0 $(DESTMAN)/sx.0 + rm -f $(DESTMAN)/rb.0 $(DESTMAN)/rx.0 + ln $(DESTMAN)/rz.0 $(DESTMAN)/rb.0 + ln $(DESTMAN)/rz.0 $(DESTMAN)/rx.0 + clean: ! rm -f $(OBJ) sb sx rb rx rz sz *.o *.0 *** /usr/src/man/man1/Makefile.old Mon Mar 13 20:53:22 1995 --- /usr/src/man/man1/Makefile Fri Jan 26 00:46:47 1996 *************** *** 14,20 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 1.2 (2.11BSD) 1995/03/13 # MDIR= /usr/man/cat1 SRCS= adb.1 addbib.1 apply.1 apropos.1 as.1 at.1 atq.1 atrm.1 \ --- 14,20 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 1.3 (2.11BSD) 1996/01/26 # MDIR= /usr/man/cat1 SRCS= adb.1 addbib.1 apply.1 apropos.1 as.1 at.1 atq.1 atrm.1 \ *************** *** 93,100 **** rm -f ${OBJS2} install: _make_01 _make_02 ! install -o bin -g bin -m 444 ${OBJS1} ${DESTDIR}${MDIR} ! install -o bin -g bin -m 444 ${OBJS2} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/case.0 ln ${DESTDIR}/${MDIR}/sh.0 ${DESTDIR}${MDIR}/case.0 rm -f ${DESTDIR}${MDIR}/checkeq.0 --- 93,100 ---- rm -f ${OBJS2} install: _make_01 _make_02 ! install -c -o bin -g bin -m 444 ${OBJS1} ${DESTDIR}${MDIR} ! install -c -o bin -g bin -m 444 ${OBJS2} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/case.0 ln ${DESTDIR}/${MDIR}/sh.0 ${DESTDIR}${MDIR}/case.0 rm -f ${DESTDIR}${MDIR}/checkeq.0 *** /usr/src/man/man2/Makefile.old Tue Dec 26 15:30:42 1995 --- /usr/src/man/man2/Makefile Thu Jan 25 23:30:14 1996 *************** *** 14,20 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 2.5 (2.11BSD GTE) 1995/12/26 # MDIR= /usr/man/cat2 SRCS= accept.2 access.2 acct.2 adjtime.2 bind.2 brk.2 chdir.2 chmod.2 \ --- 14,20 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 2.6 (2.11BSD GTE) 1996/1/26 # MDIR= /usr/man/cat2 SRCS= accept.2 access.2 acct.2 adjtime.2 bind.2 brk.2 chdir.2 chmod.2 \ *************** *** 63,69 **** rm -f ${OBJS} install: _make_01 ! install -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/dup2.0 ln ${DESTDIR}${MDIR}/dup.0 ${DESTDIR}${MDIR}/dup2.0 rm -f ${DESTDIR}${MDIR}/sbrk.0 --- 63,69 ---- rm -f ${OBJS} install: _make_01 ! install -c -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/dup2.0 ln ${DESTDIR}${MDIR}/dup.0 ${DESTDIR}${MDIR}/dup2.0 rm -f ${DESTDIR}${MDIR}/sbrk.0 *** /usr/src/man/man2/mount.2.old Sun Dec 14 15:06:52 1986 --- /usr/src/man/man2/mount.2 Thu Jan 25 22:58:28 1996 *************** *** 2,10 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)mount.2 6.3 (Berkeley) 8/26/85 .\" ! .TH MOUNT 2 "August 26, 1985" .UC 4 .SH NAME mount, umount \- mount or remove file system --- 2,10 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)mount.2 6.3.1 (2.11BSD) 1996/1/25 .\" ! .TH MOUNT 2 "January 25, 1996" .UC 4 .SH NAME mount, umount \- mount or remove file system *************** *** 11,19 **** .SH SYNOPSIS .nf .ft B ! mount(special, name, rwflag) char *special, *name; ! int rwflag; .PP .ft B umount(special) --- 11,19 ---- .SH SYNOPSIS .nf .ft B ! mount(special, name, flags) char *special, *name; ! int flags; .PP .ft B umount(special) *************** *** 43,58 **** are inaccessible while the file system is mounted. .PP ! The ! .I rwflag ! argument determines whether ! the file system can be written on; if it is 0 writing ! is allowed, if non-zero no writing is done. ! Physically write-protected and magnetic ! tape file systems must be mounted read-only or ! errors will occur when access times are updated, ! whether or not any ! explicit write is attempted. .PP .I Umount announces to the system that the --- 43,68 ---- are inaccessible while the file system is mounted. .PP ! The following ! .I flags ! may be specified to suppress default semantics which ! affect filesystem access. ! .TP 20 ! MNT_RDONLY ! The filesystem should be treated as read-only; Even the ! super-user may not write on it. ! .TP 20 ! MNT_NOEXEC ! Do not allow files to be executed from the filesystem. ! .TP 20 ! MNT_NOSUID ! Do not honor setuid or setgid bits on files when executing them. ! .TP 20 ! MNT_NODEV ! Do not interpret special files on the filesystem. ! .TP 20 ! MNT_SYNCHRONOUS ! All I/O to the filesystem should be done synchronously. .PP .I Umount announces to the system that the *************** *** 190,192 **** --- 200,211 ---- mount(8), umount(8) .SH BUGS Some of the error codes need translation to more obvious messages. + .PP + Physically write-protected and magnetic + tape file systems must be mounted read-only or + errors will occur when access times are updated, + whether or not any + explicit write is attempted. + .PP + MNT_SYNCHRONOUS is not currently implemented in the kernel but may be + specified because the kernel ignores it. *** /usr/src/man/man3/Makefile.old Tue Dec 26 17:20:33 1995 --- /usr/src/man/man3/Makefile Thu Jan 25 23:31:29 1996 *************** *** 14,20 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4.5 (2.11BSD) 1995/12/26 # MDIR= /usr/man/cat3 SRCS1= abort.3 abs.3 alarm.3 asinh.3 assert.3 atof.3 bstring.3 byteorder.3 \ --- 14,20 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4.8 (2.11BSD) 1996/1/25 # MDIR= /usr/man/cat3 SRCS1= abort.3 abs.3 alarm.3 asinh.3 assert.3 atof.3 bstring.3 byteorder.3 \ *************** *** 23,29 **** exp.3 fclose.3 ferror.3 floor.3 \ fopen.3 fread.3 frexp.3 fseek.3 getc.3 getdisk.3 getenv.3 getfsent.3 \ getgrent.3 gethostbyname.3 getlogin.3 getnetent.3 getopt.3 getpass.3 \ ! getloadavg.3 getmntinfo.3 \ getprotoent.3 getpwent.3 gets.3 getservent.3 getttyent.3 \ getusershell.3 getwd.3 hypot.3 ieee.3 inet.3 infnan.3 initgroups.3 SRCS2= insque.3 intro.3 j0.3 l3tol.3 ldfps.3 lgamma.3 lib2648.3 \ --- 23,29 ---- exp.3 fclose.3 ferror.3 floor.3 \ fopen.3 fread.3 frexp.3 fseek.3 getc.3 getdisk.3 getenv.3 getfsent.3 \ getgrent.3 gethostbyname.3 getlogin.3 getnetent.3 getopt.3 getpass.3 \ ! getloadavg.3 getmntinfo.3 getsubopt.3 \ getprotoent.3 getpwent.3 gets.3 getservent.3 getttyent.3 \ getusershell.3 getwd.3 hypot.3 ieee.3 inet.3 infnan.3 initgroups.3 SRCS2= insque.3 intro.3 j0.3 l3tol.3 ldfps.3 lgamma.3 lib2648.3 \ *************** *** 32,37 **** --- 32,38 ---- qsort.3 rand.3 random.3 rcmd.3 regex.3 resolver.3 rexec.3 scandir.3 \ scanf.3 setbuf.3 setjmp.3 setuid.3 siginterrupt.3 signal.3 sin.3 \ sinh.3 sleep.3 sqrt.3 stdio.3 strftime.3 string.3 strtok.3 stty.3 \ + strcspn.3 strpbrk.3 strsep.3 strspn.3 strtol.3 strtoul.3 strstr.3 \ swab.3 sysctl.3 syslog.3 \ system.3 termcap.3 time.3 times.3 ttyname.3 ualarm.3 uname.3 ungetc.3 \ usleep.3 utime.3 valloc.3 varargs.3 *************** *** 42,48 **** fopen.0 fread.0 frexp.0 fseek.0 getc.0 getdisk.0 getenv.0 getfsent.0 \ getgrent.0 gethostbyname.0 getlogin.0 getnetent.0 getopt.0 getpass.0 \ getprotoent.0 getpwent.0 gets.0 getservent.0 getttyent.0 \ ! getloadavg.0 getmntinfo.0 \ getusershell.0 getwd.0 hypot.0 ieee.0 inet.0 infnan.0 initgroups.0 OBJS2= insque.0 intro.0 j0.0 l3tol.0 ldfps.0 lgamma.0 lib2648.0 \ malloc.0 math.0 mktemp.0 monitor.0 mp.0 ndbm.0 nice.0 nlist.0 ns.0 \ --- 43,49 ---- fopen.0 fread.0 frexp.0 fseek.0 getc.0 getdisk.0 getenv.0 getfsent.0 \ getgrent.0 gethostbyname.0 getlogin.0 getnetent.0 getopt.0 getpass.0 \ getprotoent.0 getpwent.0 gets.0 getservent.0 getttyent.0 \ ! getloadavg.0 getmntinfo.0 getsubopt.0 \ getusershell.0 getwd.0 hypot.0 ieee.0 inet.0 infnan.0 initgroups.0 OBJS2= insque.0 intro.0 j0.0 l3tol.0 ldfps.0 lgamma.0 lib2648.0 \ malloc.0 math.0 mktemp.0 monitor.0 mp.0 ndbm.0 nice.0 nlist.0 ns.0 \ *************** *** 50,55 **** --- 51,57 ---- qsort.0 rand.0 random.0 rcmd.0 regex.0 resolver.0 rexec.0 scandir.0 \ scanf.0 setbuf.0 setjmp.0 setuid.0 siginterrupt.0 signal.0 sin.0 \ sinh.0 sleep.0 sqrt.0 stdio.0 strftime.0 string.0 strtok.0 stty.0 \ + strcspn.0 strpbrk.0 strsep.0 strspn.0 strtol.0 strtoul.0 strstr.0 \ swab.0 sysctl.0 syslog.0 \ system.0 termcap.0 time.0 times.0 ttyname.0 ualarm.0 uname.0 ungetc.0 \ usleep.0 utime.0 valloc.0 varargs.0 *************** *** 81,86 **** --- 83,89 ---- getdiskbyname.0 isatty.0 moncontrol.0 monstartup.0 setbuffer.0 \ setlinebuf.0 sys_siglist.0 ttyslot.0 endfsent.0 endgrent.0 \ endpwent.0 getfsfile.0 getfsspec.0 getfstype.0 getgrgid.0 + REMO3= getgrnam.0 getpwnam.0 getpwuid.0 setfsent.0 setgrent.0 setpwent.0 \ setpwfile.0 tgetent.0 tgetflag.0 tgetnum.0 tgetstr.0 tgoto.0 tputs.0 \ closedir.0 endttyent.0 getttynam.0 opendir.0 readdir.0 rewinddir.0 \ *************** *** 90,98 **** endprotoent.0 endusershell.0 getprotobyname.0 getprotobynumber.0 \ setprotoent.0 setusershell.0 endhostent.0 gethostbyaddr.0 gethostent.0 \ sethostent.0 sethostfile.0 memccpy.0 memchr.0 memcmp.0 memcpy.0 \ ! memset.0 strchr.0 strcspn.0 strrchr.0 strspn.0 tmpnam.0 tmpfile.0 \ tempnam.0 .SUFFIXES: .3 .0 .3.0: --- 93,103 ---- endprotoent.0 endusershell.0 getprotobyname.0 getprotobynumber.0 \ setprotoent.0 setusershell.0 endhostent.0 gethostbyaddr.0 gethostent.0 \ sethostent.0 sethostfile.0 memccpy.0 memchr.0 memcmp.0 memcpy.0 \ ! memset.0 strchr.0 strrchr.0 tmpnam.0 tmpfile.0 \ tempnam.0 + REMO4= verr.0 errx.0 verrx.0 warn.0 warnx.0 vwarnx.0 + .SUFFIXES: .3 .0 .3.0: *************** *** 109,116 **** rm -f ${OBJS2} install: _make_01 _make_02 ! install -o bin -g bin -m 444 ${OBJS1} ${DESTDIR}${MDIR} ! install -o bin -g bin -m 444 ${OBJS2} ${DESTDIR}${MDIR} for i in ${REMO1}; do \ rm -f ${DESTDIR}${MDIR}/$$i; \ done --- 114,121 ---- rm -f ${OBJS2} install: _make_01 _make_02 ! install -c -o bin -g bin -m 444 ${OBJS1} ${DESTDIR}${MDIR} ! install -c -o bin -g bin -m 444 ${OBJS2} ${DESTDIR}${MDIR} for i in ${REMO1}; do \ rm -f ${DESTDIR}${MDIR}/$$i; \ done *************** *** 120,125 **** --- 125,136 ---- for i in ${REMO3}; do \ rm -f ${DESTDIR}${MDIR}/$$i; \ done + for i in ${REMO4}; do \ + rm -f ${DESTDIR}${MDIR}/$$i; \ + done + for i in ${REMO4}; do \ + ln ${DESTDIR}/${MDIR}/err.0 ${DESTDIR}${MDIR}/$$i; \ + done ln ${DESTDIR}${MDIR}/end.0 ${DESTDIR}${MDIR}/edata.0 ln ${DESTDIR}${MDIR}/end.0 ${DESTDIR}${MDIR}/etext.0 ln ${DESTDIR}${MDIR}/j0.0 ${DESTDIR}${MDIR}/j1.0 *************** *** 364,375 **** ln ${DESTDIR}${MDIR}/compat-sys5.0 ${DESTDIR}${MDIR}/memcpy.0 ln ${DESTDIR}${MDIR}/compat-sys5.0 ${DESTDIR}${MDIR}/memset.0 ln ${DESTDIR}${MDIR}/compat-sys5.0 ${DESTDIR}${MDIR}/strchr.0 - ln ${DESTDIR}${MDIR}/compat-sys5.0 ${DESTDIR}${MDIR}/strcspn.0 ln ${DESTDIR}${MDIR}/compat-sys5.0 ${DESTDIR}${MDIR}/strrchr.0 - ln ${DESTDIR}${MDIR}/compat-sys5.0 ${DESTDIR}${MDIR}/strspn.0 ln ${DESTDIR}${MDIR}/compat-sys5.0 ${DESTDIR}${MDIR}/tmpnam.0 ln ${DESTDIR}${MDIR}/compat-sys5.0 ${DESTDIR}${MDIR}/tmpfile.0 ln ${DESTDIR}${MDIR}/compat-sys5.0 ${DESTDIR}${MDIR}/tempnam.0 FRC: - --- 375,383 ---- *** /usr/src/man/man3/compat-sys5.3.old Mon May 15 08:50:39 1989 --- /usr/src/man/man3/compat-sys5.3 Fri Jan 12 16:27:51 1996 *************** *** 13,25 **** .\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" ! .\" @(#)compat-sys5.3 5.6 (Berkeley) 8/3/88 .\" ! .TH COMPATS5 3 "August 3, 1988" .UC 7 .SH NAME ! memccpy, memchr, memcmp, memcpy, memset, strchr, ! strcspn, strpbrk, strrchr, strspn, tempnam, tmpfile, tmpnam \- System V compatibility routines .SH SYNOPSIS .nf --- 13,24 ---- .\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. .\" ! .\" @(#)compat-sys5.3 5.6.1 (2.11BSD) 1996/1/12 .\" ! .TH COMPATS5 3 "January 12, 1996" .UC 7 .SH NAME ! memccpy, memchr, memcmp, memcpy, memset, strchr, strrchr, tempnam, tmpfile, tmpnam \- System V compatibility routines .SH SYNOPSIS .nf *************** *** 47,69 **** .B char *str; .B int ch; .PP - .B int strcspn(str, chars) - .B char *str, *chars; - .PP - .B char *strpbrk(str, chars) - .B char *str, *chars; - .PP - .B char *strrchr(str, ch); - .B char *str; - .B int ch; - .PP - .B int strspn(str, chars) - .B char *str, *chars; - .PP - .B char *strtol(str, ptr, base) - .B char *str, **ptr; - .B int base; - .PP .B char *tempnam(tmpdir, prefix) .B char *tmpdir, *prefix; .PP --- 46,51 ---- *************** *** 86,88 **** --- 68,79 ---- can start recycling previously used names is untrue in this system. .SH DESCRIPTION The above routines are available and behave as in System V. + .PP + .BR strchr () + and + .BR strrchr () + are simply an alternate entry points into + .BR index () + and + .BR rindex () + respectively. *** /usr/src/man/man3f/Makefile.old Mon Jan 18 09:33:54 1993 --- /usr/src/man/man3f/Makefile Fri Jan 26 00:52:00 1996 *************** *** 14,20 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4 (Berkeley) 7/9/88 # MDIR= /usr/man/cat3f --- 14,20 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4.1 (2.11BSD) 1996/01/26 # MDIR= /usr/man/cat3f *************** *** 45,51 **** rm -f ${OBJS} install: _make_01 ! install -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/and.0 ln ${DESTDIR}${MDIR}/bit.0 ${DESTDIR}${MDIR}/and.0 rm -f ${DESTDIR}${MDIR}/lshift.0 --- 45,51 ---- rm -f ${OBJS} install: _make_01 ! install -c -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/and.0 ln ${DESTDIR}${MDIR}/bit.0 ${DESTDIR}${MDIR}/and.0 rm -f ${DESTDIR}${MDIR}/lshift.0 *************** *** 190,193 **** ln ${DESTDIR}${MDIR}/ttynam.0 ${DESTDIR}${MDIR}/isatty.0 FRC: - --- 190,192 ---- *** /usr/src/man/man4/Makefile.old Mon Jan 18 09:33:55 1993 --- /usr/src/man/man4/Makefile Fri Jan 26 00:48:32 1996 *************** *** 14,20 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4 (Berkeley) 7/9/88 # MDIR= /usr/man/cat4 SRCS= acc.4 arp.4 bk.4 br.4 cons.4 css.4 de.4 dh.4 dhu.4 dmc.4 dr.4 dz.4 \ --- 14,20 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4.1 (2.11BSD) 1996/1/26 # MDIR= /usr/man/cat4 SRCS= acc.4 arp.4 bk.4 br.4 cons.4 css.4 de.4 dh.4 dhu.4 dmc.4 dr.4 dz.4 \ *************** *** 41,47 **** rm -f ${OBJS} install: _make_01 ! install -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}/${MDIR}/dvhp.0 ln ${DESTDIR}${MDIR}/xp.0 ${DESTDIR}/${MDIR}/dvhp.0 rm -f ${DESTDIR}/${MDIR}/hp.0 --- 41,47 ---- rm -f ${OBJS} install: _make_01 ! install -c -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}/${MDIR}/dvhp.0 ln ${DESTDIR}${MDIR}/xp.0 ${DESTDIR}/${MDIR}/dvhp.0 rm -f ${DESTDIR}/${MDIR}/hp.0 *************** *** 54,57 **** ln ${DESTDIR}${MDIR}/mem.0 ${DESTDIR}/${MDIR}/kmem.0 FRC: - --- 54,56 ---- *** /usr/src/man/man4/bk.4.old Sat Aug 1 15:50:21 1987 --- /usr/src/man/man4/bk.4 Sat Jan 27 21:25:09 1996 *************** *** 2,10 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)bk.4 6.1 (Berkeley) 8/1/87 .\" ! .TH BK 4 "August 1, 1987" .UC 4 .SH NAME bk \- line discipline for machine-machine communication (obsolete) --- 2,10 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)bk.4 6.1.1 (2.11BSD) 1996/1/27 .\" ! .TH BK 4 "January 27, 1996" .UC 4 .SH NAME bk \- line discipline for machine-machine communication (obsolete) *************** *** 11,17 **** .SH SYNOPSIS .ft B .nf ! Not currently supported under 2.10BSD .fi .ft R .SH DESCRIPTION --- 11,17 ---- .SH SYNOPSIS .ft B .nf ! Not currently supported under 2.11BSD .fi .ft R .SH DESCRIPTION *** /usr/src/man/man4/dr.4.old Thu Jan 28 11:56:23 1988 --- /usr/src/man/man4/dr.4 Sat Jan 27 21:27:40 1996 *************** *** 2,10 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)dr.4 6.2 (Berkeley) 1/28/88 .\" ! .TH DR 4 "January 28, 1988" .UC 2 .SH NAME dr \- DR11-W general purpose interface driver --- 2,10 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)dr.4 6.2.1 (2.11BSD) 1996/1/27 .\" ! .TH DR 4 "January 27, 1996" .UC 2 .SH NAME dr \- DR11-W general purpose interface driver *************** *** 114,118 **** .PP \fBdr%d: timeout error\fR .SH BUGS ! This interface is only available under 2.9BSD and 2.10BSD. No documentation exists on how to use it. --- 114,118 ---- .PP \fBdr%d: timeout error\fR .SH BUGS ! This interface is only available under 2.9BSD and 2.11BSD. No documentation exists on how to use it. *** /usr/src/man/man4/intro.4.old Thu Aug 11 18:52:05 1988 --- /usr/src/man/man4/intro.4 Sat Jan 27 21:24:06 1996 *************** *** 2,10 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)intro.4 6.3 (Berkeley) 7/25/87 .\" ! .TH INTRO 4 "July 25, 1987" .UC 4 .SH NAME intro \- introduction to special files and hardware support --- 2,10 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)intro.4 6.3.1 (2.11BSD) 1996/1/27 .\" ! .TH INTRO 4 "January 27, 1996" .UC 4 .SH NAME intro \- introduction to special files and hardware support *************** *** 63,69 **** The devices listed below are supported in this incarnation of the system. Pseudo-devices are not listed. Listed also are devices which are in various stages of porting to ! 2.10BSD from 4.3BSD. .PP Devices are indicated by their functional interface. If second vendor products provide functionally identical interfaces --- 63,69 ---- The devices listed below are supported in this incarnation of the system. Pseudo-devices are not listed. Listed also are devices which are in various stages of porting to ! 2.11BSD from 4.3BSD. .PP Devices are indicated by their functional interface. If second vendor products provide functionally identical interfaces *************** *** 77,82 **** --- 77,83 ---- .nf .ne 4 .B "The following are known to work:" + acc ACC LH/DH IMP communications interface de DEC DEUNA 10Mb/s Ethernet controller dh DH-11 emulators, terminal multiplexor dhu DHU-11 terminal multiplexor *************** *** 85,90 **** --- 86,92 ---- hk RK6-11/RK06 and RK07 moving head disk ht TM03 MASSBUS tape drive interface (with TE-16, TU-45, TU-77) il Interlan 1010, 1010A, 2010A 10Mb/s Ethernet controller + lp LP-11 parallel line printer interface qe DEC DEQNA Q-bus 10 Mb/s Ethernet interface ra DEC UDA-50, RQDX, KLESI disk controllers rk DEC RK05 disk controller *************** *** 92,113 **** rx DEC RX02 floppy interface si SI 9500 disk controller tm TM-11/TE-10 tape drive interface ts TS-11 tape drive interface xp General purpose SMD disk controller .ne 4 .B "The following should work:" dr DR-11W general purpose DMA UNIBUS interface - lp LP-11 parallel line printer interface .ne 4 .B "The following worked in the past but will probably require work:" - acc ACC LH/DH IMP communications interface css DEC IMP-11A communications interface dmc DEC DMC-11/DMR-11 point-to-point communications device en Xerox 3Mb/s Ethernet controller (obsolete) sri DR-11C IMP interface - vv Proteon proNET 10Mb/s and 80Mb/s ring network interface .ne 4 .B "It should be possible to port these from 4.3BSD:" --- 94,114 ---- rx DEC RX02 floppy interface si SI 9500 disk controller tm TM-11/TE-10 tape drive interface + tmscp TMSCP-compatible tape controllers (e.g., TU81, TK50) ts TS-11 tape drive interface + vv Proteon proNET 10Mb/s and 80Mb/s ring network interface xp General purpose SMD disk controller .ne 4 .B "The following should work:" dr DR-11W general purpose DMA UNIBUS interface .ne 4 .B "The following worked in the past but will probably require work:" css DEC IMP-11A communications interface dmc DEC DMC-11/DMR-11 point-to-point communications device en Xerox 3Mb/s Ethernet controller (obsolete) sri DR-11C IMP interface .ne 4 .B "It should be possible to port these from 4.3BSD:" *************** *** 129,135 **** hy DR-11B or GI-13 interface to an NSC Hyperchannel kg KL-11/DL-11W line clock mt TM78 MASSBUS tape drive interface - tmscp TMSCP-compatible tape controllers (e.g., TU81, TK50) tu VAX-11/730 TU58 console cassette interface un DR-11W interface to Ungermann-Bass up Emulex SC-21V, SC-31 UNIBUS disk controller --- 130,135 ---- *** /usr/src/man/man4/ns.4.old Sat Aug 1 15:50:21 1987 --- /usr/src/man/man4/ns.4 Sat Jan 27 21:26:13 1996 *************** *** 2,10 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)ns.4f 1.3 (Berkeley) 8/1/87 .\" ! .TH NS 4F "August 1, 1987" .UC 2 .SH NAME ns \- Xerox Network Systems(tm) protocol family --- 2,10 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)ns.4f 1.4 (2.11BSD) 1996/1/27 .\" ! .TH NS 4F "January 27, 1996" .UC 2 .SH NAME ns \- Xerox Network Systems(tm) protocol family *************** *** 11,17 **** .SH SYNOPSIS .ft B .nf ! Not currently supported under 2.10BSD .fi .ft R .SH DESCRIPTION --- 11,17 ---- .SH SYNOPSIS .ft B .nf ! Not currently supported under 2.11BSD .fi .ft R .SH DESCRIPTION *** /usr/src/man/man4/nsip.4.old Sat Aug 1 16:01:58 1987 --- /usr/src/man/man4/nsip.4 Sat Jan 27 21:26:43 1996 *************** *** 2,10 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)nsip.4 1.1 (Berkeley) 8/1/87 .\" ! .TH NSIP 4 "August 1, 1987" .UC 2 .SH NAME nsip \- software network interface encapsulating ns packets in ip packets. --- 2,10 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)nsip.4 1.2 (2.11BSD) 1996/1/27 .\" ! .TH NSIP 4 "January 27, 1996" .UC 2 .SH NAME nsip \- software network interface encapsulating ns packets in ip packets. *************** *** 13,19 **** .nf #include ! Not currently supported under 2.10BSD .fi .ft R .SH DESCRIPTION --- 13,19 ---- .nf #include ! Not currently supported under 2.11BSD .fi .ft R .SH DESCRIPTION *** /usr/src/man/man4/ram.4.old Mon Aug 22 10:59:44 1988 --- /usr/src/man/man4/ram.4 Sat Jan 27 21:18:57 1996 *************** *** 2,10 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)ram.4 1.1 (Berkeley) 8/21/87 .\" ! .TH RAM 4 "August 21, 1987" .UC 2 .SH NAME ram \- ram disk driver --- 2,10 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)ram.4 1.2 (2.11BSD) 1996/1/27 .\" ! .TH RAM 4 "Januray 27, 1996" .UC 2 .SH NAME ram \- ram disk driver *************** *** 96,99 **** .SH BUGS The .I ram ! driver is only available under 2.10BSD. --- 96,99 ---- .SH BUGS The .I ram ! driver is only available under 2.11BSD. *** /usr/src/man/man4/rx.4.old Mon Aug 22 10:59:44 1988 --- /usr/src/man/man4/rx.4 Sat Jan 27 21:20:25 1996 *************** *** 2,10 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)rx.4 6.2 (Berkeley) 8/20/87 .\" ! .TH RX 4 "August 20, 1987" .UC 2 .SH NAME rx \- DEC RX02 floppy disk --- 2,10 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)rx.4 6.2.1 (2.11BSD) 1996/1/27 .\" ! .TH RX 4 "January 27, 1996" .UC 2 .SH NAME rx \- DEC RX02 floppy disk *************** *** 181,185 **** A program to analyze the logged error information (even in its present reduced form) is needed. .PP ! The 4.3BSD rx driver which supports far more capabilities should be ported ! to 2.10BSD. --- 181,185 ---- A program to analyze the logged error information (even in its present reduced form) is needed. .PP ! The 4.3BSD rx driver which supports more capabilities should be ported ! to 2.11BSD. *** /usr/src/man/man5/Makefile.old Thu Jan 5 20:10:57 1995 --- /usr/src/man/man5/Makefile Thu Jan 25 23:41:20 1996 *************** *** 14,26 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4.1 (2.11BSD GTE) 1/5/95 # MDIR= /usr/man/cat5 SRCS= L-devices.5 L-dialcodes.5 L.aliases.5 L.cmds.5 L.sys.5 \ USERFILE.5 a.out.5 acct.5 aliases.5 core.5 dbx.5 \ dir.5 disktab.5 dtab.5 dump.5 fs.5 fstab.5 gettytab.5 \ ! group.5 hosts.5 map3270.5 mtab.5 networks.5 passwd.5 \ phones.5 plot.5 printcap.5 protocols.5 remote.5 resolver.5 \ services.5 shells.5 stack.5 tar.5 termcap.5 tp.5 ttys.5 types.5 \ tzfile.5 utmp.5 uuencode.5 vfont.5 vgrindefs.5 --- 14,26 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4.2 (2.11BSD GTE) 1996/1/25 # MDIR= /usr/man/cat5 SRCS= L-devices.5 L-dialcodes.5 L.aliases.5 L.cmds.5 L.sys.5 \ USERFILE.5 a.out.5 acct.5 aliases.5 core.5 dbx.5 \ dir.5 disktab.5 dtab.5 dump.5 fs.5 fstab.5 gettytab.5 \ ! group.5 hosts.5 map3270.5 networks.5 passwd.5 \ phones.5 plot.5 printcap.5 protocols.5 remote.5 resolver.5 \ services.5 shells.5 stack.5 tar.5 termcap.5 tp.5 ttys.5 types.5 \ tzfile.5 utmp.5 uuencode.5 vfont.5 vgrindefs.5 *************** *** 27,33 **** OBJS= L-devices.0 L-dialcodes.0 L.aliases.0 L.cmds.0 L.sys.0 \ USERFILE.0 a.out.0 acct.0 aliases.0 core.0 dbx.0 \ dir.0 disktab.0 dtab.0 dump.0 fs.0 fstab.0 gettytab.0 \ ! group.0 hosts.0 map3270.0 mtab.0 networks.0 passwd.0 \ phones.0 plot.0 printcap.0 protocols.0 remote.0 resolver.0 \ services.0 shells.0 stack.0 tar.0 termcap.0 tp.0 ttys.0 types.0 \ tzfile.0 utmp.0 uuencode.0 vfont.0 vgrindefs.0 --- 27,33 ---- OBJS= L-devices.0 L-dialcodes.0 L.aliases.0 L.cmds.0 L.sys.0 \ USERFILE.0 a.out.0 acct.0 aliases.0 core.0 dbx.0 \ dir.0 disktab.0 dtab.0 dump.0 fs.0 fstab.0 gettytab.0 \ ! group.0 hosts.0 map3270.0 networks.0 passwd.0 \ phones.0 plot.0 printcap.0 protocols.0 remote.0 resolver.0 \ services.0 shells.0 stack.0 tar.0 termcap.0 tp.0 ttys.0 types.0 \ tzfile.0 utmp.0 uuencode.0 vfont.0 vgrindefs.0 *************** *** 45,51 **** rm -f ${OBJS} install: _make_01 ! install -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/inode.0 ln ${DESTDIR}${MDIR}/fs.0 ${DESTDIR}${MDIR}/inode.0 rm -f ${DESTDIR}${MDIR}/dumpdates.0 --- 45,51 ---- rm -f ${OBJS} install: _make_01 ! install -c -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/inode.0 ln ${DESTDIR}${MDIR}/fs.0 ${DESTDIR}${MDIR}/inode.0 rm -f ${DESTDIR}${MDIR}/dumpdates.0 *** /usr/src/man/man5/fs.5.old Tue Jun 12 23:49:36 1990 --- /usr/src/man/man5/fs.5 Sat Jan 27 21:34:32 1996 *************** *** 2,10 **** .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)fs.5 2.3 (Berkeley) 8/11/87 .\" ! .TH FS 5 "August 11, 1987" .UC 2 .SH NAME fs, inode \- format of file system volume (2BSD) --- 2,10 ---- .\" All rights reserved. The Berkeley software License Agreement .\" specifies the terms and conditions for redistribution. .\" ! .\" @(#)fs.5 2.4 (2.11BSD) 1996/1/27 .\" ! .TH FS 5 "January 27, 1996" .UC 2 .SH NAME fs, inode \- format of file system volume (2BSD) *************** *** 62,67 **** --- 62,68 ---- char fs_fsmnt[MAXMNTLEN]; /* ordinary file mounted on */ ino_t fs_lasti; /* start place for circular search */ ino_t fs_nbehind; /* est # free inodes before s_lasti */ + u_short fs_flags; /* mount time flags */ }; .fi .PP *************** *** 86,93 **** .IR fs_fsmnt . .IR Fs_flock , .IR fs_ilock , ! .IR fs_fmod " and" ! .IR fs_ronly are flags maintained in the in core copy of the super block while its file system is mounted and their values on disk are immaterial. .I Fs_fmod --- 87,95 ---- .IR fs_fsmnt . .IR Fs_flock , .IR fs_ilock , ! .IR fs_fmod , ! .IR fs_ronly " and" ! .IR fs_flags are flags maintained in the in core copy of the super block while its file system is mounted and their values on disk are immaterial. .I Fs_fmod *************** *** 94,100 **** is used as a flag to indicate that the super-block has changed and should be copied to the disk during the next periodic update of file system information. .I Fs_ronly ! is a write-protection indicator. .PP .I Fs_time is the last time the super-block of the file system was changed. During a --- 96,105 ---- is used as a flag to indicate that the super-block has changed and should be copied to the disk during the next periodic update of file system information. .I Fs_ronly ! is a write-protection indicator. It is a copy of the mount flags ! .I fs_flags ! anded with ! .BR MNT_RDONLY (see \fI/sys/h/mount.h\fP). .PP .I Fs_time is the last time the super-block of the file system was changed. During a *************** *** 133,139 **** gid_t di_gid; /* owner's group id */ off_t di_size; /* number of bytes in file */ daddr_t di_addr[7]; /* 7 block addresses 4 bytes each */ ! daddr_t di_reserved[3]; /* pad of 12 to make total size 64 */ time_t di_atime; /* time last accessed */ time_t di_mtime; /* time last modified */ time_t di_ctime; /* time created */ --- 138,145 ---- gid_t di_gid; /* owner's group id */ off_t di_size; /* number of bytes in file */ daddr_t di_addr[7]; /* 7 block addresses 4 bytes each */ ! u_short di_reserved[5]; /* pad of 10 to make total size 64 */ ! u_short di_flags; time_t di_atime; /* time last accessed */ time_t di_mtime; /* time last modified */ time_t di_ctime; /* time created */