Date: Thu, 29 Apr 2004 18:38:33 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 51951 for review Message-ID: <200404300138.i3U1cX3Q068125@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=51951 Change 51951 by marcel@marcel_nfs on 2004/04/29 18:38:20 IFC @51950 Affected files ... .. //depot/projects/gdb/Makefile.inc1#8 integrate .. //depot/projects/gdb/bin/kenv/kenv.c#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/fetch.c#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/ftp.1#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/ftp.c#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/progressbar.c#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/progressbar.h#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/util.c#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/version.h#2 integrate .. //depot/projects/gdb/etc/rc.d/initdiskless#7 integrate .. //depot/projects/gdb/etc/rc.d/ipfw#4 integrate .. //depot/projects/gdb/etc/rc.d/netif#4 integrate .. //depot/projects/gdb/etc/rc.d/resolv#2 integrate .. //depot/projects/gdb/etc/rc.d/watchdogd#3 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/gdb/lib/libarchive/Makefile#6 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#6 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.3#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#10 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.h#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_private.h#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#8 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_gzip.c#5 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_none.c#5 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_cpio.c#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#10 integrate .. //depot/projects/gdb/lib/libarchive/archive_util.c#6 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_compression_bzip2.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_compression_none.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_pax.c#10 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_shar.c#8 integrate .. //depot/projects/gdb/lib/libarchive/libarchive-formats.5#1 branch .. //depot/projects/gdb/lib/libc/gen/signal.3#3 integrate .. //depot/projects/gdb/lib/libc/locale/ldpart.c#2 integrate .. //depot/projects/gdb/lib/libradius/Makefile#3 integrate .. //depot/projects/gdb/lib/libradius/libradius.3#2 integrate .. //depot/projects/gdb/lib/libradius/radlib.c#2 integrate .. //depot/projects/gdb/lib/libradius/radlib.h#2 integrate .. //depot/projects/gdb/lib/libradius/radlib_private.h#2 integrate .. //depot/projects/gdb/lib/libradius/radlib_vs.h#2 integrate .. //depot/projects/gdb/sbin/adjkerntz/adjkerntz.c#2 integrate .. //depot/projects/gdb/sbin/mount/Makefile#3 integrate .. //depot/projects/gdb/sbin/mount/mount.c#4 integrate .. //depot/projects/gdb/share/man/man4/Makefile#9 integrate .. //depot/projects/gdb/share/man/man4/axe.4#2 integrate .. //depot/projects/gdb/share/man/man4/led.4#3 integrate .. //depot/projects/gdb/share/man/man4/mac_none.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_pptpgre.4#2 integrate .. //depot/projects/gdb/share/man/man4/rue.4#2 integrate .. //depot/projects/gdb/share/man/man4/watchdog.4#3 integrate .. //depot/projects/gdb/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/gdb/share/man/man9/mbuf.9#5 integrate .. //depot/projects/gdb/share/snmp/mibs/FREEBSD-MIB.txt#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/gdb/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/gdb/sys/boot/i386/boot0/boot0.s#3 delete .. //depot/projects/gdb/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/gdb/sys/boot/i386/boot0/boot0ext.s#4 delete .. //depot/projects/gdb/sys/boot/i386/boot0/boot0sio.s#3 delete .. //depot/projects/gdb/sys/boot/i386/boot0ext/Makefile#2 integrate .. //depot/projects/gdb/sys/boot/i386/boot0sio/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/gdb/sys/boot/i386/boot2/sio.S#2 integrate .. //depot/projects/gdb/sys/boot/i386/btx/btx/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/gdb/sys/boot/i386/btx/btxldr/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/gdb/sys/boot/i386/cdboot/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/libi386/amd64_tramp.S#2 integrate .. //depot/projects/gdb/sys/boot/i386/mbr/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/pxeldr/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/gdb/sys/boot/pc98/boot2/serial_16550.S#2 integrate .. //depot/projects/gdb/sys/boot/pc98/boot2/serial_8251.S#2 integrate .. //depot/projects/gdb/sys/boot/pc98/btx/btx/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/gdb/sys/boot/pc98/btx/btxldr/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/gdb/sys/conf/NOTES#17 integrate .. //depot/projects/gdb/sys/conf/kern.pre.mk#9 integrate .. //depot/projects/gdb/sys/conf/options#16 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pci.c#7 integrate .. //depot/projects/gdb/sys/dev/ata/ata-lowlevel.c#7 integrate .. //depot/projects/gdb/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/gdb/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/gdb/sys/dev/cy/cy.c#1 branch .. //depot/projects/gdb/sys/dev/cy/cy_isa.c#1 branch .. //depot/projects/gdb/sys/dev/cy/cy_pci.c#1 branch .. //depot/projects/gdb/sys/dev/cy/cyreg.h#1 branch .. //depot/projects/gdb/sys/dev/ic/cd1400.h#1 branch .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#13 integrate .. //depot/projects/gdb/sys/dev/led/led.c#4 integrate .. //depot/projects/gdb/sys/dev/pci/pci.c#9 integrate .. //depot/projects/gdb/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs.h#6 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#6 integrate .. //depot/projects/gdb/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/gdb/sys/i386/i386/elan-mmcr.c#6 integrate .. //depot/projects/gdb/sys/i386/include/mpapic.h#2 delete .. //depot/projects/gdb/sys/i386/isa/clock.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_environment.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_jail.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#9 integrate .. //depot/projects/gdb/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/gdb/sys/modules/Makefile#8 integrate .. //depot/projects/gdb/sys/modules/netgraph/Makefile#5 integrate .. //depot/projects/gdb/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/gdb/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/gdb/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/gdb/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/gdb/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/gdb/sys/net/rtsock.c#7 integrate .. //depot/projects/gdb/sys/netatalk/aarp.c#5 integrate .. //depot/projects/gdb/sys/netatalk/at_extern.h#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_misc.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#4 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_parse.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/gdb/sys/netinet/if_ether.c#7 integrate .. //depot/projects/gdb/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/gdb/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/gdb/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/gdb/sys/netinet6/nd6.c#4 integrate .. //depot/projects/gdb/sys/pc98/conf/GENERIC#6 integrate .. //depot/projects/gdb/sys/pc98/pc98/fd.c#5 integrate .. //depot/projects/gdb/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/gdb/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/gdb/sys/sparc64/isa/ofw_isa.h#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/ofw_machdep.c#2 integrate .. //depot/projects/gdb/sys/sys/jail.h#3 integrate .. //depot/projects/gdb/sys/sys/mman.h#3 integrate .. //depot/projects/gdb/sys/sys/proc.h#12 integrate .. //depot/projects/gdb/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/gdb/sys/vm/phys_pager.c#3 integrate .. //depot/projects/gdb/tools/tools/nanobsd/Makefile#2 integrate .. //depot/projects/gdb/tools/tools/nanobsd/i386.diskimage#4 integrate .. //depot/projects/gdb/usr.bin/netstat/inet.c#3 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.1#4 integrate .. //depot/projects/gdb/usr.bin/tar/read.c#3 integrate .. //depot/projects/gdb/usr.bin/tar/write.c#7 integrate .. //depot/projects/gdb/usr.sbin/arlcontrol/arlcontrol.8#1 branch .. //depot/projects/gdb/usr.sbin/arlcontrol/arlcontrol.c#1 branch .. //depot/projects/gdb/usr.sbin/kldxref/kldxref.c#3 integrate .. //depot/projects/gdb/usr.sbin/watchdogd/watchdog.8#2 integrate .. //depot/projects/gdb/usr.sbin/watchdogd/watchdogd.8#3 integrate .. //depot/projects/gdb/usr.sbin/watchdogd/watchdogd.c#3 integrate Differences ... ==== //depot/projects/gdb/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.423 2004/04/14 16:06:17 harti Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.424 2004/04/27 15:00:29 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -901,7 +901,7 @@ lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ lib/libz lib/msun -lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L +lib/libopie__L lib/libtacplus__L: lib/libmd__L lib/libypclnt__L: lib/librpcsvc__L _generic_libs+= lib @@ -909,6 +909,7 @@ .if !defined(NOCRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl +lib/libradius__L: secure/lib/libssl__L .if !defined(NO_OPENSSH) _prebuild_libs+= secure/lib/libssh secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L @@ -917,6 +918,10 @@ _generic_libs+= secure/lib .endif +.if defined(NOCRYPT) || defined(NO_OPENSSL) +lib/libradius__L: lib/libmd__L +.endif + _generic_libs+= usr.bin/lex/lib .if ${MACHINE_ARCH} == "i386" ==== //depot/projects/gdb/bin/kenv/kenv.c#2 (text+ko) ==== @@ -24,16 +24,15 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/kenv/kenv.c,v 1.5 2003/01/20 17:56:25 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/kenv/kenv.c,v 1.6 2004/04/28 01:27:36 das Exp $"); #include <sys/types.h> #include <sys/sysctl.h> +#include <err.h> +#include <kenv.h> +#include <stdio.h> #include <stdlib.h> -#include <stdio.h> #include <string.h> -#include <errno.h> -#include <err.h> -#include <kenv.h> #include <unistd.h> static void usage(void); @@ -92,9 +91,11 @@ usage(); if ((argc > 0) || (uflag && (env == NULL))) usage(); - if (env == NULL) - kdumpenv(); - else if (val == NULL) { + if (env == NULL) { + error = kdumpenv(); + if (error) + warn("kdumpenv"); + } else if (val == NULL) { if (uflag) { error = kunsetenv(env); if (error) @@ -116,16 +117,28 @@ kdumpenv() { char *buf, *cp; - int len; + int buflen, envlen; - len = kenv(KENV_DUMP, NULL, NULL, 0); - len = len * 120 / 100; - buf = malloc(len); - if (buf == NULL) + envlen = kenv(KENV_DUMP, NULL, NULL, 0); + if (envlen < 0) return (-1); - /* Be defensive */ - memset(buf, 0, len); - kenv(KENV_DUMP, NULL, buf, len); + for (;;) { + buflen = envlen * 120 / 100; + buf = malloc(buflen + 1); + if (buf == NULL) + return (-1); + memset(buf, 0, buflen + 1); /* Be defensive */ + envlen = kenv(KENV_DUMP, NULL, buf, buflen); + if (envlen < 0) { + free(buf); + return (-1); + } + if (envlen > buflen) + free(buf); + else + break; + } + for (; *buf != '\0'; buf += strlen(buf) + 1) { if (hflag) { if (strncmp(buf, "hint.", 5) != 0) ==== //depot/projects/gdb/contrib/lukemftp/src/fetch.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: fetch.c,v 1.144 2003/07/31 05:23:59 lukem Exp $ */ +/* $NetBSD: fetch.c,v 1.146 2003/12/10 12:34:28 lukem Exp $ */ /*- * Copyright (c) 1997-2003 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: fetch.c,v 1.144 2003/07/31 05:23:59 lukem Exp $"); +__RCSID("$NetBSD: fetch.c,v 1.146 2003/12/10 12:34:28 lukem Exp $"); #endif /* not lint */ /* @@ -246,7 +246,7 @@ /* * Parse URL of form: - * <type>://[<user>[:<password>@]]<host>[:<port>][/<path>] + * <type>://[<user>[:<password>]@]<host>[:<port>][/<path>] * Returns -1 if a parse error occurred, otherwise 0. * It's the caller's responsibility to url_decode() the returned * user, pass and path. @@ -1303,7 +1303,6 @@ if ((parse_url(url, "URL", &urltype, &user, &pass, &host, &port, &portnum, &path) == -1) || (user != NULL && *user == '\0') || - (pass != NULL && *pass == '\0') || EMPTYSTRING(host)) { warnx("Invalid URL `%s'", url); goto cleanup_fetch_ftp; ==== //depot/projects/gdb/contrib/lukemftp/src/ftp.1#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $NetBSD: ftp.1,v 1.100 2003/08/07 11:13:54 agc Exp $ +.\" $NetBSD: ftp.1,v 1.101 2003/12/19 03:46:02 lukem Exp $ .\" .\" Copyright (c) 1996-2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -64,7 +64,7 @@ .\" .\" @(#)ftp.1 8.3 (Berkeley) 10/9/94 .\" -.Dd July 31, 2003 +.Dd December 19, 2003 .Dt FTP 1 .Os .Sh NAME @@ -224,7 +224,7 @@ .Nm from attempting .Dq auto-login -upon initial connection. +upon initial connection for non auto-fetch transfers. If auto-login is enabled, .Nm will check the @@ -236,6 +236,8 @@ will prompt for the remote machine login name (default is the user identity on the local machine), and, if necessary, prompt for a password and an account with which to login. +To override the auto-login for auto-fetch transfers, specify the +username (and optionally, password) as appropriate. .It Fl N Ar netrc Use .Ar netrc ==== //depot/projects/gdb/contrib/lukemftp/src/ftp.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: ftp.c,v 1.122 2003/08/07 11:13:55 agc Exp $ */ +/* $NetBSD: ftp.c,v 1.125 2004/04/10 12:21:39 lukem Exp $ */ /*- * Copyright (c) 1996-2002 The NetBSD Foundation, Inc. @@ -99,7 +99,7 @@ #if 0 static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94"; #else -__RCSID("$NetBSD: ftp.c,v 1.122 2003/08/07 11:13:55 agc Exp $"); +__RCSID("$NetBSD: ftp.c,v 1.125 2004/04/10 12:21:39 lukem Exp $"); #endif #endif /* not lint */ @@ -230,10 +230,7 @@ cause = "socket"; continue; } - while ((error = xconnect(s, res->ai_addr, res->ai_addrlen)) < 0 - && errno == EINTR) { - ; - } + error = xconnect(s, res->ai_addr, res->ai_addrlen); if (error) { /* this "if" clause is to prevent print warning twice */ if (res->ai_next) { @@ -276,7 +273,8 @@ int tos = IPTOS_LOWDELAY; if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0) - warn("setsockopt TOS (ignored)"); + if (debug) + warn("setsockopt TOS (ignored)"); } #endif cin = fdopen(s, "r"); @@ -573,13 +571,13 @@ struct pollfd pfd[2]; if (cin) { - pfd[nfd].fd = fileno(cin); - pfd[nfd++].events = POLLIN; + pfd[nfd].fd = fileno(cin); + pfd[nfd++].events = POLLIN; } if (din) { - pfd[nfd].fd = fileno(din); - pfd[nfd++].events = POLLIN; + pfd[nfd].fd = fileno(din); + pfd[nfd++].events = POLLIN; } if ((nr = poll(pfd, nfd, sec * 1000)) <= 0) @@ -1325,7 +1323,8 @@ if ((options & SO_DEBUG) && setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, sizeof(on)) < 0) - warn("setsockopt (ignored)"); + if (debug) + warn("setsockopt (ignored)"); result = COMPLETE + 1; switch (data_addr.su_family) { case AF_INET: @@ -1544,8 +1543,6 @@ while (xconnect(data, (struct sockaddr *)&data_addr.si_su, data_addr.su_len) < 0) { - if (errno == EINTR) - continue; if (activefallback) { (void)close(data); data = -1; @@ -1563,7 +1560,8 @@ on = IPTOS_THROUGHPUT; if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0) - warn("setsockopt TOS (ignored)"); + if (debug) + warn("setsockopt TOS (ignored)"); } #endif return (0); @@ -1596,7 +1594,8 @@ if (options & SO_DEBUG && setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, sizeof(on)) < 0) - warn("setsockopt (ignored)"); + if (debug) + warn("setsockopt (ignored)"); len = sizeof(data_addr.si_su); memset((char *)&data_addr, 0, sizeof (data_addr)); if (getsockname(data, (struct sockaddr *)&data_addr.si_su, &len) < 0) { @@ -1696,7 +1695,8 @@ on = IPTOS_THROUGHPUT; if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0) - warn("setsockopt TOS (ignored)"); + if (debug) + warn("setsockopt TOS (ignored)"); } #endif return (0); @@ -1729,7 +1729,8 @@ int tos = IPTOS_THROUGHPUT; if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0) { - warn("setsockopt TOS (ignored)"); + if (debug) + warn("setsockopt TOS (ignored)"); } } #endif ==== //depot/projects/gdb/contrib/lukemftp/src/progressbar.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: progressbar.c,v 1.4 2003/07/17 12:06:18 lukem Exp $ */ +/* $NetBSD: progressbar.c,v 1.5 2004/03/09 17:04:24 hubertf Exp $ */ /*- * Copyright (c) 1997-2003 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: progressbar.c,v 1.4 2003/07/17 12:06:18 lukem Exp $"); +__RCSID("$NetBSD: progressbar.c,v 1.5 2004/03/09 17:04:24 hubertf Exp $"); #endif /* not lint */ /* @@ -53,6 +53,7 @@ #include <signal.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <time.h> #include <unistd.h> @@ -203,6 +204,8 @@ return; len += snprintf(buf + len, BUFLEFT, "\r"); + if (prefix) + len += snprintf(buf + len, BUFLEFT, "%s", prefix); if (filesize > 0) { ratio = (int)((double)cursize * 100.0 / (double)filesize); ratio = MAX(ratio, 0); @@ -214,6 +217,8 @@ * the number of stars won't exceed the buffer size */ barlength = MIN(sizeof(buf) - 1, ttywidth) - BAROVERHEAD; + if (prefix) + barlength -= strlen(prefix); if (barlength > 0) { i = barlength * ratio / 100; len += snprintf(buf + len, BUFLEFT, ==== //depot/projects/gdb/contrib/lukemftp/src/progressbar.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: progressbar.h,v 1.3 2003/02/28 09:53:49 lukem Exp $ */ +/* $NetBSD: progressbar.h,v 1.4 2004/03/09 17:04:24 hubertf Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -58,6 +58,7 @@ GLOBAL off_t bytes; /* current # of bytes read */ GLOBAL off_t filesize; /* size of file being transferred */ GLOBAL off_t restart_point; /* offset to restart transfer */ +GLOBAL char *prefix; /* Text written left of progress bar */ #ifndef STANDALONE_PROGRESS ==== //depot/projects/gdb/contrib/lukemftp/src/util.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.114 2003/08/07 11:13:57 agc Exp $ */ +/* $NetBSD: util.c,v 1.115 2004/04/10 12:21:39 lukem Exp $ */ /*- * Copyright (c) 1997-2003 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: util.c,v 1.114 2003/08/07 11:13:57 agc Exp $"); +__RCSID("$NetBSD: util.c,v 1.115 2004/04/10 12:21:39 lukem Exp $"); #endif /* not lint */ /* @@ -1204,14 +1204,29 @@ /* - * Internal version of connect(2); sets socket buffer sizes first. + * Internal version of connect(2); sets socket buffer sizes first and + * handles the syscall being interrupted. + * Returns -1 upon failure (with errno set to the problem), or 0 on success. */ int xconnect(int sock, const struct sockaddr *name, int namelen) { + int rv; setupsockbufsize(sock); - return (connect(sock, name, namelen)); + rv = connect(sock, name, namelen); + if (rv == -1 && errno == EINTR) { + fd_set connfd; + + FD_ZERO(&connfd); + FD_SET(sock, &connfd); + do { + rv = select(sock + 1, NULL, &connfd, NULL, NULL); + } while (rv == -1 && errno == EINTR); + if (rv > 0) + rv = 0; + } + return (rv); } /* ==== //depot/projects/gdb/contrib/lukemftp/src/version.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.33 2003/07/31 07:13:01 lukem Exp $ */ +/* $NetBSD: version.h,v 1.35 2004/04/10 12:21:39 lukem Exp $ */ /*- * Copyright (c) 1999-2003 The NetBSD Foundation, Inc. * All rights reserved. @@ -40,5 +40,5 @@ #endif #ifndef FTP_VERSION -#define FTP_VERSION "20030731b" +#define FTP_VERSION "20040410" #endif ==== //depot/projects/gdb/etc/rc.d/initdiskless#7 (text+ko) ==== @@ -24,11 +24,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/initdiskless,v 1.34 2004/04/15 17:52:53 brooks Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.37 2004/04/28 13:18:22 phk Exp $ # # REQUIRE: preseedrandom # PROVIDE: initdiskless # KEYWORD: FreeBSD nojail +# BEFORE: ipfw # On entry to this script the entire system consists of a read-only root @@ -178,7 +179,7 @@ if [ ${dlv:=0} -ne 0 ] ; then iflist=`ifconfig -l` for i in ${iflist} ; do - set `ifconfig ${i}` + set -- `ifconfig ${i}` while [ $# -ge 1 ] ; do if [ "${bootp_ifc}" = "" -a "$1" = "inet" ] ; then bootp_ifc=${i} ; bootp_ipa=${2} ; shift @@ -202,7 +203,7 @@ # Figure out our NFS root path # -set `mount -t nfs` +set -- `mount -t nfs` while [ $# -ge 1 ] ; do if [ "$2" = "on" -a "$3" = "/" ]; then nfsroot="$1" ==== //depot/projects/gdb/etc/rc.d/ipfw#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.7 2004/04/05 16:29:45 fjoe Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.8 2004/04/28 13:20:15 phk Exp $ # # PROVIDE: ipfw @@ -37,7 +37,9 @@ if [ -r "${firewall_script}" ]; then . "${firewall_script}" echo -n 'Firewall rules loaded, starting divert daemons:' - /etc/rc.d/natd start + if [ -f /etc/rc.d/natd ] ; then + /etc/rc.d/natd start + fi elif [ "`ipfw l 65535`" = "65535 deny ip from any to any" ]; then echo 'Warning: kernel has firewall functionality, but' \ ' firewall rules are not enabled.' @@ -62,7 +64,9 @@ # Disable the firewall # ${SYSCTL_W} net.inet.ip.fw.enable=0 - /etc/rc.d/natd stop + if [ -f /etc/rc.d/natd ] ; then + /etc/rc.d/natd stop + fi } load_rc_config $name ==== //depot/projects/gdb/etc/rc.d/netif#4 (text+ko) ==== @@ -22,7 +22,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/etc/rc.d/netif,v 1.6 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.7 2004/04/28 13:20:15 phk Exp $ # # PROVIDE: netif @@ -57,8 +57,10 @@ # Configure the interface(s). network_common ifn_start verbose - # Resync ipfilter - /etc/rc.d/ipfilter resync + if [ -f /etc/rc.d/ipfilter ] ; then + # Resync ipfilter + /etc/rc.d/ipfilter resync + fi } network_stop() ==== //depot/projects/gdb/etc/rc.d/resolv#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/etc/rc.d/resolv,v 1.32 2004/03/23 23:22:34 brooks Exp $ +# $FreeBSD: src/etc/rc.d/resolv,v 1.33 2004/04/28 09:09:27 ru Exp $ # # PROVIDE: resolv @@ -48,7 +48,7 @@ echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf fi - set `/bin/kenv dhcp.domain-name-servers` + set -- `/bin/kenv dhcp.domain-name-servers` for ns in `IFS=','; echo $*`; do echo nameserver $ns >> /etc/resolv.conf; done ==== //depot/projects/gdb/etc/rc.d/watchdogd#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/watchdogd,v 1.2 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/watchdogd,v 1.3 2004/04/26 19:41:37 simon Exp $ # # PROVIDE: watchdogd @@ -36,16 +36,7 @@ name="watchdogd" rcvar="`set_rcvar`" command="/usr/sbin/${name}" -start_precmd="watchdogd_precmd" pidfile="/var/run/${name}.pid" -watchdogd_precmd() -{ - if ! sysctl debug.watchdog >/dev/null 2>&1; then - err 1 "Your kernel doesn't have watchdog support." - fi - return 0 -} - load_rc_config $name run_rc_command "$1" ==== //depot/projects/gdb/games/fortune/datfiles/fortunes#5 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.129 2004/04/21 22:39:46 grog Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.130 2004/04/29 06:14:00 cperciva Exp $ % -- Gifts for Children -- @@ -381,7 +381,7 @@ William Safire's Rules for Writers: Remember to never split an infinitive. The passive voice should never -be used. Do not put statements in the negative form. Verbs have to +be used. Do not put statements in the negative form. Verbs has to agree with their subjects. Proofread carefully to see if you words out. If you reread your work, you can find on rereading a great deal of repetition can be avoided by rereading and editing. A writer must ==== //depot/projects/gdb/games/fortune/datfiles/fortunes-o.real#2 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.17 2003/09/13 15:46:35 eivind Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.19 2004/04/29 04:36:36 smkelly Exp $ My Favorite Drugs [Sung to My Favorite Things] Reefers and roach clips and papers and rollers Cocaine and procaine for twenty year molars @@ -1055,6 +1055,10 @@ lies." -- Edith Hamilton, "The Greek Way" % +"I've got my ANSI C Reference book right here but it doesn't say anything +about getting raped in the ass as part of the official C language (maybe +I should get a C++ reference manual)" -- Deuce, Jerk City +% "I've had one child. My husband wants to have another. I'd like to watch him have another." % @@ -2262,3 +2266,5 @@ to bullshit you, or I may just be bullshitting you inadvertently." -- J. Wainwright, Mathematics 140b % +UNIX is hard. Let's go shopping! +% ==== //depot/projects/gdb/lib/libarchive/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.6 2004/04/12 01:16:16 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.8 2004/04/28 04:34:07 kientzle Exp $ LIB= archive SHLIB_MAJOR= 1 @@ -47,17 +47,28 @@ archive_util.3 \ archive_write.3 \ libarchive.3 \ + libarchive-formats.5 \ tar.5 MLINKS+= archive_entry.3 archive_entry_clear.3 MLINKS+= archive_entry.3 archive_entry_clone.3 +MLINKS+= archive_entry.3 archive_entry_copy_fflags_text_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_gname_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_hardlink_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_pathname_w.3 MLINKS+= archive_entry.3 archive_entry_copy_stat.3 -MLINKS+= archive_entry.3 archive_entry_dup.3 +MLINKS+= archive_entry.3 archive_entry_copy_symlink_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_uname_w.3 +MLINKS+= archive_entry.3 archive_entry_fflags.3 +MLINKS+= archive_entry.3 archive_entry_fflags_text.3 MLINKS+= archive_entry.3 archive_entry_free.3 MLINKS+= archive_entry.3 archive_entry_gname.3 +MLINKS+= archive_entry.3 archive_entry_gname_w.3 MLINKS+= archive_entry.3 archive_entry_hardlink.3 +MLINKS+= archive_entry.3 archive_entry_hardlink_w.3 MLINKS+= archive_entry.3 archive_entry_new.3 MLINKS+= archive_entry.3 archive_entry_pathname.3 +MLINKS+= archive_entry.3 archive_entry_pathname_w.3 MLINKS+= archive_entry.3 archive_entry_set_devmajor.3 MLINKS+= archive_entry.3 archive_entry_set_devminor.3 MLINKS+= archive_entry.3 archive_entry_set_gid.3 @@ -72,7 +83,9 @@ MLINKS+= archive_entry.3 archive_entry_size.3 MLINKS+= archive_entry.3 archive_entry_stat.3 MLINKS+= archive_entry.3 archive_entry_symlink.3 +MLINKS+= archive_entry.3 archive_entry_symlink_w.3 MLINKS+= archive_entry.3 archive_entry_uname.3 +MLINKS+= archive_entry.3 archive_entry_uname_w.3 MLINKS+= archive_read.3 archive_read_data.3 MLINKS+= archive_read.3 archive_read_data_into_buffer.3 MLINKS+= archive_read.3 archive_read_data_into_file.3 ==== //depot/projects/gdb/lib/libarchive/archive.h#6 (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.6 2004/04/05 21:12:29 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h,v 1.7 2004/04/28 04:41:26 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -257,6 +257,11 @@ * Accessor functions to read/set various information in * the struct archive object: */ +/* Bytes written after compression or read before decompression. */ +int64_t archive_position_compressed(struct archive *); +/* Bytes written to compressor or read from decompressor. */ +int64_t archive_position_uncompressed(struct archive *); + const char *archive_compression_name(struct archive *); int archive_compression(struct archive *); int archive_errno(struct archive *); ==== //depot/projects/gdb/lib/libarchive/archive_entry.3#4 (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/libarchive/archive_entry.3,v 1.3 2004/04/12 01:16:16 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.4 2004/04/26 23:37:54 kientzle Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -30,12 +30,15 @@ .Sh NAME .Nm archive_entry_clear .Nm archive_entry_clone +.Nm archive_entry_copy_fflags_text_w .Nm archive_entry_copy_gname_w .Nm archive_entry_copy_hardlink_w .Nm archive_entry_copy_pathname_w .Nm archive_entry_copy_stat .Nm archive_entry_copy_symlink_w .Nm archive_entry_copy_uname_w +.Nm archive_entry_fflags +.Nm archive_entry_fflags_text .Nm archive_entry_free .Nm archive_entry_gname .Nm archive_entry_gname_w @@ -46,9 +49,11 @@ .Nm archive_entry_pathname_w .Nm archive_entry_set_devmajor .Nm archive_entry_set_devminor +.Nm archive_entry_set_fflags .Nm archive_entry_set_gid .Nm archive_entry_set_gname .Nm archive_entry_set_hardlink +.Nm archive_entry_set_link .Nm archive_entry_set_mode .Nm archive_entry_set_pathname .Nm archive_entry_set_symlink @@ -67,6 +72,8 @@ .Fn archive_entry_clear "struct archive_entry *" .Ft struct archive_entry * .Fn archive_entry_clone "struct archive_entry *" +.Ft const wchar_t * +.Fn archive_entry_copy_fflags_text_w "struct archive_entry *" "const wchar_t *" .Ft void .Fn archive_entry_copy_gname_w "struct archive_entry *" "const wchar_t *" .Ft void @@ -80,6 +87,10 @@ .Ft void .Fn archive_entry_copy_uname_w "struct archive_entry *" "const wchar_t *" .Ft void +.Fn archive_entry_fflags "struct archive_entry *" "unsigned long *set" "unsigned long *clear" +.Ft const char * +.Fn archive_entry_fflags_text "struct archive_entry *" +.Ft void .Fn archive_entry_free "struct archive_entry *" .Ft const char * .Fn archive_entry_gname "struct archive_entry *" @@ -100,6 +111,8 @@ .Ft void .Fn archive_entry_set_devminor "struct archive_entry *" "dev_t" .Ft void +.Fn archive_entry_set_fflags "struct archive_entry *" "unsigned long set" "unsigned long clear" +.Ft void .Fn archive_entry_set_gid "struct archive_entry *" "gid_t" .Ft void .Fn archive_entry_set_gname "struct archive_entry *" "const char *" @@ -141,10 +154,30 @@ .Xr libarchive 3 to represent the metadata associated with a particular entry in an archive. -.Pp -Most of the functions here set or read entries -in an object. Such functions have one of the -following forms: +.Ss Create and Destroy +There are functions to allocate, destroy, clear, and copy +.Va archive_entry +objects: +.Bl -tag -compact -width indent +.It Fn archive_entry_clear +Erases the object, resetting all internal fields to the +same state as a newly-created object. +This is provided to allow you to quickly recycle objects +without thrashing the heap. +.It Fn archive_entry_clone +A deep copy operation; all text fields are duplicated. +.It Fn archive_entry_free +Releases the +.Tn struct archive_entry +object. +.It Fn archive_entry_new +Allocate and return a blank +.Tn struct archive_entry +object. +.El +.Ss Set and Get Functions +Most of the functions here set or read entries in an object. +Such functions have one of the following forms: .Bl -tag -compact -width indent .It Fn archive_entry_set_XXXX Stores the provided data in the object. @@ -158,14 +191,13 @@ In the case of strings, a const-qualified pointer to the string is returned. .El -The string data can be accessed as wide character strings -(which are suffixed with -.Cm _w ) +String data can be set or accessed as wide character strings or normal .Va char strings. -Note that these are different representations of the same -data: +The funtions that use wide character strings are suffixed with +.Cm _w . +Note that these are different representations of the same data: For example, if you store a narrow string and read the corresponding wide string, the object will transparently convert formats using the current locale. @@ -173,27 +205,67 @@ narrow string for the same data, the previously-set wide string will be discarded in favor of the new data. .Pp -The remaining functions allocate, destroy, clear, and copy -.Va archive_entry >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404300138.i3U1cX3Q068125>