PERFORCE change 107993 for review
Paolo Pisati
piso at FreeBSD.org
Mon Oct 16 12:35:15 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=107993
Change 107993 by piso at piso_newluxor on 2006/10/16 19:32:39
IFC at 107992
Affected files ...
.. //depot/projects/soc2005/libalias/bin/cp/cp.c#6 integrate
.. //depot/projects/soc2005/libalias/bin/ls/ls.1#3 integrate
.. //depot/projects/soc2005/libalias/contrib/ncurses/man/MKterminfo.sh#2 integrate
.. //depot/projects/soc2005/libalias/contrib/traceroute/traceroute.8#2 integrate
.. //depot/projects/soc2005/libalias/contrib/traceroute/traceroute.c#2 integrate
.. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#9 integrate
.. //depot/projects/soc2005/libalias/etc/disktab#2 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#6 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/auto_linklocal#2 integrate
.. //depot/projects/soc2005/libalias/etc/rc.d/idmapd#1 branch
.. //depot/projects/soc2005/libalias/gnu/lib/libgcc/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate
.. //depot/projects/soc2005/libalias/gnu/usr.bin/grep/grep.1#3 integrate
.. //depot/projects/soc2005/libalias/gnu/usr.bin/send-pr/send-pr.1#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/gen/basename.3#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/gen/dirname.3#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/gen/msgsnd.3#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/i386/sys/i386_get_ldt.2#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/locale/wctype.3#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/sparc64/fpu/fpu_emu.h#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/stdio/freopen.c#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/stdlib/getenv.3#3 integrate
.. //depot/projects/soc2005/libalias/lib/libc/string/ffs.3#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/sys/Makefile.inc#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/sys/intro.2#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/sys/read.2#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc/sys/stat.2#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_init.c#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_select.c#2 integrate
.. //depot/projects/soc2005/libalias/lib/libc_r/uthread/uthread_sig.c#2 integrate
.. //depot/projects/soc2005/libalias/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_fork.c#3 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_private.h#7 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_umtx.c#4 integrate
.. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_umtx.h#4 integrate
.. //depot/projects/soc2005/libalias/lib/msun/i387/fenv.h#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 integrate
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/alpha/Makefile#2 delete
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#2 delete
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#2 delete
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#2 delete
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#1 branch
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#1 branch
.. //depot/projects/soc2005/libalias/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/sbin/Makefile#3 integrate
.. //depot/projects/soc2005/libalias/sbin/bsdlabel/bsdlabel.8#3 integrate
.. //depot/projects/soc2005/libalias/sbin/dump/main.c#3 integrate
.. //depot/projects/soc2005/libalias/sbin/idmapd/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/sbin/idmapd/idmapd.8#2 integrate
.. //depot/projects/soc2005/libalias/sbin/kldload/kldload.8#2 integrate
.. //depot/projects/soc2005/libalias/sbin/restore/restore.8#2 integrate
.. //depot/projects/soc2005/libalias/sbin/sysctl/sysctl.c#6 integrate
.. //depot/projects/soc2005/libalias/share/man/man1/builtin.1#2 integrate
.. //depot/projects/soc2005/libalias/share/man/man4/ddb.4#6 integrate
.. //depot/projects/soc2005/libalias/share/man/man4/if_bridge.4#5 integrate
.. //depot/projects/soc2005/libalias/share/man/man4/man4.i386/ndis.4#2 integrate
.. //depot/projects/soc2005/libalias/share/man/man4/pcm.4#3 integrate
.. //depot/projects/soc2005/libalias/share/man/man4/sis.4#2 integrate
.. //depot/projects/soc2005/libalias/share/man/man5/disktab.5#2 integrate
.. //depot/projects/soc2005/libalias/share/man/man5/hosts.equiv.5#2 integrate
.. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#7 integrate
.. //depot/projects/soc2005/libalias/share/man/man9/ktr.9#3 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/africa#2 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/asia#2 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/australasia#2 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/backward#2 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/europe#2 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/northamerica#2 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/southamerica#2 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/yearistype.sh#2 integrate
.. //depot/projects/soc2005/libalias/share/zoneinfo/zone.tab#2 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/amd64/intr_machdep.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_machdep.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_proto.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_syscall.h#6 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysent.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/amd64/linux32/syscalls.master#6 integrate
.. //depot/projects/soc2005/libalias/sys/boot/common/help.common#3 integrate
.. //depot/projects/soc2005/libalias/sys/boot/common/loader.8#3 integrate
.. //depot/projects/soc2005/libalias/sys/boot/forth/support.4th#2 integrate
.. //depot/projects/soc2005/libalias/sys/compat/linux/linux_aio.c#1 branch
.. //depot/projects/soc2005/libalias/sys/compat/linux/linux_aio.h#1 branch
.. //depot/projects/soc2005/libalias/sys/compat/linux/linux_signal.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/compat/linux/linux_signal.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/conf/NOTES#10 integrate
.. //depot/projects/soc2005/libalias/sys/conf/files.amd64#7 integrate
.. //depot/projects/soc2005/libalias/sys/conf/files.i386#6 integrate
.. //depot/projects/soc2005/libalias/sys/conf/files.pc98#4 integrate
.. //depot/projects/soc2005/libalias/sys/conf/kern.post.mk#3 integrate
.. //depot/projects/soc2005/libalias/sys/conf/kern.pre.mk#4 integrate
.. //depot/projects/soc2005/libalias/sys/conf/kmod.mk#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/bce/if_bce.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi_debug.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/mfi/mfi_disk.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/mfi/mfireg.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/mfi/mfivar.h#3 integrate
.. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfe.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/midi/sequencer.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/dev/sound/pci/hda/hdac.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/i386/linux/linux.h#4 integrate
.. //depot/projects/soc2005/libalias/sys/i386/linux/linux_machdep.c#6 integrate
.. //depot/projects/soc2005/libalias/sys/i386/linux/linux_proto.h#7 integrate
.. //depot/projects/soc2005/libalias/sys/i386/linux/linux_syscall.h#7 integrate
.. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysent.c#7 integrate
.. //depot/projects/soc2005/libalias/sys/i386/linux/syscalls.master#7 integrate
.. //depot/projects/soc2005/libalias/sys/ia64/ia64/busdma_machdep.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/kern/sys_generic.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/kern/sys_process.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/kern/vfs_aio.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/modules/aio/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/sys/modules/linux/Makefile#3 integrate
.. //depot/projects/soc2005/libalias/sys/netgraph/ng_nat.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/netinet6/in6_ifattach.c#4 integrate
.. //depot/projects/soc2005/libalias/sys/netinet6/in6_proto.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_vnops.c#5 integrate
.. //depot/projects/soc2005/libalias/sys/pci/agp.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/sun4v/conf/NOTES#3 integrate
.. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/genassym.c#2 delete
.. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/hvcons.c#2 integrate
.. //depot/projects/soc2005/libalias/sys/sys/rwlock.h#2 integrate
.. //depot/projects/soc2005/libalias/sys/vm/vnode_pager.c#4 integrate
.. //depot/projects/soc2005/libalias/tools/tools/tinybsd/tinybsd#3 integrate
.. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.holiday#3 integrate
.. //depot/projects/soc2005/libalias/usr.bin/expand/expand.1#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/systat/systat.1#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/tput/tput.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/tr/tr.1#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/unexpand/unexpand.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/arp/arp.c#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/syslogd/syslog.conf.5#3 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/wicontrol/wicontrol.8#2 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/wicontrol/wicontrol.c#2 integrate
Differences ...
==== //depot/projects/soc2005/libalias/bin/cp/cp.c#6 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.56 2006/10/07 22:14:43 trhodes Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.57 2006/10/11 10:26:34 trhodes Exp $");
/*
* Cp copies source files to target files.
@@ -155,12 +155,9 @@
usage();
fts_options = FTS_NOCHDIR | FTS_PHYSICAL;
- if (rflag) {
- if (Rflag)
- errx(1,
- "the -R and -r options may not be specified together.");
- }
- if (rflag && !Hflag && !Pflag)
+ if (Rflag && rflag)
+ errx(1, "the -R and -r options may not be specified together");
+ if (rflag)
Rflag = 1;
if (Rflag) {
if (Hflag)
@@ -230,7 +227,7 @@
else
lstat(*argv, &tmp_stat);
- if (S_ISDIR(tmp_stat.st_mode) && (Rflag))
+ if (S_ISDIR(tmp_stat.st_mode) && Rflag)
type = DIR_TO_DNE;
else
type = FILE_TO_FILE;
==== //depot/projects/soc2005/libalias/bin/ls/ls.1#3 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
-.\" $FreeBSD: src/bin/ls/ls.1,v 1.99 2006/09/17 17:40:06 ru Exp $
+.\" $FreeBSD: src/bin/ls/ls.1,v 1.100 2006/10/12 10:08:52 ru Exp $
.\"
-.Dd March 24, 2006
+.Dd October 12, 2006
.Dt LS 1
.Os
.Sh NAME
@@ -68,7 +68,10 @@
The following options are available:
.Bl -tag -width indent
.It Fl A
-List all entries except for
+Include directory entries whose names begin with a
+dot
+.Pq Sq Pa \&.
+except for
.Pa \&.
and
.Pa .. .
@@ -159,7 +162,7 @@
.It Fl a
Include directory entries whose names begin with a
dot
-.Pq Pa \&. .
+.Pq Sq Pa \&. .
.It Fl b
As
.Fl B ,
@@ -364,6 +367,8 @@
follows:
.Pp
.Bl -tag -width 4n -offset indent -compact
+.It Sy \-
+Regular file.
.It Sy b
Block special file.
.It Sy c
@@ -372,12 +377,12 @@
Directory.
.It Sy l
Symbolic link.
-.It Sy s
-Socket link.
.It Sy p
.Tn FIFO .
-.It Sy \-
-Regular file.
+.It Sy s
+Socket.
+.It Sy w
+Whiteout.
.El
.Pp
The next three fields
==== //depot/projects/soc2005/libalias/contrib/ncurses/man/MKterminfo.sh#2 (text+ko) ====
@@ -1,6 +1,10 @@
#!/bin/sh
+# $Id: MKterminfo.sh,v 1.12 2003/01/11 21:42:12 tom Exp $
+#
+# MKterminfo.sh -- generate terminfo.5 from Caps tabular data
+#
#***************************************************************************
-# Copyright (c) 1998,2000,2001 Free Software Foundation, Inc. *
+# Copyright (c) 1998,2002,2003 Free Software Foundation, Inc. *
# *
# Permission is hereby granted, free of charge, to any person obtaining a *
# copy of this software and associated documentation files (the *
@@ -27,10 +31,6 @@
# authorization. *
#***************************************************************************
#
-# $Id: MKterminfo.sh,v 1.9 2001/09/01 23:06:18 tom Exp $
-#
-# MKterminfo.sh -- generate terminfo.5 from Caps tabular data
-#
# This script takes terminfo.head and terminfo.tail and splices in between
# them a table derived from the Caps data file. Besides avoiding having
# the docs fall out of sync with the table, this also lets us set up tbl
@@ -41,10 +41,13 @@
# had better be no s in the table source text.
#
# keep the order independent of locale:
-LANGUAGE=C
-LC_ALL=C
-export LANGUAGE
-export LC_ALL
+if test "${LANGUAGE+set}" = set; then LANGUAGE=C; export LANGUAGE; fi
+if test "${LANG+set}" = set; then LANG=C; export LANG; fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
+if test "${LC_COLLATE+set}" = set; then LC_COLLATE=C; export LC_COLLATE; fi
+
#
head=$1
caps=$2
@@ -66,11 +69,11 @@
sed -n <$caps "\
/%%-STOP-HERE-%%/q
-/^#%/s///p
+/^#%/s/#%//p
/^#/d
-s/[ ]\+/ /g
+s/[ ][ ]*/ /g
s/$/T}/
-s/ [A-Z0-9_()\-]\+ [0-9\-]\+ [Y\-][B\-][C\-][G\-][EK\-]\** / T{/
+s/ [A-Z0-9_()\-][A-Z0-9_()\-]* [0-9\-][0-9\-]* [Y\-][B\-][C\-][G\-][EK\-]\** / T{/
s/ bool / /p
s/ num / /p
s/ str / /p
==== //depot/projects/soc2005/libalias/contrib/traceroute/traceroute.8#2 (text+ko) ====
@@ -14,7 +14,7 @@
.\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
.\"
.\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $
-.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.14 2006/06/13 14:59:07 dwmalone Exp $
+.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16 2006/10/15 17:44:49 dwmalone Exp $
.\"
.TH TRACEROUTE 8 "21 September 2000"
.UC 6
@@ -24,7 +24,7 @@
.na
.B traceroute
[
-.B \-deFISdnrvx
+.B \-dDeFISnrvx
] [
.B \-f
.I first_ttl
@@ -112,6 +112,18 @@
.B \-d
Enable socket level debugging.
.TP
+.B \-D
+When an ICMP response to our probe datagram is received,
+print the differences between the transmitted packet and
+the packet quoted by the ICMP response.
+A key showing the location of fields within the transmitted packet is printed,
+followed by the original packet in hex,
+followed by the quoted packet in hex.
+Bytes that are unchanged in the quoted packet are shown as underscores.
+Note,
+the IP checksum and the TTL of the quoted packet are not expected to match.
+By default, only one probe per hop is sent with this option.
+.TP
.B \-g
Specify a loose source route gateway (8 maximum).
.TP
@@ -163,7 +175,11 @@
to pick an unused port range.
.TP
.B \-q
-Set the number of probes per hop (default is 3).
+Set the number of probes per hop (default is 3,
+unless
+.B -D
+is specified,
+when it is 1).
.TP
.B \-r
Bypass the normal routing tables and send directly to a host on an attached
==== //depot/projects/soc2005/libalias/contrib/traceroute/traceroute.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
"@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)";
#endif
static const char rcsid[] =
- "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.30 2006/06/13 14:59:07 dwmalone Exp $";
+ "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.32 2006/10/15 17:44:49 dwmalone Exp $";
#endif
/*
@@ -316,6 +316,9 @@
struct ip *outip; /* last output ip packet */
u_char *outp; /* last output inner protocol packet */
+struct ip *hip = NULL; /* Quoted IP header */
+int hiplen = 0;
+
/* loose source route gateway list (including room for final destination) */
u_int32_t gwlist[NGATEWAYS + 1];
@@ -337,7 +340,7 @@
char *device;
static const char devnull[] = "/dev/null";
-int nprobes = 3;
+int nprobes = -1;
int max_ttl;
int first_ttl = 1;
u_short ident;
@@ -354,6 +357,7 @@
#endif
int optlen; /* length of ip options */
int fixedPort = 0; /* Use fixed destination port for TCP and UDP */
+int printdiff = 0; /* Print the difference between sent and quoted */
extern int optind;
extern int opterr;
@@ -380,6 +384,7 @@
void tvsub(struct timeval *, struct timeval *);
void usage(void);
int wait_for_reply(int, struct sockaddr_in *, const struct timeval *);
+void pkt_compare(const u_char *, int, const u_char *, int);
#ifndef HAVE_USLEEP
int usleep(u_int);
#endif
@@ -398,6 +403,7 @@
/* Descriptor structure for each outgoing protocol we support */
struct outproto {
char *name; /* name of protocol */
+ const char *key; /* An ascii key for the bytes of the header */
u_char num; /* IP protocol number */
u_short hdrlen; /* max size of protocol header */
u_short port; /* default base protocol-specific "port" */
@@ -412,6 +418,7 @@
struct outproto protos[] = {
{
"udp",
+ "spt dpt len sum",
IPPROTO_UDP,
sizeof(struct udphdr),
32768 + 666,
@@ -420,6 +427,7 @@
},
{
"tcp",
+ "spt dpt seq ack xxflwin sum urp",
IPPROTO_TCP,
sizeof(struct tcphdr),
32768 + 666,
@@ -428,6 +436,7 @@
},
{
"gre",
+ "flg pro len clid",
IPPROTO_GRE,
sizeof(struct grehdr),
GRE_PPTP_PROTO,
@@ -436,6 +445,7 @@
},
{
"icmp",
+ "typ cod sum ",
IPPROTO_ICMP,
sizeof(struct icmp),
0,
@@ -444,6 +454,7 @@
},
{
NULL,
+ NULL,
0,
2 * sizeof(u_short),
0,
@@ -453,6 +464,8 @@
};
struct outproto *proto = &protos[0];
+const char *ip_hdr_key = "vhtslen id off tlprsum srcip dstip opts";
+
int
main(int argc, char **argv)
{
@@ -522,13 +535,17 @@
prog = argv[0];
opterr = 0;
- while ((op = getopt(argc, argv, "edFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF)
+ while ((op = getopt(argc, argv, "edDFInrSvxf:g:i:M:m:P:p:q:s:t:w:z:")) != EOF)
switch (op) {
case 'd':
options |= SO_DEBUG;
break;
+ case 'D':
+ printdiff = 1;
+ break;
+
case 'e':
fixedPort = 1;
break;
@@ -628,6 +645,9 @@
/* Set requested port, if any, else default for this protocol */
port = (requestPort != -1) ? requestPort : proto->port;
+ if (nprobes == -1)
+ nprobes = printdiff ? 1 : 3;
+
if (first_ttl > max_ttl) {
Fprintf(stderr,
"%s: first ttl (%d) may not be greater than max ttl (%d)\n",
@@ -968,6 +988,16 @@
#endif
precis = 3;
Printf(" %.*f ms", precis, T);
+ if (printdiff) {
+ Printf("\n");
+ Printf("%*.*s%s\n",
+ -(outip->ip_hl << 3),
+ outip->ip_hl << 3,
+ ip_hdr_key,
+ proto->key);
+ pkt_compare((void *)outip, packlen,
+ (void *)hip, hiplen);
+ }
if (i == -2) {
#ifndef ARCHAIC
ip = (struct ip *)packet;
@@ -1275,10 +1305,10 @@
return -2;
if ((type == ICMP_TIMXCEED && code == ICMP_TIMXCEED_INTRANS) ||
type == ICMP_UNREACH) {
- struct ip *hip;
u_char *inner;
hip = &icp->icmp_ip;
+ hiplen = ((u_char *)icp + cc) - (u_char *)hip;
hlen = hip->ip_hl << 2;
inner = (u_char *)((u_char *)hip + hlen);
if (hlen + 12 <= cc
@@ -1708,13 +1738,33 @@
}
void
+pkt_compare(const u_char *a, int la, const u_char *b, int lb) {
+ int l;
+ int i;
+
+ for (i = 0; i < la; i++)
+ Printf("%02x", (unsigned int)a[i]);
+ Printf("\n");
+ l = (la <= lb) ? la : lb;
+ for (i = 0; i < l; i++)
+ if (a[i] == b[i])
+ Printf("__");
+ else
+ Printf("%02x", (unsigned int)b[i]);
+ for (; i < lb; i++)
+ Printf("%02x", (unsigned int)b[i]);
+ Printf("\n");
+}
+
+
+void
usage(void)
{
extern char version[];
Fprintf(stderr, "Version %s\n", version);
Fprintf(stderr,
- "Usage: %s [-dFInrSvx] [-g gateway] [-i iface] [-f first_ttl]\n"
+ "Usage: %s [-dDeFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n"
"\t[-m max_ttl] [-p port] [-P proto] [-q nqueries] [-s src_addr]\n"
"\t[-t tos] [-w waittime] [-z pausemsecs] host [packetlen]\n", prog);
exit(1);
==== //depot/projects/soc2005/libalias/etc/defaults/rc.conf#9 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.298 2006/10/06 23:22:12 flz Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.300 2006/10/15 15:55:00 ceri Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -242,6 +242,8 @@
nfs_access_cache="60" # Client cache timeout in seconds
nfs_server_enable="NO" # This host is an NFS server (or NO).
nfs_server_flags="-u -t -n 4" # Flags to nfsd (if enabled).
+idmapd_enable="NO" # Run the NFS4 id mapper (YES/NO).
+idmapd_flags="" # Additional flags for idmapd.
mountd_enable="NO" # Run mountd (or NO).
mountd_flags="-r" # Flags to mountd (if NFS server enabled).
weak_mountd_authentication="NO" # Allow non-root mount requests to be served.
==== //depot/projects/soc2005/libalias/etc/disktab#2 (text+ko) ====
@@ -1,33 +1,7 @@
-# $FreeBSD: src/etc/disktab,v 1.25 2004/06/06 11:46:27 schweikh Exp $
+# $FreeBSD: src/etc/disktab,v 1.26 2006/10/14 16:39:03 ru Exp $
#
# Disk geometry and partition layout tables.
-# Key:
-# dt controller type
-# ty type of disk (fixed, removeable, simulated)
-# d[0-4] drive-type-dependent parameters
-# ns #sectors/track
-# nt #tracks/cylinder
-# nc #cylinders/disk
-# sc #sectors/cylinder, ns*nt default
-# su #sectors/unit, sc*nc default
-# se sector size, DEV_BSIZE default
-# rm rpm, 3600 default
-# sf supports bad144-style bad sector forwarding
-# sk sector skew per track, default 0
-# cs sector skew per cylinder, default 0
-# hs headswitch time, default 0
-# ts one-cylinder seek time, default 0
-# il sector interleave (n:1), 1 default
-# bs boot block size, default BBSIZE
-# sb superblock size, default SBSIZE
-# o[a-h] partition offsets in sectors
-# p[a-h] partition sizes in sectors
-# b[a-h] partition block sizes in bytes
-# f[a-h] partition fragment sizes in bytes
-# t[a-h] partition types (filesystem, swap, etc)
-#
-# All partition sizes reserve space for bad sector tables.
-# (5 cylinders needed for maintenance + replacement sectors)
+# See disktab(5) for format of this file.
#
#
==== //depot/projects/soc2005/libalias/etc/rc.d/Makefile#6 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.77 2006/10/07 15:45:56 ume Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.78 2006/10/15 14:19:06 ceri Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@
gbde geli geli2 \
hcsecd \
hostapd hostname \
- inetd initrandom \
+ idmapd inetd initrandom \
ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \
ipnat ipsec ipxrouted isdnd \
jail \
==== //depot/projects/soc2005/libalias/etc/rc.d/auto_linklocal#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.1 2006/10/07 15:45:56 ume Exp $
+# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.2 2006/10/13 12:41:35 ume Exp $
#
# PROVIDE: auto_linklocal
@@ -10,9 +10,15 @@
. /etc/rc.subr
name="auto_linklocal"
-rcvar=`set_rcvar ipv6`
-start_cmd="${SYSCTL_W} net.inet6.ip6.auto_linklocal=1"
+start_cmd="auto_linklocal_start"
stop_cmd=":"
+auto_linklocal_start()
+{
+ if ! checkyesno ipv6_enable; then
+ ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0
+ fi
+}
+
load_rc_config $name
run_rc_command "$1"
==== //depot/projects/soc2005/libalias/gnu/lib/libgcc/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.55 2006/03/18 21:37:03 ru Exp $
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.56 2006/10/12 16:43:15 cognet Exp $
.include <bsd.own.mk>
.include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
@@ -98,7 +98,7 @@
# from config/arm/t-strongarm-elf
CFLAGS+= -Dinhibit_libc -fno-inline
LIB1ASMSRC = lib1funcs.asm
-LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func
+LIB1ASMFUNCS = _dvmd_tls _bb_init_func
OBJS+= dp-bit.o fp-bit.o
# We want fine grained libraries, so use the new code to build the
# floating point emulation libraries.
==== //depot/projects/soc2005/libalias/gnu/usr.bin/gdb/kgdb/kgdb.1#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.8 2005/07/28 15:59:52 keramida Exp $
+.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.9 2006/10/11 14:42:43 obrien Exp $
.Dd March 2, 2005
.Os
.Dt KGDB 1
@@ -34,6 +34,7 @@
.Op Fl a | Fl f | Fl fullname
.Op Fl q | Fl quiet
.Op Fl v
+.Op Fl w
.Op Fl d Ar crashdir
.Op Fl c Ar core | Fl n Ar dumpnr | Fl r Ar device
.Op Ar kernel Op Ar core
@@ -67,6 +68,13 @@
form is supported for compatibility as well.
.It Fl v
Increase verbosity.
+.It Fl w
+Opens kmem-based targets in read-write mode.
+(This is identical to what
+.Fl -wcore
+used to do in previous
+gdb versions for
+.Fx . )
.It Fl d Ar crashdir
Use
.Ar crashdir
==== //depot/projects/soc2005/libalias/gnu/usr.bin/grep/grep.1#3 (text+ko) ====
@@ -1,5 +1,5 @@
.\" grep man page
-.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.29 2006/10/10 01:57:25 trhodes Exp $
+.\" $FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.30 2006/10/11 09:52:32 trhodes Exp $
.if !\n(.g \{\
. if !\w|\*(lq| \{\
. ds lq ``
@@ -202,6 +202,12 @@
as a list of fixed strings, separated by newlines,
any of which is to be matched.
.TP
+.BR \-P ", " \-\^\-perl-regexp
+Interpret
+.I PATTERN
+as a Perl regular expression.
+This option is not supported in FreeBSD.
+.TP
.BI \-f " FILE" "\fR,\fP \-\^\-file=" FILE
Obtain patterns from
.IR FILE ,
==== //depot/projects/soc2005/libalias/gnu/usr.bin/send-pr/send-pr.1#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\"
.\" ---------------------------------------------------------------------------
.\"
-.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.18 2005/06/16 19:27:12 ceri Exp $
+.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.20 2006/10/15 11:50:11 ceri Exp $
.nh
-.TH SEND-PR 1 3.113 "February 1993"
+.TH SEND-PR 1 3.113 "October 2006"
.SH NAME
send-pr \- send problem report (PR) to a central support site
.SH SYNOPSIS
@@ -230,6 +230,9 @@
.B standards
Standards conformance issues.
.TP
+.B sun4v
+Problems specific to the SPARC sun4v architecture and processors.
+.TP
.B threads
Problems related to threading on FreeBSD.
.TP
@@ -295,12 +298,14 @@
instructions on submitting larger test cases and problematic source
code.
.SH FILES
-.ta \w'/tmp/pbad$$ 'u
-/tmp/p$$ copy of PR used in editing session
+.ta \w'/tmp/pbad.XXXXXXXX 'u
+/tmp/pf.XXXXXXXX copy of PR used in editing session
+.br
+/tmp/pf.XXXXXXXX copy of empty PR form, for testing purposes
.br
-/tmp/pf$$ copy of empty PR form, for testing purposes
+/tmp/pr.XXXXXXXX copy of filled PR form, created on interrupt
.br
-/tmp/pbad$$ file for rejected PRs
+/tmp/pbad.XXXXXXXX file for rejected PRs
.SH EMACS USER INTERFACE
An Emacs user interface for
.B send-pr
==== //depot/projects/soc2005/libalias/lib/libc/gen/basename.3#2 (text+ko) ====
@@ -25,9 +25,9 @@
.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $
-.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.7 2004/07/02 23:52:10 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.8 2006/10/12 14:31:17 ru Exp $
.\"
-.Dd August 17, 1997
+.Dd October 12, 2006
.Dt BASENAME 3
.Os
.Sh NAME
@@ -58,6 +58,13 @@
is a null pointer or the empty string, a pointer to the string
.Qq \&.
is returned.
+.Sh IMPLEMENTATION NOTES
+The
+.Fn basename
+function
+returns a pointer to internal storage space allocated on the first call
+that will be overwritten
+by subsequent calls.
.Sh RETURN VALUES
On successful completion,
.Fn basename
@@ -77,12 +84,6 @@
The path component to be returned was larger than
.Dv MAXPATHLEN .
.El
-.Sh WARNINGS
-The
-.Fn basename
-function
-returns a pointer to internal static storage space that will be overwritten
-by subsequent calls.
.Sh SEE ALSO
.Xr basename 1 ,
.Xr dirname 1 ,
==== //depot/projects/soc2005/libalias/lib/libc/gen/dirname.3#2 (text+ko) ====
@@ -25,9 +25,9 @@
.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: dirname.3,v 1.9 2000/04/18 03:01:25 aaron Exp $
-.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.8 2004/07/02 23:52:10 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.9 2006/10/12 14:31:17 ru Exp $
.\"
-.Dd August 17, 1997
+.Dd October 12, 2006
.Dt DIRNAME 3
.Os
.Sh NAME
@@ -58,6 +58,20 @@
returns a pointer to the string
.Qq \&. ,
signifying the current directory.
+.Sh IMPLEMENTATION NOTES
+The
+.Fn dirname
+function
+returns a pointer to internal storage space allocated on the first call
+that will be overwritten
+by subsequent calls.
+.Pp
+Other vendor implementations of
+.Fn dirname
+may modify the contents of the string passed to
+.Fn dirname ;
+this should be taken into account when writing code which calls this function
+if portability is desired.
.Sh RETURN VALUES
On successful completion,
.Fn dirname
@@ -77,19 +91,6 @@
The path component to be returned was larger than
.Dv MAXPATHLEN .
.El
-.Sh WARNINGS
-The
-.Fn dirname
-function
-returns a pointer to internal static storage space that will be overwritten
-by subsequent calls (each function has its own separate storage).
-.Pp
-Other vendor implementations of
-.Fn dirname
-may modify the contents of the string passed to
-.Fn dirname ;
-this should be taken into account when writing code which calls this function
-if portability is desired.
.Sh SEE ALSO
.Xr basename 1 ,
.Xr dirname 1 ,
==== //depot/projects/soc2005/libalias/lib/libc/gen/msgsnd.3#2 (text+ko) ====
@@ -29,9 +29,9 @@
.\" (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/lib/libc/gen/msgsnd.3,v 1.20 2005/01/20 09:17:02 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/msgsnd.3,v 1.21 2006/10/12 11:42:41 ru Exp $
.\"
-.Dd November 24, 1997
+.Dd October 12, 2006
.Dt MSGSND 3
.Os
.Sh NAME
@@ -65,8 +65,13 @@
is an integer greater than 0 that can be used for selecting messages (see
.Xr msgrcv 3 ) ,
.Va mtext
-is an array of bytes, with a size up to that of the system limit
-.Pf ( Dv MSGMAX ) .
+is an array of
+.Fa msgsz
+bytes.
+The argument
+.Fa msgsz
+can range from 0 to a system-imposed maximum,
+.Dv MSGMAX .
.Pp
If the number of bytes already on the message queue plus
.Fa msgsz
@@ -144,7 +149,7 @@
The
.Fa msgsz
argument
-is less than 0, or greater than
+is greater than
.Va msg_qbytes .
.Pp
The
==== //depot/projects/soc2005/libalias/lib/libc/i386/sys/i386_get_ldt.2#2 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)fork.2 6.5 (Berkeley) 3/10/91
-.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.21 2004/07/02 19:07:30 ru Exp $
+.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.23 2006/10/13 20:34:44 ru Exp $
.\"
-.Dd September 20, 1993
+.Dd October 14, 2006
.Dt I386_GET_LDT 2
.Os
.Sh NAME
@@ -52,24 +52,24 @@
The
.Fn i386_get_ldt
system call
-will return the list of i386 descriptors that the process has in its
+returns a list of the i386 descriptors in the current process'
LDT.
The
.Fn i386_set_ldt
system call
-will set a list of i386 descriptors for the current process in its
+sets a list of i386 descriptors in the current process'
LDT.
-Both routines accept a starting selector number
-.Fa start_sel ,
-an array of memory that
-will contain the descriptors to be set or returned
-.Fa descs ,
-and the number of entries to set or return
-.Fa num_sels .
+For both routines,
+.Fa start_sel
+specifies the index of the selector in the LDT at which to begin and
+.Fa descs
+points to an array of
+.Fa num_sels
+descriptors to be set or returned.
.Pp
-The argument
+Each entry in the
.Fa descs
-can be either segment_descriptor or gate_descriptor and are defined in
+array can be either a segment_descriptor or gate_descriptor and are defined in
.In i386/segments.h .
These structures are defined by the architecture
as disjoint bit-fields, so care must be taken in constructing them.
@@ -113,9 +113,9 @@
The
.Fn i386_set_ldt
system call
-returns the first selector set.
-In the case when a descriptor is allocated by the kernel, its number will
-be returned.
+returns the first selector set on success.
+If the kernel allocated a descriptor in the LDT,
+the allocated index is returned.
Otherwise, a value of -1 is returned and the global
variable
.Va errno
==== //depot/projects/soc2005/libalias/lib/libc/locale/wctype.3#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/locale/wctype.3,v 1.6 2005/07/21 10:32:17 tjr Exp $
+.\" $FreeBSD: src/lib/libc/locale/wctype.3,v 1.7 2006/10/13 16:11:12 ru Exp $
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list