Subject: mount(8) options, !/etc/mtab, libkern.a, MANY others (#299 part 8 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 #299 (part 8 of 8). Please refer to part 1 (#292) for detailed instructions and a description of contents. ----------------------------cut here------------------------- *** /usr/src/sys/GENERIC/Make.pdp.old Sun Dec 24 16:02:55 1995 --- /usr/src/sys/GENERIC/Make.pdp Thu Jan 11 20:37:45 1996 *************** *** 9,15 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.0 (2.11BSD GTE) 1995/05/21 # M= ../machine VPATH= ../machine --- 9,15 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.1 (2.11BSD GTE) 1996/1/11 # M= ../machine VPATH= ../machine *************** *** 25,43 **** # a few seconds to compile it, it isn't worth trashing up Make.pdpnet to # compile it there. ! SFILES= ${M}/libc_bcmp.s ${M}/libc_bcopy.s ${M}/libc_bzero.s \ ! ${M}/libc_ffs.s ${M}/libc_insque.s ${M}/libc_ldiv.s \ ! ${M}/libc_lmul.s ${M}/libc_lrem.s ${M}/libc_remque.s \ ! ${M}/libc_uldiv.s ${M}/libc_ulsh.s \ ! ${M}/libc_strlen.s ${M}/libc_udiv.s ${M}/mch_backup.s \ ${M}/mch_click.s ${M}/mch_copy.s ${M}/mch_csv.s ${M}/mch_dump.s \ ${M}/mch_dzpdma.s ${M}/mch_fpsim.s ${M}/mch_KScall.s \ ${M}/mch_profile.s ${M}/mch_start.s ${M}/mch_trap.s \ ${M}/mch_vars.s ${M}/mch_xxx.s ${M}/scb.s ${M}/toy.s ! SOBJS= libc_bcmp.o libc_bcopy.o libc_bzero.o libc_ffs.o libc_insque.o \ ! libc_ldiv.o libc_lmul.o libc_lrem.o libc_remque.o libc_strlen.o \ ! libc_uldiv.o libc_ulsh.o \ ! libc_udiv.o mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_fpsim.o mch_KScall.o mch_profile.o \ mch_start.o mch_trap.o mch_vars.o mch_xxx.o scb.o toy.o --- 25,36 ---- # a few seconds to compile it, it isn't worth trashing up Make.pdpnet to # compile it there. ! SFILES= ${M}/mch_backup.s \ ${M}/mch_click.s ${M}/mch_copy.s ${M}/mch_csv.s ${M}/mch_dump.s \ ${M}/mch_dzpdma.s ${M}/mch_fpsim.s ${M}/mch_KScall.s \ ${M}/mch_profile.s ${M}/mch_start.s ${M}/mch_trap.s \ ${M}/mch_vars.s ${M}/mch_xxx.s ${M}/scb.s ${M}/toy.s ! SOBJS= mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_fpsim.o mch_KScall.o mch_profile.o \ mch_start.o mch_trap.o mch_vars.o mch_xxx.o scb.o toy.o *** /usr/src/sys/GENERIC/Makefile.old Sun Dec 24 16:02:56 1995 --- /usr/src/sys/GENERIC/Makefile Thu Jan 11 20:43:11 1996 *************** *** 10,16 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.4 (2.11BSD GTE) 1995/12/24 # ######################################################### # Non-network, but separate I/D kernel # --- 10,16 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.5 (2.11BSD GTE) 1996/1/11 # ######################################################### # Non-network, but separate I/D kernel # *************** *** 40,49 **** # CONF Non-network assembly binaries. scb.o must be first! # boot.o should be close to the end. ! CONF= scb.o libc_bcmp.o libc_bcopy.o libc_bzero.o libc_ffs.o \ ! libc_insque.o libc_ldiv.o libc_lmul.o libc_lrem.o libc_remque.o \ ! libc_udiv.o libc_uldiv.o libc_ulsh.o \ ! libc_strlen.o mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_profile.o mch_start.o \ mch_trap.o mch_vars.o mch_xxx.o conf.o ioconf.o boot.o --- 40,47 ---- # CONF Non-network assembly binaries. scb.o must be first! # boot.o should be close to the end. ! CONF= scb.o \ ! mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_profile.o mch_start.o \ mch_trap.o mch_vars.o mch_xxx.o conf.o ioconf.o boot.o *************** *** 77,83 **** -Z ${OV1} -Z ${OV2} -Z ${OV3} -Z ${OV4} -Z ${OV5} -Z ${OV6} \ -Z ${OV7} -Z ${OV8} -Z ${OV9} -Z ${OV10} -Z ${OV11} -Z ${OV12} \ -Z ${OV13} -Z ${OV14} -Z ${OV15} -Y \ ! vers.o param.o all: unix --- 75,81 ---- -Z ${OV1} -Z ${OV2} -Z ${OV3} -Z ${OV4} -Z ${OV5} -Z ${OV6} \ -Z ${OV7} -Z ${OV8} -Z ${OV9} -Z ${OV10} -Z ${OV11} -Z ${OV12} \ -Z ${OV13} -Z ${OV14} -Z ${OV15} -Y \ ! vers.o -lkern param.o all: unix *************** *** 86,92 **** size unix @echo Compacting symbol table -symcompact unix ! @echo Compacting strings table - this will take a few minutes -strcompact unix @echo rearranging symbols -symorder ../pdp/symbols.sort unix --- 84,90 ---- size unix @echo Compacting symbol table -symcompact unix ! @echo Compacting strings table -strcompact unix @echo rearranging symbols -symorder ../pdp/symbols.sort unix *** /usr/src/sys/conf/Make.nsunix.old Sun Dec 24 14:29:55 1995 --- /usr/src/sys/conf/Make.nsunix Thu Jan 11 22:59:55 1996 *************** *** 9,15 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.5 (2.11BSD GTE) 1995/12/24 # ######################################################### # Networking, separate I/D kernel # --- 9,15 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.6 (2.11BSD GTE) 1996/1/11 # ######################################################### # Networking, separate I/D kernel # *************** *** 47,63 **** # NCONF Network (network space) assembly binaries. net_scb.o # doesn't have to be first. ! CONF= scb.o libc_bcmp.o libc_bcopy.o libc_bzero.o libc_ffs.o \ ! libc_insque.o libc_ldiv.o libc_lmul.o libc_lrem.o libc_remque.o \ ! libc_udiv.o libc_uldiv.o libc_ulsh.o \ ! libc_strlen.o mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_KScall.o mch_profile.o \ mch_start.o mch_trap.o mch_vars.o mch_xxx.o conf.o ioconf.o boot.o ! NCONF= libc_bcmp.o libc_bcopy.o libc_bzero.o libc_ffs.o libc_htonl.o \ ! libc_htons.o libc_insque.o libc_ldiv.o libc_lmul.o libc_lrem.o \ ! libc_uldiv.o libc_ulsh.o \ ! libc_remque.o libc_strlen.o libc_udiv.o net_copy.o net_csv.o \ net_mbuf.o net_scb.o net_SKcall.o net_trap.o net_xxx.o BASE= br.o cons.o dh.o dhu.o dhv.o dr.o dz.o hk.o ht.o init_sysent.o \ --- 47,58 ---- # NCONF Network (network space) assembly binaries. net_scb.o # doesn't have to be first. ! CONF= scb.o \ ! mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_KScall.o mch_profile.o \ mch_start.o mch_trap.o mch_vars.o mch_xxx.o conf.o ioconf.o boot.o ! NCONF= net_copy.o net_csv.o \ net_mbuf.o net_scb.o net_SKcall.o net_trap.o net_xxx.o BASE= br.o cons.o dh.o dhu.o dhv.o dr.o dz.o hk.o ht.o init_sysent.o \ *************** *** 90,96 **** -Z ${OV1} -Z ${OV2} -Z ${OV3} -Z ${OV4} -Z ${OV5} -Z ${OV6} \ -Z ${OV7} -Z ${OV8} -Z ${OV9} -Z ${OV10} -Z ${OV11} -Z ${OV12} \ -Z ${OV13} -Z ${OV14} -Z ${OV15} -Y \ ! enable34.o vers.o param.o NETOBJ= ${NCONF} af.o idp_usrreq.o if.o if_acc.o if_css.o if_de.o \ if_dmc.o if_ec.o if_en.o if_ether.o if_il.o if_imp.o if_imphost.o \ --- 85,91 ---- -Z ${OV1} -Z ${OV2} -Z ${OV3} -Z ${OV4} -Z ${OV5} -Z ${OV6} \ -Z ${OV7} -Z ${OV8} -Z ${OV9} -Z ${OV10} -Z ${OV11} -Z ${OV12} \ -Z ${OV13} -Z ${OV14} -Z ${OV15} -Y \ ! enable34.o vers.o -lkern param.o NETOBJ= ${NCONF} af.o idp_usrreq.o if.o if_acc.o if_css.o if_de.o \ if_dmc.o if_ec.o if_en.o if_ether.o if_il.o if_imp.o if_imphost.o \ *************** *** 111,117 **** size unix @echo Compacting symbol table -symcompact unix ! @echo Compacting strings table - this will take a few minutes -strcompact unix @echo rearranging symbols -symorder ../pdp/symbols.sort unix --- 106,112 ---- size unix @echo Compacting symbol table -symcompact unix ! @echo Compacting strings table -strcompact unix @echo rearranging symbols -symorder ../pdp/symbols.sort unix *************** *** 119,125 **** # d.netnix.o must be the last object file in the dependency list! netnix: d.netnix.o ! -ld -X -i -o netnix ${NETOBJ} d.netnix.o size netnix @echo Compacting symbol table -symcompact netnix --- 114,120 ---- # d.netnix.o must be the last object file in the dependency list! netnix: d.netnix.o ! -ld -X -i -o netnix ${NETOBJ} -lkern d.netnix.o size netnix @echo Compacting symbol table -symcompact netnix *************** *** 134,140 **** # have enough table space. d.unix.o d.netnix.o: netbind FRC ld -q -r -d -X -i -o unix.o ${LD_KOBJ} ! ld -q -r -d -X -i -o netnix.o ${NETOBJ} ./netbind unix.o netnix.o rm unix.o netnix.o ${AS} - -o d.unix.o d.unix.s --- 129,135 ---- # have enough table space. d.unix.o d.netnix.o: netbind FRC ld -q -r -d -X -i -o unix.o ${LD_KOBJ} ! ld -q -r -d -X -i -o netnix.o ${NETOBJ} -lkern ./netbind unix.o netnix.o rm unix.o netnix.o ${AS} - -o d.unix.o d.unix.s *** /usr/src/sys/conf/Make.pdp.old Sun May 21 17:31:27 1995 --- /usr/src/sys/conf/Make.pdp Thu Jan 11 20:37:45 1996 *************** *** 9,15 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.0 (2.11BSD GTE) 1995/05/21 # M= ../machine VPATH= ../machine --- 9,15 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.1 (2.11BSD GTE) 1996/1/11 # M= ../machine VPATH= ../machine *************** *** 25,43 **** # a few seconds to compile it, it isn't worth trashing up Make.pdpnet to # compile it there. ! SFILES= ${M}/libc_bcmp.s ${M}/libc_bcopy.s ${M}/libc_bzero.s \ ! ${M}/libc_ffs.s ${M}/libc_insque.s ${M}/libc_ldiv.s \ ! ${M}/libc_lmul.s ${M}/libc_lrem.s ${M}/libc_remque.s \ ! ${M}/libc_uldiv.s ${M}/libc_ulsh.s \ ! ${M}/libc_strlen.s ${M}/libc_udiv.s ${M}/mch_backup.s \ ${M}/mch_click.s ${M}/mch_copy.s ${M}/mch_csv.s ${M}/mch_dump.s \ ${M}/mch_dzpdma.s ${M}/mch_fpsim.s ${M}/mch_KScall.s \ ${M}/mch_profile.s ${M}/mch_start.s ${M}/mch_trap.s \ ${M}/mch_vars.s ${M}/mch_xxx.s ${M}/scb.s ${M}/toy.s ! SOBJS= libc_bcmp.o libc_bcopy.o libc_bzero.o libc_ffs.o libc_insque.o \ ! libc_ldiv.o libc_lmul.o libc_lrem.o libc_remque.o libc_strlen.o \ ! libc_uldiv.o libc_ulsh.o \ ! libc_udiv.o mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_fpsim.o mch_KScall.o mch_profile.o \ mch_start.o mch_trap.o mch_vars.o mch_xxx.o scb.o toy.o --- 25,36 ---- # a few seconds to compile it, it isn't worth trashing up Make.pdpnet to # compile it there. ! SFILES= ${M}/mch_backup.s \ ${M}/mch_click.s ${M}/mch_copy.s ${M}/mch_csv.s ${M}/mch_dump.s \ ${M}/mch_dzpdma.s ${M}/mch_fpsim.s ${M}/mch_KScall.s \ ${M}/mch_profile.s ${M}/mch_start.s ${M}/mch_trap.s \ ${M}/mch_vars.s ${M}/mch_xxx.s ${M}/scb.s ${M}/toy.s ! SOBJS= mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_fpsim.o mch_KScall.o mch_profile.o \ mch_start.o mch_trap.o mch_vars.o mch_xxx.o scb.o toy.o *** /usr/src/sys/conf/Make.pdpnet.old Sun May 21 17:45:19 1995 --- /usr/src/sys/conf/Make.pdpnet Thu Jan 11 20:38:14 1996 *************** *** 9,15 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.0 (2.11BSD GTE) 1995/05/21 # M= ../machine VPATH= ../machine --- 9,15 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.1 (2.11BSD GTE) 1996/1/11 # M= ../machine VPATH= ../machine *************** *** 17,26 **** CFILES= ${M}/enable34.c ${M}/in_cksum.c COBJS= enable34.o in_cksum.o ! SFILES= ${M}/libc_htonl.s ${M}/libc_htons.s ${M}/net_copy.s \ ${M}/net_csv.s ${M}/net_mbuf.s ${M}/net_scb.s ${M}/net_SKcall.s \ ${M}/net_trap.s ${M}/net_xxx.s ! SOBJS= libc_htonl.o libc_htons.o mch_KScall.o net_copy.o net_csv.o \ net_mbuf.o net_scb.o net_SKcall.o net_trap.o net_xxx.o .c.o: --- 17,26 ---- CFILES= ${M}/enable34.c ${M}/in_cksum.c COBJS= enable34.o in_cksum.o ! SFILES= ${M}/net_copy.s \ ${M}/net_csv.s ${M}/net_mbuf.s ${M}/net_scb.s ${M}/net_SKcall.s \ ${M}/net_trap.s ${M}/net_xxx.s ! SOBJS= mch_KScall.o net_copy.o net_csv.o \ net_mbuf.o net_scb.o net_SKcall.o net_trap.o net_xxx.o .c.o: *** /usr/src/sys/conf/Make.sunix.old Sun Dec 24 15:55:25 1995 --- /usr/src/sys/conf/Make.sunix Thu Jan 11 20:39:07 1996 *************** *** 9,15 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.4 (2.11BSD GTE) 1995/12/24 # ######################################################### # Non-network, but separate I/D kernel # --- 9,15 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.5 (2.11BSD GTE) 1996/1/11 # ######################################################### # Non-network, but separate I/D kernel # *************** *** 39,48 **** # CONF Non-network assembly binaries. scb.o must be first! # boot.o should be close to the end. ! CONF= scb.o libc_bcmp.o libc_bcopy.o libc_bzero.o libc_ffs.o \ ! libc_insque.o libc_ldiv.o libc_lmul.o libc_lrem.o libc_remque.o \ ! libc_udiv.o libc_uldiv.o libc_ulsh.o \ ! libc_strlen.o mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_profile.o mch_start.o \ mch_trap.o mch_vars.o mch_xxx.o conf.o ioconf.o boot.o --- 39,46 ---- # CONF Non-network assembly binaries. scb.o must be first! # boot.o should be close to the end. ! CONF= scb.o \ ! mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_profile.o mch_start.o \ mch_trap.o mch_vars.o mch_xxx.o conf.o ioconf.o boot.o *************** *** 76,82 **** -Z ${OV1} -Z ${OV2} -Z ${OV3} -Z ${OV4} -Z ${OV5} -Z ${OV6} \ -Z ${OV7} -Z ${OV8} -Z ${OV9} -Z ${OV10} -Z ${OV11} -Z ${OV12} \ -Z ${OV13} -Z ${OV14} -Z ${OV15} -Y \ ! vers.o param.o all: unix --- 74,80 ---- -Z ${OV1} -Z ${OV2} -Z ${OV3} -Z ${OV4} -Z ${OV5} -Z ${OV6} \ -Z ${OV7} -Z ${OV8} -Z ${OV9} -Z ${OV10} -Z ${OV11} -Z ${OV12} \ -Z ${OV13} -Z ${OV14} -Z ${OV15} -Y \ ! vers.o -lkern param.o all: unix *************** *** 85,91 **** size unix @echo Compacting symbol table -symcompact unix ! @echo Compacting strings table - this will take a few minutes -strcompact unix @echo rearranging symbols -symorder ../pdp/symbols.sort unix --- 83,89 ---- size unix @echo Compacting symbol table -symcompact unix ! @echo Compacting strings table -strcompact unix @echo rearranging symbols -symorder ../pdp/symbols.sort unix *** /usr/src/sys/conf/Make.unix.old Sun Dec 24 14:30:58 1995 --- /usr/src/sys/conf/Make.unix Thu Jan 11 20:39:59 1996 *************** *** 9,15 **** # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.4 (2.11BSD GTE) 1995/12/24 # ######################################################### # Non-networking, non-separate I/D kernel # --- 9,15 ---- # software without specific prior written permission. This software # is provided ``as is'' without express or implied warranty. # ! # 2.5 (2.11BSD GTE) 1996/1/11 # ######################################################### # Non-networking, non-separate I/D kernel # *************** *** 39,48 **** # CONF Non-network assembly binaries. scb.o must be first! # boot.o should be close to the end. ! CONF= scb.o libc_bcmp.o libc_bcopy.o libc_bzero.o libc_ffs.o \ ! libc_insque.o libc_ldiv.o libc_lmul.o libc_lrem.o libc_remque.o \ ! libc_uldiv.o libc_ulsh.o \ ! libc_strlen.o mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_fpsim.o mch_profile.o mch_start.o \ mch_trap.o mch_vars.o mch_xxx.o conf.o ioconf.o boot.o --- 39,46 ---- # CONF Non-network assembly binaries. scb.o must be first! # boot.o should be close to the end. ! CONF= scb.o \ ! mch_backup.o mch_click.o mch_copy.o mch_csv.o \ mch_dump.o mch_dzpdma.o mch_fpsim.o mch_profile.o mch_start.o \ mch_trap.o mch_vars.o mch_xxx.o conf.o ioconf.o boot.o *************** *** 78,84 **** -Z ${OV1} -Z ${OV2} -Z ${OV3} -Z ${OV4} -Z ${OV5} -Z ${OV6} \ -Z ${OV7} -Z ${OV8} -Z ${OV9} -Z ${OV10} -Z ${OV11} -Z ${OV12} \ -Z ${OV13} -Z ${OV14} -Z ${OV15} -Y \ ! vers.o param.o all: unix --- 76,82 ---- -Z ${OV1} -Z ${OV2} -Z ${OV3} -Z ${OV4} -Z ${OV5} -Z ${OV6} \ -Z ${OV7} -Z ${OV8} -Z ${OV9} -Z ${OV10} -Z ${OV11} -Z ${OV12} \ -Z ${OV13} -Z ${OV14} -Z ${OV15} -Y \ ! vers.o -lkern param.o all: unix *************** *** 87,93 **** size unix @echo Compacting symbol table -symcompact unix ! @echo Compacting strings table - this will take a few minutes -strcompact unix @echo rearranging symbols -symorder ../pdp/symbols.sort unix --- 85,91 ---- size unix @echo Compacting symbol table -symcompact unix ! @echo Compacting strings table -strcompact unix @echo rearranging symbols -symorder ../pdp/symbols.sort unix *** /usr/src/sys/h/quota.h.old Thu Mar 11 20:04:27 1993 --- /usr/src/sys/h/quota.h Tue Jan 23 19:55:47 1996 *************** *** 3,9 **** * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * ! * @(#)quota.h 7.1 (Berkeley) 6/4/86 */ /* --- 3,9 ---- * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * ! * @(#)quota.h 7.1.1 (2.11BSD) 1996/1/23 */ /* *************** *** 115,120 **** --- 115,123 ---- int ndquot; struct dquot *discquota(), *inoquota(), *dqalloc(), *dqp(); #endif + + #define QUOTAFILENAME "quotas" + #define QUOTAGROUP "operator" /* * Definitions for the 'quota' system call. *** /usr/src/sys/h/types.h.old Sat Nov 26 23:09:38 1994 --- /usr/src/sys/h/types.h Fri Jan 12 22:03:45 1996 *************** *** 3,9 **** * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * ! * @(#)types.h 1.3 (2.11BSD Berkeley) 11/26/94 */ #ifndef _TYPES_ --- 3,9 ---- * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * ! * @(#)types.h 1.4 (2.11BSD Berkeley) 1996/1/12 */ #ifndef _TYPES_ *************** *** 40,45 **** --- 40,46 ---- typedef u_short ino_t; typedef long swblk_t; typedef u_int size_t; + typedef int ssize_t; typedef long time_t; typedef short dev_t; typedef long off_t; *** /usr/src/sys/pdpstand/disklabel.c.old Mon Jul 10 23:10:33 1995 --- /usr/src/sys/pdpstand/disklabel.c Sun Jan 21 14:18:18 1996 *************** *** 1,7 **** /* * Public domain, June 1995 * ! * @(#)disklabel.c 1.2 (2.11BSD GTE) 1995/07/10 */ #define DKTYPENAMES --- 1,7 ---- /* * Public domain, June 1995 * ! * @(#)disklabel.c 1.3 (2.11BSD GTE) 1996/1/21 */ #define DKTYPENAMES *************** *** 423,429 **** if (i < 0) break; if (cyl) ! off = lp->d_secpercyl * cyl; else off = 0; off += sec; --- 423,429 ---- if (i < 0) break; if (cyl) ! off = (long)lp->d_secpercyl * cyl; else off = 0; off += sec; *************** *** 438,444 **** if (i < 0) break; if (cyl) ! size = lp->d_secpercyl * cyl; else size = 0; size += sec; --- 438,444 ---- if (i < 0) break; if (cyl) ! size = (long)lp->d_secpercyl * cyl; else size = 0; size += sec; *** /VERSION.old Mon Jan 8 20:25:27 1996 --- /VERSION Tue Jan 30 19:48:38 1996 *************** *** 1,4 **** ! Current Patch Level: 291 2.11 BSD ============ --- 1,4 ---- ! Current Patch Level: 299 2.11 BSD ============ *************** *** 57,66 **** made to both the kernel and the application programs. Steven M. Schultz ! Contel Federal Systems ! 31717 La Tienda Drive ! Westlake Village CA 91359 ! sms@wlv.imsd.contel.com Below is the original VERSION file distributed with 2.10.1BSD ----------------------------------------------------------------------- --- 57,66 ---- made to both the kernel and the application programs. Steven M. Schultz ! GTE Government Systems ! 112 South Lakeview Canyon Road ! Thousand Oaks CA 91359 ! sms@wlv.iipo.gtegsc.com Below is the original VERSION file distributed with 2.10.1BSD -----------------------------------------------------------------------