PERFORCE change 41289 for review
Peter Wemm
peter at FreeBSD.org
Mon Nov 3 16:43:21 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=41289
Change 41289 by peter at peter_daintree on 2003/11/03 16:42:50
IFC @41288
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#30 integrate
.. //depot/projects/hammer/UPDATING#22 integrate
.. //depot/projects/hammer/bin/Makefile.inc#4 integrate
.. //depot/projects/hammer/contrib/diff/util.c#3 integrate
.. //depot/projects/hammer/contrib/groff/src/roff/nroff/nroff.man#4 integrate
.. //depot/projects/hammer/contrib/groff/src/roff/nroff/nroff.sh#5 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/cmds.c#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/cmdtab.c#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/domacro.c#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/extern.h#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/fetch.c#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/ftp.1#4 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/ftp.c#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/ftp_var.h#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/main.c#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/progressbar.c#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/ruserpass.c#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/util.c#3 integrate
.. //depot/projects/hammer/contrib/lukemftp/src/version.h#3 integrate
.. //depot/projects/hammer/contrib/ngatm/man/libngatm.3#1 branch
.. //depot/projects/hammer/contrib/ngatm/man/uniaddr.3#1 branch
.. //depot/projects/hammer/contrib/ngatm/man/unifunc.3#1 branch
.. //depot/projects/hammer/contrib/ngatm/man/unistruct.3#1 branch
.. //depot/projects/hammer/etc/Makefile#20 integrate
.. //depot/projects/hammer/etc/mtree/BSD.include.dist#10 integrate
.. //depot/projects/hammer/etc/rc.d/ipnat#8 integrate
.. //depot/projects/hammer/etc/rc.firewall#3 integrate
.. //depot/projects/hammer/etc/rc.firewall6#3 integrate
.. //depot/projects/hammer/games/morse/morse.6#2 integrate
.. //depot/projects/hammer/games/morse/morse.c#2 integrate
.. //depot/projects/hammer/gnu/usr.bin/send-pr/send-pr.sh#4 integrate
.. //depot/projects/hammer/lib/libc/locale/Makefile.inc#11 integrate
.. //depot/projects/hammer/lib/libc/locale/big5.c#2 integrate
.. //depot/projects/hammer/lib/libc/locale/euc.c#2 integrate
.. //depot/projects/hammer/lib/libc/locale/mbrtowc.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/mskanji.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/none.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#7 integrate
.. //depot/projects/hammer/lib/libc/locale/srune.c#1 branch
.. //depot/projects/hammer/lib/libc/locale/table.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/utf8.c#3 integrate
.. //depot/projects/hammer/lib/libc/locale/wcrtomb.c#4 integrate
.. //depot/projects/hammer/lib/libc/locale/wctrans.c#3 integrate
.. //depot/projects/hammer/lib/libc/posix1e/acl_support.c#2 integrate
.. //depot/projects/hammer/lib/libc/stdio/fputwc.c#4 integrate
.. //depot/projects/hammer/lib/libc/sys/Makefile.inc#9 integrate
.. //depot/projects/hammer/lib/libc/sys/utrace.2#1 branch
.. //depot/projects/hammer/lib/libdisk/Makefile#5 integrate
.. //depot/projects/hammer/lib/libdisk/chunk.c#8 integrate
.. //depot/projects/hammer/lib/libdisk/create_chunk.c#12 integrate
.. //depot/projects/hammer/lib/libdisk/disk.c#15 integrate
.. //depot/projects/hammer/lib/libdisk/libdisk.h#11 integrate
.. //depot/projects/hammer/lib/libdisk/open_disk.c#1 branch
.. //depot/projects/hammer/lib/libdisk/open_ia64_disk.c#1 branch
.. //depot/projects/hammer/lib/libdisk/rules.c#11 integrate
.. //depot/projects/hammer/lib/libdisk/tst01.c#5 integrate
.. //depot/projects/hammer/lib/libdisk/write_disk.c#7 integrate
.. //depot/projects/hammer/lib/libdisk/write_ia64_disk.c#6 integrate
.. //depot/projects/hammer/lib/libngatm/Makefile#2 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#31 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#11 integrate
.. //depot/projects/hammer/sbin/Makefile.inc#3 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#4 integrate
.. //depot/projects/hammer/sbin/md5/md5.1#2 integrate
.. //depot/projects/hammer/sbin/md5/md5.c#4 integrate
.. //depot/projects/hammer/sbin/mount_cd9660/mount_cd9660.c#4 integrate
.. //depot/projects/hammer/sbin/sysctl/sysctl.c#8 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#22 integrate
.. //depot/projects/hammer/share/man/man4/led.4#1 branch
.. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#4 integrate
.. //depot/projects/hammer/sys/boot/common/dev_net.c#3 integrate
.. //depot/projects/hammer/sys/conf/files#31 integrate
.. //depot/projects/hammer/sys/conf/files.i386#17 integrate
.. //depot/projects/hammer/sys/conf/majors#15 integrate
.. //depot/projects/hammer/sys/conf/options#26 integrate
.. //depot/projects/hammer/sys/conf/options.i386#15 integrate
.. //depot/projects/hammer/sys/contrib/dev/ath/ah.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/ath/ah_devid.h#2 integrate
.. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.h#3 integrate
.. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#4 integrate
.. //depot/projects/hammer/sys/contrib/dev/ath/version.h#3 integrate
.. //depot/projects/hammer/sys/contrib/ngatm/FREEBSD-upgrade#2 integrate
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/addr.h#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/genfiles#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/misc/straddr.c#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/geniec.awk#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/genieh.awk#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/genmsgc.awk#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/genmsgh.awk#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/ie.def#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/msg.def#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/parseie.awk#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/parsemsg.awk#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/priv.h#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/privmsg.c#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/traffic.c#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/uni_config.h#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/uni_hdr.h#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/uni_ie.c#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/uni_ie.h#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/uni_ietab.h#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/uni_msg.c#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/uni_msg.h#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/unimsglib.h#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/uniprint.h#1 branch
.. //depot/projects/hammer/sys/contrib/ngatm/netnatm/msg/unistruct.h#1 branch
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#10 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#9 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#16 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#17 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#11 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#5 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#10 integrate
.. //depot/projects/hammer/sys/dev/ata/atapi-cd.h#6 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath.c#10 integrate
.. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#11 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_drv.h#8 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#8 integrate
.. //depot/projects/hammer/sys/dev/ep/if_ep.c#10 integrate
.. //depot/projects/hammer/sys/dev/ep/if_ep_pccard.c#8 integrate
.. //depot/projects/hammer/sys/dev/ep/if_epreg.h#4 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#16 integrate
.. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#11 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#26 integrate
.. //depot/projects/hammer/sys/dev/led/led.c#1 branch
.. //depot/projects/hammer/sys/dev/led/led.h#1 branch
.. //depot/projects/hammer/sys/dev/null/null.c#8 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccard.c#15 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs#18 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#18 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccardvar.h#10 integrate
.. //depot/projects/hammer/sys/dev/pci/pci.c#15 integrate
.. //depot/projects/hammer/sys/dev/puc/puc_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev.c#7 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/hammer/sys/dev/sio/sio_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/snc/dp83932.c#6 integrate
.. //depot/projects/hammer/sys/dev/uart/uart_bus_pci.c#3 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/ohci_pci.c#4 integrate
.. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi.c#20 integrate
.. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#7 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#13 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#6 integrate
.. //depot/projects/hammer/sys/gnu/ext2fs/alpha-bitops.h#2 delete
.. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#9 integrate
.. //depot/projects/hammer/sys/i386/acpica/Makefile#3 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#12 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_wakecode.S#5 integrate
.. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#14 integrate
.. //depot/projects/hammer/sys/i386/acpica/madt.c#1 branch
.. //depot/projects/hammer/sys/i386/conf/GENERIC#16 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#22 integrate
.. //depot/projects/hammer/sys/i386/conf/PAE#7 integrate
.. //depot/projects/hammer/sys/i386/conf/SMP#3 delete
.. //depot/projects/hammer/sys/i386/i386/apic_vector.s#1 branch
.. //depot/projects/hammer/sys/i386/i386/autoconf.c#7 integrate
.. //depot/projects/hammer/sys/i386/i386/bios.c#10 integrate
.. //depot/projects/hammer/sys/i386/i386/critical.c#5 integrate
.. //depot/projects/hammer/sys/i386/i386/db_interface.c#8 integrate
.. //depot/projects/hammer/sys/i386/i386/db_trace.c#8 integrate
.. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#9 integrate
.. //depot/projects/hammer/sys/i386/i386/exception.s#5 integrate
.. //depot/projects/hammer/sys/i386/i386/genassym.c#11 integrate
.. //depot/projects/hammer/sys/i386/i386/identcpu.c#10 integrate
.. //depot/projects/hammer/sys/i386/i386/initcpu.c#9 integrate
.. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#1 branch
.. //depot/projects/hammer/sys/i386/i386/io_apic.c#1 branch
.. //depot/projects/hammer/sys/i386/i386/local_apic.c#1 branch
.. //depot/projects/hammer/sys/i386/i386/locore.s#10 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#24 integrate
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#17 integrate
.. //depot/projects/hammer/sys/i386/i386/mpboot.s#5 integrate
.. //depot/projects/hammer/sys/i386/i386/mptable.c#1 branch
.. //depot/projects/hammer/sys/i386/i386/mptable_pci.c#1 branch
.. //depot/projects/hammer/sys/i386/i386/nexus.c#8 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#23 integrate
.. //depot/projects/hammer/sys/i386/i386/support.s#7 integrate
.. //depot/projects/hammer/sys/i386/i386/trap.c#21 integrate
.. //depot/projects/hammer/sys/i386/include/apic.h#7 delete
.. //depot/projects/hammer/sys/i386/include/apicreg.h#1 branch
.. //depot/projects/hammer/sys/i386/include/apicvar.h#1 branch
.. //depot/projects/hammer/sys/i386/include/asmacros.h#2 integrate
.. //depot/projects/hammer/sys/i386/include/clock.h#5 integrate
.. //depot/projects/hammer/sys/i386/include/critical.h#3 integrate
.. //depot/projects/hammer/sys/i386/include/intr_machdep.h#1 branch
.. //depot/projects/hammer/sys/i386/include/md_var.h#9 integrate
.. //depot/projects/hammer/sys/i386/include/mptable.h#1 branch
.. //depot/projects/hammer/sys/i386/include/pcpu.h#5 integrate
.. //depot/projects/hammer/sys/i386/include/proc.h#4 integrate
.. //depot/projects/hammer/sys/i386/include/segments.h#8 integrate
.. //depot/projects/hammer/sys/i386/include/smp.h#5 integrate
.. //depot/projects/hammer/sys/i386/include/smptests.h#3 integrate
.. //depot/projects/hammer/sys/i386/isa/atpic.c#1 branch
.. //depot/projects/hammer/sys/i386/isa/atpic_vector.s#1 branch
.. //depot/projects/hammer/sys/i386/isa/bs/bsif.h#3 integrate
.. //depot/projects/hammer/sys/i386/isa/clock.c#12 integrate
.. //depot/projects/hammer/sys/i386/isa/icu.h#2 integrate
.. //depot/projects/hammer/sys/i386/isa/if_rdp.c#10 integrate
.. //depot/projects/hammer/sys/i386/isa/nmi.c#1 branch
.. //depot/projects/hammer/sys/i386/isa/npx.c#13 integrate
.. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#13 integrate
.. //depot/projects/hammer/sys/ia64/ia64/unaligned.c#5 integrate
.. //depot/projects/hammer/sys/ia64/include/_types.h#5 integrate
.. //depot/projects/hammer/sys/ia64/include/pc/bios.h#2 delete
.. //depot/projects/hammer/sys/ia64/include/pc/msdos.h#2 delete
.. //depot/projects/hammer/sys/ia64/include/pc/vesa.h#3 delete
.. //depot/projects/hammer/sys/kern/kern_intr.c#15 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#15 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#19 integrate
.. //depot/projects/hammer/sys/kern/sys_pipe.c#13 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#16 integrate
.. //depot/projects/hammer/sys/modules/Makefile#28 integrate
.. //depot/projects/hammer/sys/modules/netgraph/atm/atmbase/Makefile#2 integrate
.. //depot/projects/hammer/sys/netinet/in.c#4 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#11 integrate
.. //depot/projects/hammer/sys/netinet/in_rmx.c#6 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#17 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#18 integrate
.. //depot/projects/hammer/sys/netinet/tcp_subr.c#11 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#7 integrate
.. //depot/projects/hammer/sys/netinet6/raw_ip6.c#6 integrate
.. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#7 integrate
.. //depot/projects/hammer/sys/netkey/key.c#7 integrate
.. //depot/projects/hammer/sys/netkey/key_debug.c#4 integrate
.. //depot/projects/hammer/sys/netkey/keydb.c#3 integrate
.. //depot/projects/hammer/sys/netkey/keydb.h#3 integrate
.. //depot/projects/hammer/sys/netkey/keysock.c#7 integrate
.. //depot/projects/hammer/sys/netkey/keysock.h#2 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#15 integrate
.. //depot/projects/hammer/sys/pci/if_dc.c#23 integrate
.. //depot/projects/hammer/sys/pci/if_rl.c#19 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#22 integrate
.. //depot/projects/hammer/sys/pci/xrpu.c#7 integrate
.. //depot/projects/hammer/sys/sys/resource.h#3 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#14 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_quota.c#8 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#18 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#24 integrate
.. //depot/projects/hammer/sys/vm/vm_map.h#9 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#31 integrate
.. //depot/projects/hammer/sys/vm/vm_object.h#14 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#18 integrate
.. //depot/projects/hammer/usr.bin/Makefile#22 integrate
.. //depot/projects/hammer/usr.bin/env/env.1#2 integrate
.. //depot/projects/hammer/usr.bin/sed/process.c#6 integrate
.. //depot/projects/hammer/usr.bin/su/su.c#9 integrate
.. //depot/projects/hammer/usr.bin/systat/iostat.c#4 integrate
.. //depot/projects/hammer/usr.bin/xlint/arch/ia64/targparam.h#2 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#32 integrate
.. //depot/projects/hammer/usr.sbin/mtree/compare.c#6 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#12 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/label.c#9 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#12 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#30 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.393 2003/10/04 18:53:38 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.394 2003/11/03 21:09:47 ru Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -345,7 +345,7 @@
_includes:
@echo
@echo "--------------------------------------------------------------"
- @echo ">>> stage 4.1: populating ${WORLDTMP}/usr/include"
+ @echo ">>> stage 4.1: building includes"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${WMAKE} SHARED=symlinks par-includes
_libraries:
==== //depot/projects/hammer/UPDATING#22 (text+ko) ====
@@ -17,6 +17,12 @@
developers choose to disable these features on build machines
to maximize performance.
+20031103:
+ The i386 APIC_IO kernel option has been replaced by
+ 'device apic'. The ACPI module has also been temporarily
+ disabled, so APCI must be statically compiled into your
+ kernel using 'device acpi' if you wish to use the ACPI driver.
+
20031031:
The API and ABI of struct ifnet have been changed by removing
the if_name and if_unit members and replacing them with
@@ -1392,4 +1398,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.274 2003/10/31 21:58:15 brooks Exp $
+$FreeBSD: src/UPDATING,v 1.275 2003/11/03 23:02:17 jhb Exp $
==== //depot/projects/hammer/bin/Makefile.inc#4 (text+ko) ====
@@ -1,9 +1,9 @@
# @(#)Makefile.inc 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile.inc,v 1.17 2003/08/17 08:37:47 gordon Exp $
+# $FreeBSD: src/bin/Makefile.inc,v 1.18 2003/11/02 06:47:38 ru Exp $
BINDIR?= /bin
WARNS?= 6
-.if !defined (WITH_DYNAMICROOT)
+.if !defined(WITH_DYNAMICROOT)
NOSHARED?= YES
.endif
==== //depot/projects/hammer/contrib/diff/util.c#3 (text+ko) ====
@@ -17,7 +17,7 @@
along with GNU DIFF; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-/* $FreeBSD: src/contrib/diff/util.c,v 1.5 2002/11/25 22:59:52 gad Exp $ */
+/* $FreeBSD: src/contrib/diff/util.c,v 1.6 2003/11/03 12:41:27 harti Exp $ */
#include "diff.h"
@@ -210,9 +210,9 @@
close (pipes[0]);
}
#ifdef __FreeBSD__
- execl (PR_PROGRAM, PR_PROGRAM, "-F", "-h", name, 0);
+ execl (PR_PROGRAM, PR_PROGRAM, "-F", "-h", name, (char *)NULL);
#else
- execl (PR_PROGRAM, PR_PROGRAM, "-f", "-h", name, 0);
+ execl (PR_PROGRAM, PR_PROGRAM, "-f", "-h", name, (char *)NULL);
#endif
pfatal_with_name (PR_PROGRAM);
}
==== //depot/projects/hammer/contrib/groff/src/roff/nroff/nroff.man#4 (text+ko) ====
@@ -16,7 +16,7 @@
translations approved by the Free Software Foundation instead of in
the original English.
- $FreeBSD: src/contrib/groff/src/roff/nroff/nroff.man,v 1.10 2003/05/01 13:18:29 ru Exp $
+ $FreeBSD: src/contrib/groff/src/roff/nroff/nroff.man,v 1.11 2003/11/02 07:27:40 ru Exp $
..
.TH @G at NROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
@@ -34,6 +34,7 @@
.el .RB "[\ " "\\$1" "\ ]"
..
.OP \-CchipStUv
+.OP \-d cs
.OP \-m name
.OP \-n num
.OP \-o list
@@ -89,6 +90,7 @@
.B \-c
(using the old output scheme instead of SGR escape sequences).
The
+.BR \-d ,
.BR \-C ,
.BR \-i ,
.BR \-m ,
==== //depot/projects/hammer/contrib/groff/src/roff/nroff/nroff.sh#5 (text+ko) ====
@@ -1,36 +1,38 @@
#!/bin/sh
# Emulate nroff with groff.
-# $FreeBSD: src/contrib/groff/src/roff/nroff/nroff.sh,v 1.15 2003/06/22 10:41:47 ru Exp $
+# $FreeBSD: src/contrib/groff/src/roff/nroff/nroff.sh,v 1.17 2003/11/02 07:27:40 ru Exp $
prog="$0"
# Default device.
# First try the "locale charmap" command, because it's most reliable.
# On systems where it doesn't exist, look at the environment variables.
case "`locale charmap 2>/dev/null`" in
+ ISO*8859-1 | ISO*8859-15)
+ T=-Tlatin1 ;;
+ KOI8-R)
+ T=-Tkoi8-r ;;
UTF-8)
T=-Tutf8 ;;
- ISO*8859-1 | ISO*8859-15)
- T=-Tlatin1 ;;
IBM-1047)
T=-Tcp1047 ;;
- KOI8-R)
- T=-Tkoi8-r ;;
*)
case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
+ iso_8859_1 | *.ISO*8859-1 | *.ISO*8859-15)
+ T=-Tlatin1 ;;
+ *.KOI8-R)
+ T=-Tkoi8-r ;;
*.UTF-8)
T=-Tutf8 ;;
- iso_8859_1 | *.ISO*8859-1 | *.ISO*8859-15)
- T=-Tlatin1 ;;
*.IBM-1047)
T=-Tcp1047 ;;
- *.KOI8-R)
- T=-Tkoi8-r ;;
*)
case "$LESSCHARSET" in
+ latin1)
+ T=-Tlatin1 ;;
+ koi8-r)
+ T=-Tkoi8-r ;;
utf-8)
T=-Tutf8 ;;
- latin1)
- T=-Tlatin1 ;;
cp1047)
T=-Tcp1047 ;;
*)
@@ -52,10 +54,10 @@
-[eq] | -s*)
# ignore these options
;;
- -[mrnoT])
+ -[dmrnoT])
echo "$prog: option $1 requires an argument" >&2
exit 1 ;;
- -[iptSUC] | -[mrno]*)
+ -[iptSUC] | -[dmrno]*)
opts="$opts $1" ;;
-Tascii | -Tlatin1 | -Tkoi8-r | -Tutf8 | -Tcp1047)
T=$1 ;;
@@ -70,7 +72,7 @@
echo "GNU nroff (groff) version @VERSION@"
exit 0 ;;
--help)
- echo "usage: nroff [-CchipStUv] [-mNAME] [-nNUM] [-oLIST] [-rCN] [-Tname] [FILE...]"
+ echo "usage: nroff [-CchipStUv] [-dCS] [-mNAME] [-nNUM] [-oLIST] [-rCN] [-Tname] [FILE...]"
exit 0 ;;
--)
shift
==== //depot/projects/hammer/contrib/lukemftp/src/cmds.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.100 2002/11/30 03:10:55 lukem Exp $ */
+/* $NetBSD: cmds.c,v 1.102 2003/08/07 11:13:52 agc Exp $ */
/*-
* Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -107,7 +103,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: cmds.c,v 1.100 2002/11/30 03:10:55 lukem Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.102 2003/08/07 11:13:52 agc Exp $");
#endif
#endif /* not lint */
@@ -1185,7 +1181,8 @@
code = -1;
return;
}
- (void)command("DELE %s", argv[1]);
+ if (command("DELE %s", argv[1]) == COMPLETE)
+ dirchange = 1;
}
/*
@@ -1215,7 +1212,8 @@
continue;
}
if (mflag && confirm(argv[0], cp)) {
- (void)command("DELE %s", cp);
+ if (command("DELE %s", cp) == COMPLETE)
+ dirchange = 1;
if (!mflag && fromatty) {
ointer = interactive;
interactive = 1;
@@ -1245,8 +1243,9 @@
code = -1;
return;
}
- if (command("RNFR %s", argv[1]) == CONTINUE)
- (void)command("RNTO %s", argv[2]);
+ if (command("RNFR %s", argv[1]) == CONTINUE &&
+ command("RNTO %s", argv[2]) == COMPLETE)
+ dirchange = 1;
}
/*
@@ -1553,6 +1552,7 @@
void
makedir(int argc, char *argv[])
{
+ int r;
if (argc == 0 || argc > 2 ||
(argc == 1 && !another(&argc, &argv, "directory-name"))) {
@@ -1560,12 +1560,15 @@
code = -1;
return;
}
- if (command("MKD %s", argv[1]) == ERROR && code == 500) {
+ r = command("MKD %s", argv[1]);
+ if (r == ERROR && code == 500) {
if (verbose)
fputs("MKD command not recognized, trying XMKD.\n",
ttyout);
- (void)command("XMKD %s", argv[1]);
+ r = command("XMKD %s", argv[1]);
}
+ if (r == COMPLETE)
+ dirchange = 1;
}
/*
@@ -1574,6 +1577,7 @@
void
removedir(int argc, char *argv[])
{
+ int r;
if (argc == 0 || argc > 2 ||
(argc == 1 && !another(&argc, &argv, "directory-name"))) {
@@ -1581,12 +1585,15 @@
code = -1;
return;
}
- if (command("RMD %s", argv[1]) == ERROR && code == 500) {
+ r = command("RMD %s", argv[1]);
+ if (r == ERROR && code == 500) {
if (verbose)
fputs("RMD command not recognized, trying XRMD.\n",
ttyout);
- (void)command("XRMD %s", argv[1]);
+ r = command("XRMD %s", argv[1]);
}
+ if (r == COMPLETE)
+ dirchange = 1;
}
/*
@@ -1643,6 +1650,7 @@
while (getreply(0) == PRELIM)
continue;
}
+ dirchange = 1;
}
void
==== //depot/projects/hammer/contrib/lukemftp/src/cmdtab.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: cmdtab.c,v 1.40 2002/07/29 04:24:47 lukem Exp $ */
+/* $NetBSD: cmdtab.c,v 1.41 2003/08/07 11:13:53 agc Exp $ */
/*-
* Copyright (c) 1996-2000 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -74,7 +70,7 @@
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.4 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: cmdtab.c,v 1.40 2002/07/29 04:24:47 lukem Exp $");
+__RCSID("$NetBSD: cmdtab.c,v 1.41 2003/08/07 11:13:53 agc Exp $");
#endif
#endif /* not lint */
==== //depot/projects/hammer/contrib/lukemftp/src/domacro.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: domacro.c,v 1.19 2002/02/01 05:04:43 itojun Exp $ */
+/* $NetBSD: domacro.c,v 1.20 2003/08/07 11:13:53 agc Exp $ */
/*
* Copyright (c) 1985, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)domacro.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: domacro.c,v 1.19 2002/02/01 05:04:43 itojun Exp $");
+__RCSID("$NetBSD: domacro.c,v 1.20 2003/08/07 11:13:53 agc Exp $");
#endif
#endif /* not lint */
==== //depot/projects/hammer/contrib/lukemftp/src/extern.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.61 2003/01/21 16:08:07 jhawk Exp $ */
+/* $NetBSD: extern.h,v 1.62 2003/08/07 11:13:54 agc Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
==== //depot/projects/hammer/contrib/lukemftp/src/fetch.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.141 2003/05/14 14:31:00 wiz Exp $ */
+/* $NetBSD: fetch.c,v 1.144 2003/07/31 05:23:59 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.141 2003/05/14 14:31:00 wiz Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.144 2003/07/31 05:23:59 lukem Exp $");
#endif /* not lint */
/*
@@ -438,7 +438,7 @@
char *cp, *ep, *buf, *savefile;
char *auth, *location, *message;
char *user, *pass, *host, *port, *path, *decodedpath;
- char *puser, *ppass;
+ char *puser, *ppass, *useragent;
off_t hashbytes, rangestart, rangeend, entitylen;
int (*closefunc)(FILE *);
FILE *fin, *fout;
@@ -666,9 +666,8 @@
*/
ai_unmapped(res);
if (getnameinfo(res->ai_addr, res->ai_addrlen,
- hbuf, sizeof(hbuf), NULL, 0,
- NI_NUMERICHOST) != 0)
- strncpy(hbuf, "invalid", sizeof(hbuf));
+ hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0)
+ strlcpy(hbuf, "invalid", sizeof(hbuf));
if (verbose && res != res0)
fprintf(ttyout, "Trying %s...\n", hbuf);
@@ -752,7 +751,12 @@
if (flushcache)
fprintf(fin, "Cache-Control: no-cache\r\n");
}
- fprintf(fin, "User-Agent: %s/%s\r\n", FTP_PRODUCT, FTP_VERSION);
+ if ((useragent=getenv("FTPUSERAGENT")) != NULL) {
+ fprintf(fin, "User-Agent: %s\r\n", useragent);
+ } else {
+ fprintf(fin, "User-Agent: %s/%s\r\n",
+ FTP_PRODUCT, FTP_VERSION);
+ }
if (wwwauth) {
if (verbose) {
fprintf(ttyout, "%swith authorization",
@@ -1620,18 +1624,19 @@
*/
if (strncasecmp(url, ABOUT_URL, sizeof(ABOUT_URL) - 1) == 0) {
url += sizeof(ABOUT_URL) -1;
- if (strcasecmp(url, "ftp") == 0) {
+ if (strcasecmp(url, "ftp") == 0 ||
+ strcasecmp(url, "tnftp") == 0) {
fputs(
-"This version of ftp has been enhanced by Luke Mewburn <lukem at netbsd.org>\n"
+"This version of ftp has been enhanced by Luke Mewburn <lukem at NetBSD.org>\n"
"for the NetBSD project. Execute `man ftp' for more details.\n", ttyout);
} else if (strcasecmp(url, "lukem") == 0) {
fputs(
"Luke Mewburn is the author of most of the enhancements in this ftp client.\n"
-"Please email feedback to <lukem at netbsd.org>.\n", ttyout);
+"Please email feedback to <lukem at NetBSD.org>.\n", ttyout);
} else if (strcasecmp(url, "netbsd") == 0) {
fputs(
"NetBSD is a freely available and redistributable UNIX-like operating system.\n"
-"For more information, see http://www.netbsd.org/index.html\n", ttyout);
+"For more information, see http://www.NetBSD.org/\n", ttyout);
} else if (strcasecmp(url, "version") == 0) {
fprintf(ttyout, "Version: %s %s%s\n",
FTP_PRODUCT, FTP_VERSION,
==== //depot/projects/hammer/contrib/lukemftp/src/ftp.1#4 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $NetBSD: ftp.1,v 1.96 2003/06/26 17:48:37 wiz Exp $
+.\" $NetBSD: ftp.1,v 1.100 2003/08/07 11:13:54 agc Exp $
.\"
.\" Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -46,11 +46,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -68,7 +64,7 @@
.\"
.\" @(#)ftp.1 8.3 (Berkeley) 10/9/94
.\"
-.Dd January 20, 2003
+.Dd July 31, 2003
.Dt FTP 1
.Os
.Sh NAME
@@ -2092,10 +2088,7 @@
.It Xo
.Sm off
.Li \&%c
-.Op Oo Li 0 Oc Ar n
-.Sm on
-.No ,
-.Sm off
+.Op Oo Li 0 Oc Ar n Ns ,
.Li \&%.
.Op Oo Li 0 Oc Ar n
.Sm on
@@ -2189,6 +2182,11 @@
.Fn getservbyname
lookup of
.Dq ftpgate/tcp .
+.It Ev FTPUSERAGENT
+The value to send for the
+.Tn HTTP
+User-Agent
+header.
.It Ev HOME
For default location of a
.Pa .netrc
==== //depot/projects/hammer/contrib/lukemftp/src/ftp.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.120 2002/06/05 10:20:49 lukem Exp $ */
+/* $NetBSD: ftp.c,v 1.122 2003/08/07 11:13:55 agc Exp $ */
/*-
* Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -103,7 +99,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-__RCSID("$NetBSD: ftp.c,v 1.120 2002/06/05 10:20:49 lukem Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.122 2003/08/07 11:13:55 agc Exp $");
#endif
#endif /* not lint */
@@ -745,6 +741,7 @@
if (command("%s", cmd) != PRELIM)
goto cleanupsend;
}
+ dirchange = 1;
dout = dataconn(lmode);
if (dout == NULL)
goto abort;
==== //depot/projects/hammer/contrib/lukemftp/src/ftp_var.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp_var.h,v 1.64 2003/01/21 16:08:07 jhawk Exp $ */
+/* $NetBSD: ftp_var.h,v 1.65 2003/08/07 11:13:56 agc Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
==== //depot/projects/hammer/contrib/lukemftp/src/main.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.84 2003/05/14 14:31:00 wiz Exp $ */
+/* $NetBSD: main.c,v 1.86 2003/08/07 11:13:56 agc Exp $ */
/*-
* Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -108,7 +104,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: main.c,v 1.84 2003/05/14 14:31:00 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.86 2003/08/07 11:13:56 agc Exp $");
#endif
#endif /* not lint */
@@ -467,7 +463,7 @@
* string "username@", and will append the hostname itself. We
* do this by default since many servers are picky about not
* having a FQDN in the anonymous password.
- * - thorpej at netbsd.org
+ * - thorpej at NetBSD.org
*/
len = strlen(anonuser) + 2;
anonpass = xmalloc(len);
==== //depot/projects/hammer/contrib/lukemftp/src/progressbar.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: progressbar.c,v 1.3 2003/02/28 09:53:49 lukem Exp $ */
+/* $NetBSD: progressbar.c,v 1.4 2003/07/17 12:06:18 lukem Exp $ */
/*-
* Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
@@ -7,10 +7,6 @@
* This code is derived from software contributed to The NetBSD Foundation
* by Luke Mewburn.
*
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -42,7 +38,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: progressbar.c,v 1.3 2003/02/28 09:53:49 lukem Exp $");
+__RCSID("$NetBSD: progressbar.c,v 1.4 2003/07/17 12:06:18 lukem Exp $");
#endif /* not lint */
/*
==== //depot/projects/hammer/contrib/lukemftp/src/ruserpass.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: ruserpass.c,v 1.28 2000/11/15 00:11:04 lukem Exp $ */
+/* $NetBSD: ruserpass.c,v 1.29 2003/08/07 11:13:57 agc Exp $ */
/*
* Copyright (c) 1985, 1993, 1994
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ruserpass.c 8.4 (Berkeley) 4/27/95";
#else
-__RCSID("$NetBSD: ruserpass.c,v 1.28 2000/11/15 00:11:04 lukem Exp $");
+__RCSID("$NetBSD: ruserpass.c,v 1.29 2003/08/07 11:13:57 agc Exp $");
#endif
#endif /* not lint */
==== //depot/projects/hammer/contrib/lukemftp/src/util.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.112 2003/06/15 13:49:46 lukem Exp $ */
+/* $NetBSD: util.c,v 1.114 2003/08/07 11:13:57 agc Exp $ */
/*-
* Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -75,7 +71,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: util.c,v 1.112 2003/06/15 13:49:46 lukem Exp $");
+__RCSID("$NetBSD: util.c,v 1.114 2003/08/07 11:13:57 agc Exp $");
#endif /* not lint */
/*
@@ -177,15 +173,22 @@
parse_feat(const char *line)
{
- if (strcasecmp(line, " MDTM") == 0)
+ /*
+ * work-around broken ProFTPd servers that can't
+ * even obey RFC 2389.
+ */
+ while (*line && isspace((int)*line))
+ line++;
+
+ if (strcasecmp(line, "MDTM") == 0)
features[FEAT_MDTM] = 1;
- else if (strncasecmp(line, " MLST", sizeof(" MLST") - 1) == 0) {
+ else if (strncasecmp(line, "MLST", sizeof("MLST") - 1) == 0) {
features[FEAT_MLST] = 1;
- } else if (strcasecmp(line, " REST STREAM") == 0)
+ } else if (strcasecmp(line, "REST STREAM") == 0)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list