Date: Tue, 4 May 2004 19:59:39 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 52267 for review Message-ID: <200405050259.i452xd9l070292@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=52267 Change 52267 by marcel@marcel_nfs on 2004/05/04 19:59:31 IFC @52266 Affected files ... .. //depot/projects/gdb/bin/ls/util.c#4 integrate .. //depot/projects/gdb/gnu/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gzip/unzip.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#12 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.h#8 integrate .. //depot/projects/gdb/lib/libarchive/archive_platform.h#8 integrate .. //depot/projects/gdb/lib/libarchive/archive_private.h#8 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_cpio.c#8 integrate .. //depot/projects/gdb/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/gdb/sbin/Makefile#7 integrate .. //depot/projects/gdb/sbin/gconcat/Makefile#3 integrate .. //depot/projects/gdb/sbin/ggate/ggatec/Makefile#2 integrate .. //depot/projects/gdb/sbin/ggate/ggatec/ggatec.8#2 integrate .. //depot/projects/gdb/sbin/ggate/ggatec/ggatec.c#3 integrate .. //depot/projects/gdb/sbin/ggate/ggated/Makefile#2 integrate .. //depot/projects/gdb/sbin/ggate/ggated/ggated.c#3 integrate .. //depot/projects/gdb/sbin/ggate/ggatel/Makefile#2 integrate .. //depot/projects/gdb/sbin/ggate/ggatel/ggatel.8#2 integrate .. //depot/projects/gdb/sbin/route/route.c#5 integrate .. //depot/projects/gdb/sbin/sunlabel/sunlabel.c#2 integrate .. //depot/projects/gdb/share/examples/cvsup/cvs-supfile#4 integrate .. //depot/projects/gdb/share/man/man4/atapicam.4#2 integrate .. //depot/projects/gdb/share/man/man4/rl.4#2 integrate .. //depot/projects/gdb/share/man/man4/sio.4#3 integrate .. //depot/projects/gdb/share/man/man9/mbuf.9#6 integrate .. //depot/projects/gdb/share/misc/bsd-family-tree#3 integrate .. //depot/projects/gdb/sys/arm/include/_types.h#3 integrate .. //depot/projects/gdb/sys/arm/include/elf.h#2 integrate .. //depot/projects/gdb/sys/arm/include/endian.h#2 integrate .. //depot/projects/gdb/sys/arm/include/signal.h#3 integrate .. //depot/projects/gdb/sys/conf/NOTES#19 integrate .. //depot/projects/gdb/sys/conf/files#23 integrate .. //depot/projects/gdb/sys/conf/files.i386#13 integrate .. //depot/projects/gdb/sys/conf/files.pc98#8 integrate .. //depot/projects/gdb/sys/conf/options#18 integrate .. //depot/projects/gdb/sys/dev/asr/asr.c#7 integrate .. //depot/projects/gdb/sys/dev/led/led.c#5 integrate .. //depot/projects/gdb/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/dcphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/mii.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/ruephy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/gdb/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/gdb/sys/dev/pccbb/pccbb.c#8 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#9 integrate .. //depot/projects/gdb/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/gdb/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs.h#8 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#8 integrate .. //depot/projects/gdb/sys/geom/concat/g_concat.c#5 integrate .. //depot/projects/gdb/sys/geom/gate/g_gate.c#3 integrate .. //depot/projects/gdb/sys/geom/gate/g_gate.h#3 integrate .. //depot/projects/gdb/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/gdb/sys/i386/acpica/madt.c#4 integrate .. //depot/projects/gdb/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/gdb/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/gdb/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/gdb/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/gdb/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/gdb/sys/i386/include/bus_pc98.h#2 integrate .. //depot/projects/gdb/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/gdb/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/gdb/sys/i386/include/pci_cfgreg.h#3 integrate .. //depot/projects/gdb/sys/i386/isa/atpic.c#4 integrate .. //depot/projects/gdb/sys/i386/isa/elcr.c#1 branch .. //depot/projects/gdb/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/gdb/sys/i386/pci/pci_pir.c#3 integrate .. //depot/projects/gdb/sys/kern/kern_mac.c#4 integrate .. //depot/projects/gdb/sys/libkern/quad.h#4 integrate .. //depot/projects/gdb/sys/modules/geom/Makefile#3 integrate .. //depot/projects/gdb/sys/net/if.h#4 integrate .. //depot/projects/gdb/sys/net/if_var.h#11 integrate .. //depot/projects/gdb/sys/net/if_vlan.c#3 integrate .. //depot/projects/gdb/sys/net/rtsock.c#8 integrate .. //depot/projects/gdb/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/gdb/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/gdb/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/gdb/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/gdb/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/gdb/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/gdb/sys/netipsec/key.c#4 integrate .. //depot/projects/gdb/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/gdb/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/gdb/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/nexus.c#3 integrate .. //depot/projects/gdb/sys/sys/elf_common.h#2 integrate .. //depot/projects/gdb/sys/sys/imgact_aout.h#3 integrate .. //depot/projects/gdb/tools/regression/geom_gate/Makefile#1 branch .. //depot/projects/gdb/tools/regression/geom_gate/runtests.sh#1 branch .. //depot/projects/gdb/tools/regression/geom_gate/test-1.sh#1 branch .. //depot/projects/gdb/tools/regression/geom_gate/test-2.sh#1 branch .. //depot/projects/gdb/tools/regression/geom_gate/test-3.sh#1 branch .. //depot/projects/gdb/usr.bin/id/id.1#2 integrate .. //depot/projects/gdb/usr.bin/id/id.c#2 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.h#5 integrate .. //depot/projects/gdb/usr.bin/tar/fts.c#1 branch .. //depot/projects/gdb/usr.bin/tar/fts.h#1 branch .. //depot/projects/gdb/usr.bin/tar/read.c#5 integrate .. //depot/projects/gdb/usr.bin/tar/util.c#3 integrate .. //depot/projects/gdb/usr.bin/tar/write.c#9 integrate .. //depot/projects/gdb/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/gdb/usr.sbin/watchdogd/watchdogd.c#4 integrate Differences ... ==== //depot/projects/gdb/bin/ls/util.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.34 2004/05/02 11:25:37 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.35 2004/05/03 11:48:55 tjr Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -79,7 +79,8 @@ for (i = 0; i < (int)clen; i++) putchar((unsigned char)s[i]); s += clen; - n += wcwidth(wc); + if (iswprint(wc)) + n += wcwidth(wc); } return (n); } ==== //depot/projects/gdb/gnu/usr.bin/gzip/gzip.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ */ #ifdef RCSID -static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/gzip.c,v 1.10 1999/08/27 23:35:50 peter Exp $"; +static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/gzip.c,v 1.11 2004/05/03 10:29:23 obrien Exp $"; #endif #include <ctype.h> @@ -1011,14 +1011,15 @@ #ifdef NO_MULTIPLE_DOTS char *dot; /* pointer to ifname extension, or NULL */ #endif + int max_suffix_len = (z_len > 3 ? z_len : 3); - if (strlen(iname) >= sizeof(ifname) - 3) { + /* Leave enough room in ifname or ofname for suffix: */ + if (strlen(iname) >= sizeof(ifname) - max_suffix_len) { errno = ENAMETOOLONG; perror(iname); exit_code = ERROR; return ERROR; } - strcpy(ifname, iname); /* If input file exists, return OK. */ ==== //depot/projects/gdb/gnu/usr.bin/gzip/unzip.c#3 (text+ko) ==== @@ -14,8 +14,10 @@ */ #ifdef RCSID -static char rcsid[] = "$FreeBSD: src/gnu/usr.bin/gzip/unzip.c,v 1.7 2004/05/02 02:54:37 tjr Exp $"; +static char rcsid[] = "$Id: unzip.c,v 0.13 1993/06/10 13:29:00 jloup Exp $"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/gnu/usr.bin/gzip/unzip.c,v 1.8 2004/05/03 10:33:27 obrien Exp $"); #include "tailor.h" #include "gzip.h" ==== //depot/projects/gdb/lib/libarchive/archive.h#7 (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/lib/libarchive/archive.h,v 1.7 2004/04/28 04:41:26 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -58,11 +58,11 @@ * platform-dependent error code. */ /* Unrecognized or invalid file format. */ -/* #define ARCHIVE_ERRNO_FILE_FORMAT */ +/* #define ARCHIVE_ERRNO_FILE_FORMAT */ /* Illegal usage of the library. */ -/* #define ARCHIVE_ERRNO_PROGRAMMER_ERROR */ +/* #define ARCHIVE_ERRNO_PROGRAMMER_ERROR */ /* Unknown or unclassified error. */ -/* #define ARCHIVE_ERRNO_MISC */ +/* #define ARCHIVE_ERRNO_MISC */ /* * Callbacks are invoked to automatically read/write/open/close the archive. @@ -96,9 +96,9 @@ #define ARCHIVE_FORMAT_BASE_MASK 0xff0000U #define ARCHIVE_FORMAT_CPIO 0x10000 #define ARCHIVE_FORMAT_CPIO_POSIX (ARCHIVE_FORMAT_CPIO | 1) -#define ARCHIVE_FORMAT_SHAR 0x20000 -#define ARCHIVE_FORMAT_SHAR_BASE (ARCHIVE_FORMAT_SHAR | 1) -#define ARCHIVE_FORMAT_SHAR_DUMP (ARCHIVE_FORMAT_SHAR | 2) +#define ARCHIVE_FORMAT_SHAR 0x20000 +#define ARCHIVE_FORMAT_SHAR_BASE (ARCHIVE_FORMAT_SHAR | 1) +#define ARCHIVE_FORMAT_SHAR_DUMP (ARCHIVE_FORMAT_SHAR | 2) #define ARCHIVE_FORMAT_TAR 0x30000 #define ARCHIVE_FORMAT_TAR_USTAR (ARCHIVE_FORMAT_TAR | 1) #define ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE (ARCHIVE_FORMAT_TAR | 2) ==== //depot/projects/gdb/lib/libarchive/archive_entry.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.11 2004/05/02 00:38:38 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.12 2004/05/03 01:40:34 kientzle Exp $"); #include <sys/stat.h> #include <sys/types.h> @@ -1341,8 +1341,8 @@ #endif { NULL, NULL, 0, 0 } }; -#define longestflaglen 12 -#define nmappings (sizeof(mapping) / sizeof(mapping[0])) +#define longestflaglen 12 +#define nmappings (sizeof(mapping) / sizeof(mapping[0])) /* * fflagstostr -- ==== //depot/projects/gdb/lib/libarchive/archive_entry.h#8 (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/lib/libarchive/archive_entry.h,v 1.7 2004/04/26 23:37:54 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -130,9 +130,9 @@ * "permset"/"perm" abstract type nonsense. A permset is just a simple * bitmap, following long-standing Unix tradition. */ -#define ARCHIVE_ENTRY_ACL_EXECUTE 1 -#define ARCHIVE_ENTRY_ACL_WRITE 2 -#define ARCHIVE_ENTRY_ACL_READ 4 +#define ARCHIVE_ENTRY_ACL_EXECUTE 1 +#define ARCHIVE_ENTRY_ACL_WRITE 2 +#define ARCHIVE_ENTRY_ACL_READ 4 /* We need to be able to specify either or both of these. */ #define ARCHIVE_ENTRY_ACL_TYPE_ACCESS 256 ==== //depot/projects/gdb/lib/libarchive/archive_platform.h#8 (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/lib/libarchive/archive_platform.h,v 1.7 2004/04/21 05:13:42 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $ */ /* @@ -48,24 +48,24 @@ #include <inttypes.h> /* For int64_t, etc. */ #if __FreeBSD__ > 4 -#define HAVE_POSIX_ACL 1 +#define HAVE_POSIX_ACL 1 #endif -#define HAVE_CHFLAGS 1 -#define HAVE_LUTIMES 1 -#define HAVE_LCHMOD 1 -#define HAVE_STRERROR_R 1 -#define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE -#define ARCHIVE_ERRNO_PROGRAMMER EINVAL -#define ARCHIVE_ERRNO_MISC (-1) +#define HAVE_CHFLAGS 1 +#define HAVE_LUTIMES 1 +#define HAVE_LCHMOD 1 +#define HAVE_STRERROR_R 1 +#define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE +#define ARCHIVE_ERRNO_PROGRAMMER EINVAL +#define ARCHIVE_ERRNO_MISC (-1) /* Fetch/set high-resolution time data through a struct stat pointer. */ -#define ARCHIVE_STAT_ATIME_NANOS(st) (st)->st_atimespec.tv_nsec -#define ARCHIVE_STAT_CTIME_NANOS(st) (st)->st_ctimespec.tv_nsec -#define ARCHIVE_STAT_MTIME_NANOS(st) (st)->st_mtimespec.tv_nsec -#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atimespec.tv_nsec = (n) -#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctimespec.tv_nsec = (n) -#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtimespec.tv_nsec = (n) +#define ARCHIVE_STAT_ATIME_NANOS(st) (st)->st_atimespec.tv_nsec +#define ARCHIVE_STAT_CTIME_NANOS(st) (st)->st_ctimespec.tv_nsec +#define ARCHIVE_STAT_MTIME_NANOS(st) (st)->st_mtimespec.tv_nsec +#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atimespec.tv_nsec = (n) +#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctimespec.tv_nsec = (n) +#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtimespec.tv_nsec = (n) /* * Older versions of inttypes.h don't have INT64_MAX, etc. Since @@ -76,11 +76,11 @@ #ifndef INT64_MAX /* XXX Is this really necessary? XXX */ #ifdef __i386__ -#define INT64_MAX 0x7fffffffffffffffLL -#define UINT64_MAX 0xffffffffffffffffULL +#define INT64_MAX 0x7fffffffffffffffLL +#define UINT64_MAX 0xffffffffffffffffULL #else /* __alpha__ */ -#define INT64_MAX 0x7fffffffffffffffL -#define UINT64_MAX 0xffffffffffffffffUL +#define INT64_MAX 0x7fffffffffffffffL +#define UINT64_MAX 0xffffffffffffffffUL #endif #endif /* ! INT64_MAX */ @@ -88,35 +88,35 @@ /* No non-FreeBSD platform will have __FBSDID, so just define it here. */ #ifndef __FreeBSD__ -#define __FBSDID(a) /* null */ +#define __FBSDID(a) /* null */ #endif /* Linux */ #ifdef LINUX -#define _FILE_OFFSET_BITS 64 /* Needed for 64-bit file size handling. */ +#define _FILE_OFFSET_BITS 64 /* Needed for 64-bit file size handling. */ #include <inttypes.h> -#define ARCHIVE_ERRNO_FILE_FORMAT EILSEQ -#define ARCHIVE_ERRNO_PROGRAMMER EINVAL -#define ARCHIVE_ERRNO_MISC (-1) -#define HAVE_STRERROR_R 1 -#define STRERROR_R_CHAR_P 1 +#define ARCHIVE_ERRNO_FILE_FORMAT EILSEQ +#define ARCHIVE_ERRNO_PROGRAMMER EINVAL +#define ARCHIVE_ERRNO_MISC (-1) +#define HAVE_STRERROR_R 1 +#define STRERROR_R_CHAR_P 1 #ifdef HAVE_STRUCT_STAT_TIMESPEC /* Fetch the nanosecond portion of the timestamp from a struct stat pointer. */ -#define ARCHIVE_STAT_ATIME_NANOS(pstat) (pstat)->st_atim.tv_nsec -#define ARCHIVE_STAT_CTIME_NANOS(pstat) (pstat)->st_ctim.tv_nsec -#define ARCHIVE_STAT_MTIME_NANOS(pstat) (pstat)->st_mtim.tv_nsec -#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atim.tv_nsec = (n) -#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctim.tv_nsec = (n) -#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtim.tv_nsec = (n) +#define ARCHIVE_STAT_ATIME_NANOS(pstat) (pstat)->st_atim.tv_nsec +#define ARCHIVE_STAT_CTIME_NANOS(pstat) (pstat)->st_ctim.tv_nsec +#define ARCHIVE_STAT_MTIME_NANOS(pstat) (pstat)->st_mtim.tv_nsec +#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atim.tv_nsec = (n) +#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctim.tv_nsec = (n) +#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtim.tv_nsec = (n) #else /* High-res timestamps aren't available, so just use stubs here. */ -#define ARCHIVE_STAT_ATIME_NANOS(pstat) 0 -#define ARCHIVE_STAT_CTIME_NANOS(pstat) 0 -#define ARCHIVE_STAT_MTIME_NANOS(pstat) 0 -#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) -#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) -#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) +#define ARCHIVE_STAT_ATIME_NANOS(pstat) 0 +#define ARCHIVE_STAT_CTIME_NANOS(pstat) 0 +#define ARCHIVE_STAT_MTIME_NANOS(pstat) 0 +#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) +#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) +#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) #endif #endif ==== //depot/projects/gdb/lib/libarchive/archive_private.h#8 (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/lib/libarchive/archive_private.h,v 1.7 2004/04/28 04:41:26 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.8 2004/05/03 01:40:34 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -209,7 +209,7 @@ #define ARCHIVE_STATE_NEW 1U #define ARCHIVE_STATE_HEADER 2U #define ARCHIVE_STATE_DATA 4U -#define ARCHIVE_STATE_EOF 8U +#define ARCHIVE_STATE_EOF 8U #define ARCHIVE_STATE_CLOSED 0x10U #define ARCHIVE_STATE_FATAL 0x8000U @@ -231,6 +231,6 @@ int (*bid)(const void *, size_t), int (*init)(struct archive *, const void *, size_t)); -#define err_combine(a,b) ((a) < (b) ? (a) : (b)) +#define err_combine(a,b) ((a) < (b) ? (a) : (b)) #endif ==== //depot/projects/gdb/lib/libarchive/archive_read_support_format_cpio.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.8 2004/04/28 03:44:08 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.9 2004/05/03 01:40:34 kientzle Exp $"); #include <sys/stat.h> @@ -94,7 +94,7 @@ char *name; }; -#define CPIO_MAGIC 0x13141516 +#define CPIO_MAGIC 0x13141516 struct cpio { int magic; int (*read_header)(struct archive *, struct stat *, ==== //depot/projects/gdb/lib/libarchive/archive_string.h#3 (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/lib/libarchive/archive_string.h,v 1.2 2004/03/19 22:37:06 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_string.h,v 1.3 2004/05/03 01:40:34 kientzle Exp $ * */ @@ -51,7 +51,7 @@ }; /* Initialize an archive_string object on the stack or elsewhere. */ -#define archive_string_init(a) \ +#define archive_string_init(a) \ do { (a)->s = NULL; (a)->length = 0; (a)->buffer_length = 0; } while(0) /* Append a C char to an archive_string, resizing as necessary. */ @@ -102,11 +102,11 @@ /* Like 'vsprintf', but resizes the underlying string as necessary. */ void __archive_string_vsprintf(struct archive_string *, const char *, va_list); -#define archive_string_vsprintf __archive_string_vsprintf +#define archive_string_vsprintf __archive_string_vsprintf /* Like 'sprintf', but resizes the underlying string as necessary. */ void __archive_string_sprintf(struct archive_string *, const char *, ...); -#define archive_string_sprintf __archive_string_sprintf +#define archive_string_sprintf __archive_string_sprintf #endif ==== //depot/projects/gdb/sbin/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.138 2004/05/01 18:17:23 marcel Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.139 2004/05/03 21:14:03 pjd Exp $ # XXX MISSING: icheck ncheck @@ -30,6 +30,7 @@ fsirand \ gbde \ gconcat \ + ggate \ ${_gpt} \ growfs \ ifconfig \ ==== //depot/projects/gdb/sbin/gconcat/Makefile#3 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sbin/gconcat/Makefile,v 1.3 2004/02/24 03:46:12 bde Exp $ +# $FreeBSD: src/sbin/gconcat/Makefile,v 1.4 2004/05/03 07:20:27 pjd Exp $ PROG= gconcat MAN= gconcat.8 DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} LDADD= -lgeom -lsbuf -lbsdxml WARNS?= 6 -CFLAGS+=-I${.CURDIR}/../../sys .include <bsd.prog.mk> ==== //depot/projects/gdb/sbin/ggate/ggatec/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sbin/ggate/ggatec/Makefile,v 1.1 2004/04/30 16:18:01 pjd Exp $ +# $FreeBSD: src/sbin/ggate/ggatec/Makefile,v 1.2 2004/05/03 07:21:59 pjd Exp $ -.PATH: ../shared +.PATH: ${.CURDIR}/../shared BINDIR= /sbin PROG= ggatec @@ -9,7 +9,7 @@ DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} LDADD= -lgeom -lsbuf -lbsdxml WARNS= 6 -CFLAGS+=-I../shared +CFLAGS+=-I${.CURDIR}/../shared CFLAGS+=-DLIBGEOM .include <bsd.prog.mk> ==== //depot/projects/gdb/sbin/ggate/ggatec/ggatec.8#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/sbin/ggate/ggatec/ggatec.8,v 1.1 2004/04/30 16:18:01 pjd Exp $ +.\" $FreeBSD: src/sbin/ggate/ggatec/ggatec.8,v 1.2 2004/05/03 21:31:19 pjd Exp $ .\" .Dd April 26, 2004 .Dt GGATEC 8 @@ -157,7 +157,7 @@ client RO /dev/acd0 server# ggated -client# ggatec -o ro server /dev/acd0 +client# ggatec create -o ro server /dev/acd0 ggate0 client# mount_cd9660 /dev/ggate0 /cdrom .Ed ==== //depot/projects/gdb/sbin/ggate/ggatec/ggatec.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ggate/ggatec/ggatec.c,v 1.2 2004/05/02 17:59:49 pjd Exp $ + * $FreeBSD: src/sbin/ggate/ggatec/ggatec.c,v 1.3 2004/05/03 18:24:41 pjd Exp $ */ #include <stdio.h> @@ -289,15 +289,15 @@ for (;;) { int error; + error = serve(sfd); + close(sfd); + if (error != EAGAIN) + g_gate_xlog("%s.", strerror(error)); sfd = handshake(); if (sfd < 0) { sleep(2); continue; } - error = serve(sfd); - close(sfd); - if (error != EAGAIN) - g_gate_xlog("%s.", strerror(error)); } } ==== //depot/projects/gdb/sbin/ggate/ggated/Makefile#2 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/sbin/ggate/ggated/Makefile,v 1.1 2004/04/30 16:19:50 pjd Exp $ +# $FreeBSD: src/sbin/ggate/ggated/Makefile,v 1.2 2004/05/03 07:21:59 pjd Exp $ -.PATH: ../shared +.PATH: ${.CURDIR}/../shared BINDIR= /sbin PROG= ggated SRCS= ggated.c ggate.c MAN= ggated.8 WARNS= 6 -CFLAGS+=-I../shared +CFLAGS+=-I${.CURDIR}/../shared .include <bsd.prog.mk> ==== //depot/projects/gdb/sbin/ggate/ggated/ggated.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ggate/ggated/ggated.c,v 1.2 2004/05/02 17:59:49 pjd Exp $ + * $FreeBSD: src/sbin/ggate/ggated/ggated.c,v 1.3 2004/05/04 07:08:04 bde Exp $ */ #include <stdio.h> @@ -37,6 +37,7 @@ #include <sys/socket.h> #include <sys/ioctl.h> #include <sys/stat.h> +#include <sys/time.h> #include <sys/disk.h> #include <sys/bio.h> #include <netinet/in.h> ==== //depot/projects/gdb/sbin/ggate/ggatel/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sbin/ggate/ggatel/Makefile,v 1.1 2004/04/30 16:15:13 pjd Exp $ +# $FreeBSD: src/sbin/ggate/ggatel/Makefile,v 1.2 2004/05/03 07:21:59 pjd Exp $ -.PATH: ../shared +.PATH: ${.CURDIR}/../shared BINDIR= /sbin PROG= ggatel @@ -9,7 +9,7 @@ DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} LDADD= -lgeom -lsbuf -lbsdxml WARNS= 6 -CFLAGS+=-I../shared +CFLAGS+=-I${.CURDIR}/../shared CFLAGS+=-DLIBGEOM .include <bsd.prog.mk> ==== //depot/projects/gdb/sbin/ggate/ggatel/ggatel.8#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/sbin/ggate/ggatel/ggatel.8,v 1.1 2004/04/30 16:15:13 pjd Exp $ +.\" $FreeBSD: src/sbin/ggate/ggatel/ggatel.8,v 1.2 2004/05/03 21:29:22 pjd Exp $ .\" .Dd April 26, 2004 .Dt GGATEL 8 @@ -131,7 +131,7 @@ to encrypt data on a floppy. .Pp .Bd -literal -offset indent -ggatel -u 5 /dev/fd0 +ggatel create -u 5 /dev/fd0 gbde init /dev/ggate5 gbde attach ggate5 newfs /dev/ggate5.bde @@ -139,6 +139,7 @@ cp /private/foo /secret/ umount /secret gbde detach ggate5 +ggatel destroy -u 5 .Ed .Pp .Sh DIAGNOSTICS ==== //depot/projects/gdb/sbin/route/route.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/route/route.c,v 1.73 2004/04/30 22:34:12 ambrisko Exp $"; + "$FreeBSD: src/sbin/route/route.c,v 1.74 2004/05/03 16:30:32 andre Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -1318,6 +1318,7 @@ struct ifma_msghdr *ifmam; #endif struct if_announcemsghdr *ifan; + char *state; if (verbose == 0) return; @@ -1334,7 +1335,19 @@ switch (rtm->rtm_type) { case RTM_IFINFO: ifm = (struct if_msghdr *)rtm; - (void) printf("if# %d, flags:", ifm->ifm_index); + (void) printf("if# %d, ", ifm->ifm_index); + switch (ifm->ifm_data.ifi_link_state) { + case LINK_STATE_DOWN: + state = "down"; + break; + case LINK_STATE_UP: + state = "up"; + break; + default: + state = "unknown"; + break; + } + (void) printf("link: %s, flags:", state); bprintf(stdout, ifm->ifm_flags, ifnetflags); pmsg_addrs((char *)(ifm + 1), ifm->ifm_addrs); break; ==== //depot/projects/gdb/sbin/sunlabel/sunlabel.c#2 (text+ko) ==== @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/sunlabel/sunlabel.c,v 1.7 2003/10/30 15:04:37 harti Exp $"); +__FBSDID("$FreeBSD: src/sbin/sunlabel/sunlabel.c,v 1.8 2004/05/04 09:50:41 joerg Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -75,6 +75,7 @@ #include <sys/sun_disklabel.h> #include <sys/wait.h> +#include <ctype.h> #include <err.h> #include <fcntl.h> #include <inttypes.h> @@ -459,6 +460,7 @@ char offset[32]; char size[32]; char buf[128]; + char *bp; uint8_t part; FILE *fp; int line; @@ -468,13 +470,28 @@ err(1, "fopen"); bzero(sl->sl_part, sizeof(sl->sl_part)); while (fgets(buf, sizeof(buf), fp) != NULL) { - if (buf[0] != ' ' || buf[1] != ' ') + /* + * In order to recognize a partition entry, we search + * for lines starting with a single letter followed by + * a colon as their first non-white characters. We + * silently ignore any other lines, so any comment etc. + * lines in the label template will be ignored. + * + * XXX We should probably also recognize the geometry + * fields on top, and allow changing the geometry + * emulated by this disk. + */ + for (bp = buf; isspace(*bp); bp++) + ; + if (strlen(bp) < 2 || bp[1] != ':') { + line++; continue; - if (sscanf(buf, " %c: %s %s\n", &part, size, offset) != 3 || + } + if (sscanf(bp, "%c: %s %s\n", &part, size, offset) != 3 || parse_size(sl, part - 'a', size) || parse_offset(sl, part - 'a', offset)) { - warnx("%s: syntex error on line %d", - file, line); + warnx("%s: syntax error on line %d", + file, line + 1); fclose(fp); return (1); } ==== //depot/projects/gdb/share/examples/cvsup/cvs-supfile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.41 2004/02/23 19:07:47 marcus Exp $ +# $FreeBSD: src/share/examples/cvsup/cvs-supfile,v 1.42 2004/05/04 20:03:50 josef Exp $ # # This file contains all of the "CVSup collections" that make up the # CVS development tree of the FreeBSD system. @@ -176,6 +176,12 @@ # collections, doc-all +## Website +# +# This collection retrieves the www tree of the FreeBSD +# repository +www + ## CVSROOT control files # # This is to get the control files that cvs(1) needs and the commit logs. ==== //depot/projects/gdb/share/man/man4/atapicam.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2002 +.\" Copyright (c) 2002, 2004 .\" Thomas Quinot <thomas@FreeBSD.org>. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/atapicam.4,v 1.3 2002/12/10 14:21:55 ru Exp $ +.\" $FreeBSD: src/share/man/man4/atapicam.4,v 1.4 2004/05/03 12:03:15 thomas Exp $ .\" .Dd October 23, 2002 .Dt ATAPICAM 4 @@ -75,6 +75,7 @@ information. .Sh EXAMPLES .Bd -literal -offset indent +device ata device atapicam device scbus device cd @@ -89,7 +90,7 @@ .Pp Print the list of all devices available through CAM. .Pp -.Dl "mount -t cd9660 /dev/cd0c /mnt" +.Dl "mount -t cd9660 /dev/cd0 /mnt" .Pp Mount a CD-ROM from an ATAPI CD-ROM drive (the command above assumes that the ATAPI drive is the only CD-ROM unit). ==== //depot/projects/gdb/share/man/man4/rl.4#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/rl.4,v 1.33 2003/11/08 17:31:49 bmah Exp $ +.\" $FreeBSD: src/share/man/man4/rl.4,v 1.34 2004/05/03 09:54:51 sanpei Exp $ .\" .Dd November 4, 1998 .Dt RL 4 @@ -56,6 +56,8 @@ .It Belkin F5D5000 .It +BUFFALO(Melco INC.) LPC-CB-CLX(CardBus) +.It Compaq HNE-300 .It CompUSA no-name 10/100 PCI Ethernet NIC ==== //depot/projects/gdb/share/man/man4/sio.4#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" .\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91 .\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp -.\" $FreeBSD: src/share/man/man4/sio.4,v 1.51 2004/04/30 21:16:52 ambrisko Exp $ +.\" $FreeBSD: src/share/man/man4/sio.4,v 1.52 2004/05/03 22:35:27 ambrisko Exp $ .\" .Dd July 10, 2002 .Dt SIO 4 @@ -178,8 +178,6 @@ PPS timestamping on CTS instead of DCD .It 0x20000 device is assumed to use a 16650A-type (extended FIFO) chip -.It 0x400000 -If no comconsole found then mark as a comconsole .El .Pp Minor numbering: ==== //depot/projects/gdb/share/man/man9/mbuf.9#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.46 2004/04/28 14:53:49 maxim Exp $ +.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.47 2004/05/04 14:53:34 maxim Exp $ .\" .Dd October 17, 2000 .Dt MBUF 9 @@ -77,6 +77,8 @@ .Ft struct mbuf * .Fn m_getm "struct mbuf *orig" "int len" "int how" "int type" .Ft struct mbuf * +.Fn m_getcl "int how" "short type" "int flags" +.Ft struct mbuf * .Fn m_getclr "int how" "int type" .Ft struct mbuf * .Fn m_gethdr "int how" "int type" @@ -530,6 +532,21 @@ A function version of .Fn MGETHDR for non-critical paths. +.It Fn m_getcl how type flags +Fetch an +.Vt mbuf +with a +.Vt mbuf cluster +attached to it. +If one of the allocations fails, the entire allocation fails. +This routine is the preferred way of fetching both the +.Vt mbuf +and +.Vt mbuf cluster +together, as it avoids having to unlock/relock between allocations. +Returns +.Dv NULL +on failure. .It Fn m_getclr how type Allocate an .Vt mbuf ==== //depot/projects/gdb/share/misc/bsd-family-tree#3 (text+ko) ==== @@ -164,7 +164,7 @@ | | | | | | | v | | NetBSD 1.6.2 | | | | | | - | | | v | + | | | v OpenBSD 3.5 FreeBSD 5.0 | | | | | | | FreeBSD 5.1 | NetBSD -current OpenBSD -current @@ -395,7 +395,8 @@ OpenBSD 3.4 2003-11-01 [OBD] FreeBSD 5.2 2004-01-12 [FBD] FreeBSD 5.2.1 2004-02-22 [FBD] (patch release) -NetBSD 1.6.2 2004-03-01 [NBD] +NetBSD 1.6.2 2004-03-01 [NBD] (patch release) +OpenBSD 3.5 2004-04-01 [OBD] Bibliography ------------------------ @@ -452,4 +453,4 @@ Copyright (c) 1997-2004 Wolfram Schneider <wosch@FreeBSD.ORG> URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.79 2004/03/07 16:44:10 wosch Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.80 2004/05/03 08:19:45 maxim Exp $ ==== //depot/projects/gdb/sys/arm/include/_types.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/_types.h,v 1.4 2004/03/20 20:41:39 marcel Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.5 2004/05/04 22:16:29 cognet Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -65,6 +65,8 @@ typedef __uint32_t __clock_t; /* clock()... */ typedef unsigned int __cpumask_t; typedef __int32_t __critical_t; +typedef double __double_t; +typedef double __float_t; typedef __int32_t __intfptr_t; typedef __int64_t __intmax_t; typedef __int32_t __intptr_t; ==== //depot/projects/gdb/sys/arm/include/elf.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/elf.h,v 1.4 2003/09/25 01:10:23 peter Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.5 2004/05/04 22:21:36 cognet Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -40,6 +40,17 @@ #define __ELF_WORD_SIZE 32 /* Used by <sys/elf_generic.h> */ #include <sys/elf_generic.h> +typedef struct { /* Auxiliary vector entry on initial stack */ + int a_type; /* Entry type. */ + union { + long a_val; /* Integer value. */ + void *a_ptr; /* Address. */ + void (*a_fcn)(void); /* Function pointer (not used). */ + } a_un; +} Elf32_Auxinfo; + +__ElfType(Auxinfo); + #define ELF_ARCH EM_ARM #define ELF_MACHINE_OK(x) ((x) == EM_ARM) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405050259.i452xd9l070292>