Date: Fri, 14 Nov 2003 08:50:17 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42335 for review Message-ID: <200311141650.hAEGoH7v049557@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=42335 Change 42335 by peter@peter_overcee on 2003/11/14 08:49:50 IFC @42332 Affected files ... .. //depot/projects/hammer/UPDATING#26 integrate .. //depot/projects/hammer/bin/cp/utils.c#5 integrate .. //depot/projects/hammer/contrib/cvs/man/cvs.1#3 integrate .. //depot/projects/hammer/contrib/gcc/gcc.c#7 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_mibII/Makefile#2 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/setjmp.S#3 integrate .. //depot/projects/hammer/lib/libc/sys/msync.2#4 integrate .. //depot/projects/hammer/lib/libnetgraph/internal.h#2 integrate .. //depot/projects/hammer/lib/libnetgraph/msg.c#2 integrate .. //depot/projects/hammer/lib/libnetgraph/netgraph.3#4 integrate .. //depot/projects/hammer/lib/libnetgraph/sock.c#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#13 integrate .. //depot/projects/hammer/release/Makefile#39 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#36 integrate .. //depot/projects/hammer/sbin/dump/Makefile#5 integrate .. //depot/projects/hammer/sbin/dump/dumprmt.c#4 integrate .. //depot/projects/hammer/sbin/dump/main.c#9 integrate .. //depot/projects/hammer/sbin/dumpfs/Makefile#3 integrate .. //depot/projects/hammer/sbin/dumpfs/dumpfs.c#8 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.c#10 integrate .. //depot/projects/hammer/sbin/fsdb/Makefile#3 integrate .. //depot/projects/hammer/sbin/fsdb/fsdb.c#3 integrate .. //depot/projects/hammer/sbin/fsdb/fsdbutil.c#2 integrate .. //depot/projects/hammer/sbin/mount_ext2fs/Makefile#2 integrate .. //depot/projects/hammer/sbin/mount_ext2fs/mount_ext2fs.c#3 integrate .. //depot/projects/hammer/share/man/man4/dc.4#7 integrate .. //depot/projects/hammer/share/man/man4/gx.4#2 integrate .. //depot/projects/hammer/share/man/man4/rue.4#3 integrate .. //depot/projects/hammer/share/man/man4/sk.4#3 integrate .. //depot/projects/hammer/share/man/man7/build.7#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/clock.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#19 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#21 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_exception.S#3 integrate .. //depot/projects/hammer/sys/conf/NOTES#30 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#14 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#11 integrate .. //depot/projects/hammer/sys/dev/aha/aha.c#10 integrate .. //depot/projects/hammer/sys/dev/aha/aha_isa.c#7 integrate .. //depot/projects/hammer/sys/dev/aha/ahareg.h#4 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#11 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#23 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#10 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#7 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#14 integrate .. //depot/projects/hammer/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#10 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#8 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#9 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#10 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#5 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#9 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usb_ethersubr.c#7 integrate .. //depot/projects/hammer/sys/dev/wl/if_wl.c#7 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#11 integrate .. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#15 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#3 integrate .. //depot/projects/hammer/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#13 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#11 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#20 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#20 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#9 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_atm.h#3 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_sscop.h#2 integrate .. //depot/projects/hammer/sys/netgraph/atm/ngatmbase.h#2 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.h#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_prse.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_var.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_bluetooth.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_h4.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_hci.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#3 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#14 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#9 integrate .. //depot/projects/hammer/sys/netkey/key.c#10 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#24 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#11 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#20 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#12 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#16 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#14 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#13 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#10 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#11 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#11 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#25 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#17 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#25 integrate .. //depot/projects/hammer/sys/sys/proc.h#38 integrate .. //depot/projects/hammer/sys/sys/syscall.h#20 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#20 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#20 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#16 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#27 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#13 integrate .. //depot/projects/hammer/tools/tools/README#6 integrate .. //depot/projects/hammer/tools/tools/kttcp/Makefile#1 branch .. //depot/projects/hammer/tools/tools/kttcp/README#1 branch .. //depot/projects/hammer/tools/tools/kttcp/kttcp.c#1 branch .. //depot/projects/hammer/tools/tools/kttcp/sys/Makefile#1 branch .. //depot/projects/hammer/tools/tools/kttcp/sys/kttcp.c#1 branch .. //depot/projects/hammer/tools/tools/kttcp/sys/kttcpio.h#1 branch .. //depot/projects/hammer/usr.bin/truss/syscalls.c#8 integrate .. //depot/projects/hammer/usr.sbin/config/config.y#4 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.c#4 integrate .. //depot/projects/hammer/usr.sbin/mtree/test/test04.sh#1 branch .. //depot/projects/hammer/usr.sbin/ndp/ndp.8#4 integrate .. //depot/projects/hammer/usr.sbin/ndp/ndp.c#4 integrate Differences ... ==== //depot/projects/hammer/UPDATING#26 (text+ko) ==== @@ -18,14 +18,24 @@ to maximize performance. 20031112: - The statfs structure has been updated with 64-bit fields to allow - accurate reporting of multi-terabyte filesystem sizes. You should - build and boot a new kernel BEFORE doing a `make world' as the new - kernel will know about binaries using the old statfs structure, - but an old kernel will not know about the new system calls that - support the new statfs structure. Running an old kernel after a - `make world' will cause programs such as `df' that do a statfs - system call to fail with a bad system call. + The statfs structure has been updated with 64-bit fields to + allow accurate reporting of multi-terabyte filesystem + sizes. You should build and boot a new kernel BEFORE doing a + `make world' as the new kernel will know about binaries using + the old statfs structure, but an old kernel will not know + about the new system calls that support the new statfs + structure. Running an old kernel after a `make world' will + cause programs such as `df' that do a statfs system call to + fail with a bad system call. Marco Wertejuk <wertejuk@mwcis.com> + also reports that cfsd (ports/security/cfs) needs to be + recompiled after these changes are installed. + + ****************************DANGER******************************* + + DO NOT make installworld after the buildworld w/o building and + installing a new kernel FIRST. You will be unable to build a + new kernel otherwise on a system with new binaries and an old + kernel. 20031112: Some netgraph string length constants have been changed. This @@ -1415,4 +1425,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.278 2003/11/12 19:13:02 mckusick Exp $ +$FreeBSD: src/UPDATING,v 1.280 2003/11/14 08:07:13 mckusick Exp $ ==== //depot/projects/hammer/bin/cp/utils.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.41 2003/06/22 07:02:17 jmg Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.42 2003/11/13 05:26:55 alc Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -133,7 +133,8 @@ * wins some CPU back. */ #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED - if (S_ISREG(fs->st_mode) && fs->st_size <= 8 * 1048576) { + if (S_ISREG(fs->st_mode) && fs->st_size > 0 && + fs->st_size <= 8 * 1048576) { if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ, MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) { warn("%s", entp->fts_path); ==== //depot/projects/hammer/contrib/cvs/man/cvs.1#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.19 2002/09/02 05:57:13 peter Exp $ +.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.20 2003/11/13 17:57:53 obrien Exp $ .de Id .ds Rv \\$3 .ds Dt \\$4 @@ -2123,6 +2123,13 @@ .BR vi ) is used. .TP +.SM CVS_CLIENT_PORT +If this variable is set then +.B cvs +will use this port in +\fIpserver mode\fP +rather than the default port (cvspserver 2401). +.TP .SM CVS_IGNORE_REMOTE_ROOT If this variable is set then .B cvs ==== //depot/projects/hammer/contrib/gcc/gcc.c#7 (text+ko) ==== @@ -22,7 +22,7 @@ This paragraph is here to try to keep Sun CC from dying. The number of chars here seems crucial!!!! */ -/* $FreeBSD: src/contrib/gcc/gcc.c,v 1.37 2003/11/07 03:23:43 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/gcc.c,v 1.38 2003/11/13 22:40:05 kan Exp $ */ /* This program is the user interface to the C compiler and possibly to other compilers. It is used because compilation is a complicated procedure @@ -3671,7 +3671,7 @@ as well as trying the machine and the version. */ #ifdef FREEBSD_NATIVE add_prefix (&exec_prefixes, PREFIX"/bin/", "BINUTILS", - 0, 0, warn_std_ptr, 0); + PREFIX_PRIORITY_LAST, 0, warn_std_ptr, 0); #endif /* FREEBSD_NATIVE */ #ifndef OS2 add_prefix (&exec_prefixes, standard_exec_prefix, "GCC", ==== //depot/projects/hammer/lib/libbsnmp/modules/snmp_mibII/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libbsnmp/modules/snmp_mibII/Makefile,v 1.2 2003/11/10 13:43:26 harti Exp $ +# $FreeBSD: src/lib/libbsnmp/modules/snmp_mibII/Makefile,v 1.3 2003/11/13 10:18:16 harti Exp $ # # Author: Harti Brandt <harti@freebsd.org> @@ -13,6 +13,7 @@ DEFS= ${MOD}_tree.def INCS= snmp_${MOD}.h +MIBS= CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR} ==== //depot/projects/hammer/lib/libc/alpha/gen/setjmp.S#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/setjmp.S,v 1.16 2003/01/19 00:17:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/setjmp.S,v 1.17 2003/11/14 03:21:22 jeff Exp $"); #include "SYS.h" @@ -86,7 +86,7 @@ mov s0, a0 ldq s0, (( 9 + 4) * 8)(a0) - ldiq t0, 0xacedbade /* sigcontext magic number */ + ldiq t0, 0xacedbadd /* sigcontext magic number */ stq t0, ((31 + 4) * 8)(a0) /* magic in sc_regs[31] */ /* Too bad we can't check if we actually used FP */ ldiq t0, 1 @@ -120,8 +120,16 @@ XLEAF(longjmp, 2) LEAF(__longjmp, 2) LDGP(pv) - stq a1, (( 0 + 4) * 8)(a0) /* save return value */ - CALL(_sigreturn) /* use sigreturn to return */ + mov a1, s1 /* save return value */ + mov a0, s0 /* save the sc pointer */ + /* restore the mask */ + mov zero, a2 /* oset: NULL */ + lda a1, (71 * 8)(a0) /* set: sc_reserved */ + addq a2, 3, a0 /* how: SIG_SET */ + CALL(_sigprocmask) /* restore the mask */ + mov s0, a0 /* restore the sc pointer */ + mov s1, a1 /* restore the return value */ + jmp zero, ___longjmp /* use ___longjmp to return */ botch: CALL(longjmperror) ==== //depot/projects/hammer/lib/libc/sys/msync.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)msync.2 8.2 (Berkeley) 6/21/94 -.\" $FreeBSD: src/lib/libc/sys/msync.2,v 1.25 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/msync.2,v 1.26 2003/11/14 07:18:12 alc Exp $ .\" .Dd June 21, 1994 .Dt MSYNC 2 @@ -78,6 +78,9 @@ system call will fail if: .Bl -tag -width Er +.It Bq Er EBUSY +Some or all of the pages in the specified region are locked and +MS_INVALIDATE is specified. .It Bq Er EINVAL The .Fa addr @@ -94,12 +97,11 @@ argument was both MS_ASYNC and MS_INVALIDATE. Only one of these flags is allowed. -.It Bq Er EIO -An I/O error occurred while writing to the file system. .El .Sh SEE ALSO .Xr madvise 2 , .Xr mincore 2 , +.Xr mlock 2 , .Xr mprotect 2 , .Xr munmap 2 .Sh HISTORY ==== //depot/projects/hammer/lib/libnetgraph/internal.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Archie Cobbs <archie@whistle.com> * - * $FreeBSD: src/lib/libnetgraph/internal.h,v 1.3 2000/01/28 00:48:27 archie Exp $ + * $FreeBSD: src/lib/libnetgraph/internal.h,v 1.4 2003/11/14 08:09:01 harti Exp $ * $Whistle: internal.h,v 1.5 1999/01/20 00:57:22 archie Exp $ */ @@ -46,6 +46,7 @@ #include <sys/socket.h> #include <sys/select.h> #include <sys/linker.h> +#include <stddef.h> #include <stdlib.h> #include <stdio.h> @@ -55,6 +56,10 @@ #include <ctype.h> #include <err.h> +/* the 'sockaddr overhead' for a netgraph address. This is everything before + * the string that constitutes the address. */ +#define NGSA_OVERHEAD (offsetof(struct sockaddr_ng, sg_data)) + extern int _gNgDebugLevel; extern void (*_NgLog)(const char *fmt, ...); ==== //depot/projects/hammer/lib/libnetgraph/msg.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libnetgraph/msg.c,v 1.6 2001/10/25 04:02:25 archie Exp $"); +__FBSDID("$FreeBSD: src/lib/libnetgraph/msg.c,v 1.7 2003/11/14 08:09:01 harti Exp $"); #include <sys/types.h> #include <stdarg.h> @@ -76,7 +76,7 @@ msg.header.token = gMsgId; msg.header.flags = NGF_ORIG; msg.header.cmd = cmd; - snprintf(msg.header.cmdstr, NG_CMDSTRLEN + 1, "cmd%d", cmd); + snprintf(msg.header.cmdstr, NG_CMDSTRSIZ, "cmd%d", cmd); /* Deliver message */ if (NgDeliverMsg(cs, path, &msg, args, arglen) < 0) @@ -175,7 +175,7 @@ NgDeliverMsg(int cs, const char *path, const struct ng_mesg *hdr, const void *args, size_t arglen) { - u_char sgbuf[NG_PATHLEN + 3]; + u_char sgbuf[NG_PATHSIZ + NGSA_OVERHEAD]; struct sockaddr_ng *const sg = (struct sockaddr_ng *) sgbuf; u_char *buf = NULL; struct ng_mesg *msg; @@ -203,8 +203,9 @@ /* Prepare socket address */ sg->sg_family = AF_NETGRAPH; - snprintf(sg->sg_data, NG_PATHLEN + 1, "%s", path); - sg->sg_len = strlen(sg->sg_data) + 3; + /* XXX handle overflow */ + strlcpy(sg->sg_data, path, NG_PATHSIZ); + sg->sg_len = strlen(sg->sg_data) + 1 + NGSA_OVERHEAD; /* Debugging */ if (_gNgDebugLevel >= 2) { @@ -240,7 +241,7 @@ int NgRecvMsg(int cs, struct ng_mesg *rep, size_t replen, char *path) { - u_char sgbuf[NG_PATHLEN + sizeof(struct sockaddr_ng)]; + u_char sgbuf[NG_PATHSIZ + NGSA_OVERHEAD]; struct sockaddr_ng *const sg = (struct sockaddr_ng *) sgbuf; int len, sglen = sizeof(sgbuf); int errnosv; @@ -254,7 +255,7 @@ goto errout; } if (path != NULL) - snprintf(path, NG_PATHLEN + 1, "%s", sg->sg_data); + strlcpy(path, sg->sg_data, NG_PATHSIZ); /* Debugging */ if (_gNgDebugLevel >= 2) { ==== //depot/projects/hammer/lib/libnetgraph/netgraph.3#4 (text+ko) ==== @@ -32,7 +32,7 @@ .\" .\" Author: Archie Cobbs <archie@whistle.com> .\" -.\" $FreeBSD: src/lib/libnetgraph/netgraph.3,v 1.18 2003/06/08 10:34:00 charnier Exp $ +.\" $FreeBSD: src/lib/libnetgraph/netgraph.3,v 1.19 2003/11/14 08:09:01 harti Exp $ .\" $Whistle: netgraph.3,v 1.7 1999/01/25 07:14:06 archie Exp $ .\" .Dd January 19, 1999 @@ -174,7 +174,7 @@ If .Fa "path" is non-NULL, it must point to a buffer of at least -.Dv "NG_PATHLEN + 1" +.Dv "NG_PATHSIZ" bytes, which will be filled in (and NUL terminated) with the path to the node from which the message was received. .Pp @@ -216,7 +216,7 @@ which must be large enough to hold the entire packet. If .Fa "hook" is non-NULL, it must point to a buffer of at least -.Dv "NG_HOOKLEN + 1" +.Dv "NG_HOOKSIZ" bytes, which will be filled in (and NUL terminated) with the name of the hook on which the data was received. .Pp ==== //depot/projects/hammer/lib/libnetgraph/sock.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libnetgraph/sock.c,v 1.4 2003/01/01 18:48:44 schweikh Exp $"); +__FBSDID("$FreeBSD: src/lib/libnetgraph/sock.c,v 1.5 2003/11/14 08:09:01 harti Exp $"); #include <sys/types.h> #include <stdarg.h> @@ -60,7 +60,7 @@ int NgMkSockNode(const char *name, int *csp, int *dsp) { - char namebuf[NG_NODELEN + 1]; + char namebuf[NG_NODESIZ]; int cs = -1; /* control socket */ int ds = -1; /* data socket */ int errnosv; @@ -93,13 +93,13 @@ gotNode: /* Assign the node the desired name, if any */ if (name != NULL) { - u_char sbuf[NG_NODELEN + 3]; + u_char sbuf[NG_NODESIZ + NGSA_OVERHEAD]; struct sockaddr_ng *const sg = (struct sockaddr_ng *) sbuf; /* Assign name */ - snprintf(sg->sg_data, NG_NODELEN + 1, "%s", name); + strlcpy(sg->sg_data, name, NG_NODESIZ); sg->sg_family = AF_NETGRAPH; - sg->sg_len = strlen(sg->sg_data) + 3; + sg->sg_len = strlen(sg->sg_data) + 1 + NGSA_OVERHEAD; if (bind(cs, (struct sockaddr *) sg, sg->sg_len) < 0) { errnosv = errno; if (_gNgDebugLevel >= 1) @@ -108,7 +108,7 @@ } /* Save node name */ - snprintf(namebuf, sizeof(namebuf), "%s", name); + strlcpy(namebuf, name, sizeof(namebuf)); } else if (dsp != NULL) { u_char rbuf[sizeof(struct ng_mesg) + sizeof(struct nodeinfo)]; struct ng_mesg *const resp = (struct ng_mesg *) rbuf; @@ -135,7 +135,7 @@ /* Create data socket if desired */ if (dsp != NULL) { - u_char sbuf[NG_NODELEN + 4]; + u_char sbuf[NG_NODESIZ + 1 + NGSA_OVERHEAD]; struct sockaddr_ng *const sg = (struct sockaddr_ng *) sbuf; /* Create data socket, initially just "floating" */ @@ -147,9 +147,9 @@ } /* Associate the data socket with the node */ - snprintf(sg->sg_data, NG_NODELEN + 2, "%s:", namebuf); + snprintf(sg->sg_data, NG_NODESIZ + 1, "%s:", namebuf); sg->sg_family = AF_NETGRAPH; - sg->sg_len = strlen(sg->sg_data) + 3; + sg->sg_len = strlen(sg->sg_data) + 1 + NGSA_OVERHEAD; if (connect(ds, (struct sockaddr *) sg, sg->sg_len) < 0) { errnosv = errno; if (_gNgDebugLevel >= 1) @@ -211,7 +211,7 @@ int NgRecvData(int ds, u_char * buf, size_t len, char *hook) { - u_char frombuf[NG_HOOKLEN + sizeof(struct sockaddr_ng)]; + u_char frombuf[NG_HOOKSIZ + NGSA_OVERHEAD]; struct sockaddr_ng *const from = (struct sockaddr_ng *) frombuf; int fromlen = sizeof(frombuf); int rtn, errnosv; @@ -228,7 +228,7 @@ /* Copy hook name */ if (hook != NULL) - snprintf(hook, NG_HOOKLEN + 1, "%s", from->sg_data); + strlcpy(hook, from->sg_data, NG_HOOKSIZ); /* Debugging */ if (_gNgDebugLevel >= 2) { @@ -250,14 +250,14 @@ int NgSendData(int ds, const char *hook, const u_char * buf, size_t len) { - u_char sgbuf[NG_HOOKLEN + sizeof(struct sockaddr_ng)]; + u_char sgbuf[NG_HOOKSIZ + NGSA_OVERHEAD]; struct sockaddr_ng *const sg = (struct sockaddr_ng *) sgbuf; int errnosv; /* Set up destination hook */ sg->sg_family = AF_NETGRAPH; - snprintf(sg->sg_data, NG_HOOKLEN + 1, "%s", hook); - sg->sg_len = strlen(sg->sg_data) + 3; + strlcpy(sg->sg_data, hook, NG_HOOKSIZ); + sg->sg_len = strlen(sg->sg_data) + 1 + NGSA_OVERHEAD; /* Debugging */ if (_gNgDebugLevel >= 2) { ==== //depot/projects/hammer/libexec/rtld-elf/rtld.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.89 2003/09/13 21:50:36 mdodd Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.90 2003/11/14 12:56:56 tobez Exp $ */ /* @@ -800,8 +800,8 @@ * loaded shared object, whose library search path will be searched. * * The search order is: + * LD_LIBRARY_PATH * rpath in the referencing file - * LD_LIBRARY_PATH * ldconfig hints * /lib:/usr/lib */ ==== //depot/projects/hammer/release/Makefile#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.822 2003/10/31 13:15:07 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.823 2003/11/14 08:21:21 kuriyama Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -346,10 +346,9 @@ ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE} .endif .if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES) - cd ${CHROOTDIR}/usr/${RELEASESRCMODULE} .for p in ${LOCAL_PATCHES} .if exists(${p}) - patch ${PATCH_FLAGS} < ${p} + patch -d ${CHROOTDIR}/usr/${RELEASESRCMODULE} ${PATCH_FLAGS} < ${p} .endif .endfor .endif ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#36 (text+ko) ==== @@ -29,7 +29,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.197 2003/11/11 19:20:13 trhodes Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.198 2003/11/13 22:39:49 simon Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -805,59 +805,6 @@ <para arch="i386,pc98,alpha,sparc64">RealTek 8129/8139 Fast Ethernet NICs (&man.rl.4; driver) </para> - <para arch="i386,alpha,sparc64">Lite-On 82c168/82c169 PNIC Fast Ethernet NICs (&man.dc.4; driver) - <itemizedlist> - <listitem> - <para>Kingston KNE110TX</para> - </listitem> - <listitem> - <para>LinkSys EtherFast LNE100TX</para> - </listitem> - <listitem> - <para>Matrox FastNIC 10/100</para> - </listitem> - <listitem> - <para>NetGear FA310-TX Rev. D1</para> - </listitem> - </itemizedlist - </para> - - <para arch="i386,pc98,alpha,sparc64">Macronix 98713, 98713A, 98715, 98715A and 98725 Fast - Ethernet NICs (&man.dc.4; driver) - <itemizedlist> - <listitem> - <para>Accton EN1217 (98715A)</para> - </listitem> - <listitem> - <para>Adico AE310TX (98715A)</para> - </listitem> - <listitem> - <para>Compex RL100-TX (98713 or 98713A)</para> - </listitem> - <listitem> - <para>CNet Pro120A (98713 or 98713A)</para> - </listitem> - <listitem> - <para>CNet Pro120B (98715)</para> - </listitem> - <listitem> - <para>NDC Communications SFA100A (98713A)</para> - </listitem> - <listitem> - <para>SVEC PN102TX (98713)</para> - </listitem> - </itemizedlist> - </para> - - <para arch="i386,pc98,alpha,sparc64">Macronix/Lite-On PNIC II LC82C115 Fast Ethernet NICs - (&man.dc.4; driver) - <itemizedlist> - <listitem> - <para>LinkSys EtherFast LNE100TX Version 2</para> - </listitem> - </itemizedlist> - </para> - <para arch="i386,pc98,alpha">Winbond W89C840F Fast Ethernet NICs (&man.wb.4; driver) </para> @@ -885,17 +832,9 @@ <para arch="i386,pc98,alpha">Texas Instruments ThunderLAN PCI NICs (&man.tl.4; driver)</para> - <para arch="i386,pc98,alpha,sparc64">ADMtek Inc. AL981-based PCI Fast Ethernet NICs (&man.dc.4; - driver)</para> - - <para arch="i386,pc98,alpha,sparc64">ADMtek Inc. AN985-based PCI Fast Ethernet NICs (&man.dc.4; - driver) - <itemizedlist> - <listitem> - <para>LinkSys EtherFast LNE100TX v4.0/4.1</para> - </listitem> - </itemizedlist> - </para> + <para arch="i386,pc98,alpha,sparc64">DEC/Intel 21143 Fast Ethernet + NICs and clones for PCI, MiniPCI, and CardBus (&man.dc.4; + driver)</para> <para arch="i386,pc98">ADMtek Inc. AN986-based USB Ethernet NICs (&man.aue.4; driver)</para> @@ -910,17 +849,6 @@ <para arch="i386,pc98">RealTek RTL8150-based USB Ethernet NICs (&man.rue.4; driver)</para> - <para arch="i386,pc98,alpha,sparc64">ASIX Electronics AX88140A PCI NICs (&man.dc.4; driver) - <itemizedlist> - <listitem> - <para>Alfa Inc. GFC2204</para> - </listitem> - <listitem> - <para>CNet Pro110B</para> - </listitem> - </itemizedlist> - </para> - <para arch="i386">DEC EtherWORKS II and III NICs (&man.le.4; driver) </para> @@ -928,42 +856,6 @@ based NICs (&man.de.4; driver) </para> - <para arch="i386,pc98,alpha,sparc64">DEC/Intel 21143 based Fast Ethernet NICs (&man.dc.4; driver) - <itemizedlist> - <listitem> - <para>DEC DE500</para> - </listitem> - <listitem> - <para>Compaq Presario 7900 series built-in Ethernet</para> - </listitem> - <listitem> - <para>D-Link DFE-570TX</para> - </listitem> - <listitem> - <para>Kingston KNE100TX</para> - </listitem> - <listitem> - <para>LinkSys EtherFast 10/100 Instant GigaDrive built-in Ethernet</para> - </listitem> - </itemizedlist> - </para> - - <para arch="i386,pc98,alpha,sparc64">Davicom DM9009, DM9100 and DM9102 PCI Fast Ethernet NICs (&man.dc.4; driver) - <itemizedlist> - <listitem> - <para>Jaton Corporation XpressNet</para> - </listitem> - </itemizedlist> - </para> - - <para arch="i386">Xircom 3201 (Cardbus) (&man.dc.4; driver)</para> - - <para arch="i386">Conexant LANfinity RS7112 (MiniPCI) (&man.dc.4; driver)</para> - - <para arch="pc98">Cnet Pro120A (PCI) (&man.dc.4; driver)</para> - - <para arch="pc98">MELCO LGY-PCI-TXL (PCI) (&man.dc.4; driver)</para> - <para arch="i386,pc98">Fujitsu MB86960A/MB86965A based Fast Ethernet NICs (&man.fe.4; driver)</para> @@ -1028,28 +920,6 @@ <para arch="i386">Megahertz X-Jack Ethernet PC-Card CC-10BT (&man.sn.4; driver)</para> - <para arch="i386">Xircom X3201 (Cardbus) based Ethernet cards - (&man.dc.4; driver) - <itemizedlist> - <listitem> - <para>IBM EtherJet Cardbus Adapter</para> - </listitem> - <listitem> - <para>Intel PRO/100 Mobile Cardbus (versions that use the - X3201 chipset)</para> - </listitem> - <listitem> - <para>Xircom Cardbus Realport</para> - </listitem> - <listitem> - <para>Xircom Cardbus Ethernet 10/100</para> - </listitem> - <listitem> - <para>Xircom Cardbus Ethernet II 10/100</para> - </listitem> - </itemizedlist> - </para> - <para arch="i386">Xircom CreditCard adapters (16 bit) and workalikes (&man.xe.4; driver) </para> ==== //depot/projects/hammer/sbin/dump/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/dump/Makefile,v 1.23 2003/05/01 21:18:35 ru Exp $ +# $FreeBSD: src/sbin/dump/Makefile,v 1.24 2003/11/14 13:07:38 johan Exp $ # dump.h header file # itime.c reads /etc/dumpdates @@ -16,7 +16,6 @@ PROG= dump LINKS= ${BINDIR}/dump ${BINDIR}/rdump CFLAGS+=-DRDUMP -WARNS= 0 SRCS= itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c cache.c MAN= dump.8 MLINKS= dump.8 rdump.8 ==== //depot/projects/hammer/sbin/dump/dumprmt.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)dumprmt.c 8.3 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/dumprmt.c,v 1.19 2003/05/01 20:09:58 markm Exp $"; + "$FreeBSD: src/sbin/dump/dumprmt.c,v 1.20 2003/11/14 13:07:38 johan Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -159,7 +159,7 @@ tuser = pwd->pw_name; if ((rmt = getenv("RMT")) == NULL) rmt = _PATH_RMT; - msg(""); + msg("%s", ""); rmtape = rcmd(&rmtpeer, (u_short)sp->s_port, pwd->pw_name, tuser, rmt, &errfd); if (rmtape < 0) { ==== //depot/projects/hammer/sbin/dump/main.c#9 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/main.c,v 1.53 2003/05/07 18:27:09 mckusick Exp $"; + "$FreeBSD: src/sbin/dump/main.c,v 1.54 2003/11/14 13:07:38 johan Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -62,9 +62,9 @@ #include <errno.h> #include <fcntl.h> #include <fstab.h> -#include <inttypes.h> #include <limits.h> #include <signal.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -545,8 +545,9 @@ if (tend_writing - tstart_writing == 0) msg("finished in less than a second\n"); else - msg("finished in %d seconds, throughput %jd KBytes/sec\n", - tend_writing - tstart_writing, (intmax_t)(spcl.c_tapea / + msg("finished in %jd seconds, throughput %jd KBytes/sec\n", + (intmax_t)tend_writing - tstart_writing, + (intmax_t)(spcl.c_tapea / (tend_writing - tstart_writing))); putdumptime(); ==== //depot/projects/hammer/sbin/dumpfs/Makefile#3 (text+ko) ==== @@ -1,10 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/dumpfs/Makefile,v 1.8 2003/01/26 12:34:36 ru Exp $ +# $FreeBSD: src/sbin/dumpfs/Makefile,v 1.9 2003/11/14 13:13:23 johan Exp $ PROG= dumpfs DPADD= ${LIBUFS} LDADD= -lufs -WARNS= 0 MAN= dumpfs.8 .include <bsd.prog.mk> ==== //depot/projects/hammer/sbin/dumpfs/dumpfs.c#8 (text+ko) ==== @@ -51,7 +51,7 @@ static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.37 2003/06/09 09:26:02 jmallett Exp $"; + "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.38 2003/11/14 13:13:23 johan Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -136,10 +136,10 @@ fstime = afs.fs_time; printf("magic\t%x (UFS2)\ttime\t%s", afs.fs_magic, ctime(&fstime)); - printf("superblock location\t%qd\tid\t[ %x %x ]\n", - afs.fs_sblockloc, afs.fs_id[0], afs.fs_id[1]); - printf("ncg\t%d\tsize\t%qd\tblocks\t%jd\n", - afs.fs_ncg, fssize, (intmax_t)afs.fs_dsize); + printf("superblock location\t%jd\tid\t[ %x %x ]\n", + (intmax_t)afs.fs_sblockloc, afs.fs_id[0], afs.fs_id[1]); + printf("ncg\t%d\tsize\t%jd\tblocks\t%jd\n", + afs.fs_ncg, (intmax_t)fssize, (intmax_t)afs.fs_dsize); break; case 1: fssize = afs.fs_old_size; @@ -147,8 +147,8 @@ printf("magic\t%x (UFS1)\ttime\t%s", afs.fs_magic, ctime(&fstime)); printf("id\t[ %x %x ]\n", afs.fs_id[0], afs.fs_id[1]); - printf("ncg\t%d\tsize\t%qd\tblocks\t%jd\n", - afs.fs_ncg, fssize, (intmax_t)afs.fs_dsize); + printf("ncg\t%d\tsize\t%jd\tblocks\t%jd\n", + afs.fs_ncg, (intmax_t)fssize, (intmax_t)afs.fs_dsize); break; default: goto err; @@ -167,13 +167,16 @@ printf("%s %d\tmaxbpg\t%d\tmaxcontig %d\tcontigsumsize %d\n", "maxbsize", afs.fs_maxbsize, afs.fs_maxbpg, afs.fs_maxcontig, afs.fs_contigsumsize); - printf("nbfree\t%qd\tndir\t%qd\tnifree\t%qd\tnffree\t%qd\n", - afs.fs_cstotal.cs_nbfree, afs.fs_cstotal.cs_ndir, - afs.fs_cstotal.cs_nifree, afs.fs_cstotal.cs_nffree); + printf("nbfree\t%jd\tndir\t%jd\tnifree\t%jd\tnffree\t%jd\n", + (intmax_t)afs.fs_cstotal.cs_nbfree, + (intmax_t)afs.fs_cstotal.cs_ndir, + (intmax_t)afs.fs_cstotal.cs_nifree, + (intmax_t)afs.fs_cstotal.cs_nffree); printf("bpg\t%d\tfpg\t%d\tipg\t%d\n", afs.fs_fpg / afs.fs_frag, afs.fs_fpg, afs.fs_ipg); - printf("nindir\t%d\tinopb\t%d\tmaxfilesize\t%qu\n", - afs.fs_nindir, afs.fs_inopb, afs.fs_maxfilesize); + printf("nindir\t%d\tinopb\t%d\tmaxfilesize\t%ju\n", + afs.fs_nindir, afs.fs_inopb, + (uintmax_t)afs.fs_maxfilesize); printf("sbsize\t%d\tcgsize\t%d\tcsaddr\t%jd\tcssize\t%d\n", afs.fs_sbsize, afs.fs_cgsize, (intmax_t)afs.fs_csaddr, afs.fs_cssize); @@ -187,9 +190,9 @@ printf("cpg\t%d\tbpg\t%d\tfpg\t%d\tipg\t%d\n", afs.fs_old_cpg, afs.fs_fpg / afs.fs_frag, afs.fs_fpg, afs.fs_ipg); - printf("nindir\t%d\tinopb\t%d\tnspf\t%d\tmaxfilesize\t%qu\n", + printf("nindir\t%d\tinopb\t%d\tnspf\t%d\tmaxfilesize\t%ju\n", afs.fs_nindir, afs.fs_inopb, afs.fs_old_nspf, - afs.fs_maxfilesize); + (uintmax_t)afs.fs_maxfilesize); printf("sbsize\t%d\tcgsize\t%d\tcgoffset %d\tcgmask\t0x%08x\n", afs.fs_sbsize, afs.fs_cgsize, afs.fs_old_cgoffset, afs.fs_old_cgmask); @@ -235,8 +238,8 @@ printf("unknown flags (%#x)", fsflags); putchar('\n'); printf("fsmnt\t%s\n", afs.fs_fsmnt); - printf("volname\t%s\tswuid\t%qu\n", - afs.fs_volname, afs.fs_swuid); + printf("volname\t%s\tswuid\t%ju\n", + afs.fs_volname, (uintmax_t)afs.fs_swuid); printf("\ncs[].cs_(nbfree,ndir,nifree,nffree):\n\t"); afs.fs_csp = calloc(1, afs.fs_cssize); if (bread(&disk, fsbtodb(&afs, afs.fs_csaddr), afs.fs_csp, afs.fs_cssize) == -1) @@ -279,15 +282,15 @@ switch (disk.d_ufs) { case 2: cgtime = acg.cg_time; - printf("magic\t%x\ttell\t%qx\ttime\t%s", - acg.cg_magic, cur, ctime(&cgtime)); + printf("magic\t%x\ttell\t%jx\ttime\t%s", + acg.cg_magic, (intmax_t)cur, ctime(&cgtime)); printf("cgx\t%d\tndblk\t%d\tniblk\t%d\tinitiblk %d\n", acg.cg_cgx, acg.cg_ndblk, acg.cg_niblk, acg.cg_initediblk); break; case 1: cgtime = acg.cg_old_time; - printf("magic\t%x\ttell\t%qx\ttime\t%s", - acg.cg_magic, cur, ctime(&cgtime)); + printf("magic\t%x\ttell\t%jx\ttime\t%s", + acg.cg_magic, (intmax_t)cur, ctime(&cgtime)); printf("cgx\t%d\tncyl\t%d\tniblk\t%d\tndblk\t%d\n", acg.cg_cgx, acg.cg_old_ncyl, acg.cg_old_niblk, acg.cg_ndblk); ==== //depot/projects/hammer/sbin/fdisk/fdisk.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.71 2003/05/03 18:41:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.72 2003/11/13 21:13:43 des Exp $"); #include <sys/disk.h> #include <sys/disklabel.h> @@ -1300,6 +1300,11 @@ if (start % dos_sectors == 0 && (start + size) % dos_sectors == 0) return (1); + if (start == 0) { + warnx("WARNING: partition overlaps with partition table"); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311141650.hAEGoH7v049557>