PERFORCE change 65802 for review
Sam Leffler
sam at FreeBSD.org
Wed Nov 24 10:51:13 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=65802
Change 65802 by sam at sam_ebb on 2004/11/24 18:51:02
IFC @ 65801
Affected files ...
.. //depot/projects/wifi/Makefile.inc1#5 integrate
.. //depot/projects/wifi/bin/ps/ps.c#3 integrate
.. //depot/projects/wifi/bin/rmdir/rmdir.c#2 integrate
.. //depot/projects/wifi/etc/defaults/rc.conf#5 integrate
.. //depot/projects/wifi/etc/ppp/ppp.conf#2 integrate
.. //depot/projects/wifi/etc/rc.d/jail#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate
.. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/main.c#2 integrate
.. //depot/projects/wifi/include/Makefile#3 integrate
.. //depot/projects/wifi/lib/libc/gen/Makefile.inc#2 integrate
.. //depot/projects/wifi/lib/libc/gen/ntp_gettime.c#2 delete
.. //depot/projects/wifi/lib/libc/posix1e/mac.conf.5#2 integrate
.. //depot/projects/wifi/lib/libc/regex/engine.c#2 integrate
.. //depot/projects/wifi/lib/libkvm/kvm_proc.c#3 integrate
.. //depot/projects/wifi/lib/libmagic/Makefile#2 integrate
.. //depot/projects/wifi/libexec/ftpd/ftpcmd.y#3 integrate
.. //depot/projects/wifi/libexec/ftpd/ftpd.c#6 integrate
.. //depot/projects/wifi/libexec/ftpd/logwtmp.c#2 integrate
.. //depot/projects/wifi/libexec/ftpd/popen.c#3 integrate
.. //depot/projects/wifi/libexec/rtld-elf/arm/rtld_machdep.h#2 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#2 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml#2 integrate
.. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#3 integrate
.. //depot/projects/wifi/release/picobsd/floppy.tree/etc/ppp/ppp.conf#2 integrate
.. //depot/projects/wifi/release/picobsd/mfs_tree/etc/remote#2 integrate
.. //depot/projects/wifi/share/examples/ppp/ppp.conf.sample#2 integrate
.. //depot/projects/wifi/share/examples/ppp/ppp.conf.span-isp#2 integrate
.. //depot/projects/wifi/share/examples/pppd/options.sample#2 integrate
.. //depot/projects/wifi/share/examples/startslip/slip.sh#2 integrate
.. //depot/projects/wifi/share/man/man4/Makefile#5 integrate
.. //depot/projects/wifi/share/man/man4/altq.4#4 integrate
.. //depot/projects/wifi/share/man/man4/amr.4#2 integrate
.. //depot/projects/wifi/share/man/man4/hptmv.4#1 branch
.. //depot/projects/wifi/share/man/man4/ixgb.4#3 integrate
.. //depot/projects/wifi/share/man/man4/ng_one2many.4#2 integrate
.. //depot/projects/wifi/share/man/man4/pcn.4#2 integrate
.. //depot/projects/wifi/share/man/man4/re.4#2 integrate
.. //depot/projects/wifi/share/man/man4/rl.4#2 integrate
.. //depot/projects/wifi/share/man/man4/sk.4#2 integrate
.. //depot/projects/wifi/share/man/man5/core.5#2 integrate
.. //depot/projects/wifi/share/man/man5/make.conf.5#4 integrate
.. //depot/projects/wifi/share/man/man7/ports.7#2 integrate
.. //depot/projects/wifi/share/man/man9/Makefile#2 integrate
.. //depot/projects/wifi/share/man/man9/mbuf_tags.9#2 integrate
.. //depot/projects/wifi/share/man/man9/psignal.9#2 integrate
.. //depot/projects/wifi/share/man/man9/signal.9#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/genassym.c#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/interrupt.c#2 integrate
.. //depot/projects/wifi/sys/alpha/alpha/machdep.c#3 integrate
.. //depot/projects/wifi/sys/alpha/alpha/mp_machdep.c#3 integrate
.. //depot/projects/wifi/sys/alpha/include/param.h#2 integrate
.. //depot/projects/wifi/sys/amd64/amd64/busdma_machdep.c#4 integrate
.. //depot/projects/wifi/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/wifi/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/wifi/sys/amd64/include/param.h#2 integrate
.. //depot/projects/wifi/sys/arm/arm/db_interface.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/db_trace.c#3 integrate
.. //depot/projects/wifi/sys/arm/arm/exception.S#2 integrate
.. //depot/projects/wifi/sys/arm/arm/genassym.c#3 integrate
.. //depot/projects/wifi/sys/arm/arm/intr.c#3 integrate
.. //depot/projects/wifi/sys/arm/arm/swtch.S#3 integrate
.. //depot/projects/wifi/sys/arm/arm/trap.c#3 integrate
.. //depot/projects/wifi/sys/arm/arm/undefined.c#2 integrate
.. //depot/projects/wifi/sys/arm/arm/vm_machdep.c#3 integrate
.. //depot/projects/wifi/sys/arm/include/cpufunc.h#3 integrate
.. //depot/projects/wifi/sys/arm/include/db_machdep.h#2 integrate
.. //depot/projects/wifi/sys/arm/include/kdb.h#2 integrate
.. //depot/projects/wifi/sys/arm/include/param.h#3 integrate
.. //depot/projects/wifi/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/wifi/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate
.. //depot/projects/wifi/sys/arm/xscale/i80321/std.i80321#2 integrate
.. //depot/projects/wifi/sys/arm/xscale/i80321/std.iq31244#2 integrate
.. //depot/projects/wifi/sys/arm/xscale/i80321/uart_bus_i80321.c#2 integrate
.. //depot/projects/wifi/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate
.. //depot/projects/wifi/sys/boot/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/efi/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 delete
.. //depot/projects/wifi/sys/boot/efi/libefi/arch/ia64/start.S#2 delete
.. //depot/projects/wifi/sys/boot/efi/loader/Makefile#2 delete
.. //depot/projects/wifi/sys/boot/efi/loader/conf.c#2 delete
.. //depot/projects/wifi/sys/boot/efi/loader/main.c#2 delete
.. //depot/projects/wifi/sys/boot/efi/loader/version#2 delete
.. //depot/projects/wifi/sys/boot/i386/boot0/boot0.S#3 integrate
.. //depot/projects/wifi/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/wifi/sys/boot/ia64/Makefile#2 integrate
.. //depot/projects/wifi/sys/boot/ia64/efi/Makefile#1 branch
.. //depot/projects/wifi/sys/boot/ia64/efi/conf.c#1 branch
.. //depot/projects/wifi/sys/boot/ia64/efi/ldscript.ia64#1 branch
.. //depot/projects/wifi/sys/boot/ia64/efi/main.c#1 branch
.. //depot/projects/wifi/sys/boot/ia64/efi/start.S#1 branch
.. //depot/projects/wifi/sys/boot/ia64/efi/version#1 branch
.. //depot/projects/wifi/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/wifi/sys/compat/freebsd32/syscalls.master#2 integrate
.. //depot/projects/wifi/sys/compat/pecoff/imgact_pecoff.c#2 integrate
.. //depot/projects/wifi/sys/conf/NOTES#6 integrate
.. //depot/projects/wifi/sys/conf/files#7 integrate
.. //depot/projects/wifi/sys/conf/files.alpha#2 integrate
.. //depot/projects/wifi/sys/conf/files.amd64#2 integrate
.. //depot/projects/wifi/sys/conf/files.arm#2 integrate
.. //depot/projects/wifi/sys/conf/files.i386#5 integrate
.. //depot/projects/wifi/sys/conf/files.ia64#2 integrate
.. //depot/projects/wifi/sys/conf/files.pc98#2 integrate
.. //depot/projects/wifi/sys/conf/files.sparc64#4 integrate
.. //depot/projects/wifi/sys/conf/kmod.mk#3 integrate
.. //depot/projects/wifi/sys/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/wifi/sys/ddb/db_command.c#2 integrate
.. //depot/projects/wifi/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/wifi/sys/ddb/db_run.c#2 integrate
.. //depot/projects/wifi/sys/ddb/db_thread.c#3 integrate
.. //depot/projects/wifi/sys/dev/aac/aac.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pcib.c#3 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pcib_pci.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpi_pcibvar.h#2 integrate
.. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx.c#2 integrate
.. //depot/projects/wifi/sys/dev/aic7xxx/aic79xx.h#2 integrate
.. //depot/projects/wifi/sys/dev/aic7xxx/aic7xxx.c#2 integrate
.. //depot/projects/wifi/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate
.. //depot/projects/wifi/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/wifi/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/wifi/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/wifi/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/wifi/sys/dev/ed/if_ed.c#3 integrate
.. //depot/projects/wifi/sys/dev/fdc/fdc.c#4 integrate
.. //depot/projects/wifi/sys/dev/fxp/if_fxp.c#2 integrate
.. //depot/projects/wifi/sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/wifi/sys/dev/hme/if_hme_pci.c#2 integrate
.. //depot/projects/wifi/sys/dev/hme/if_hme_sbus.c#2 integrate
.. //depot/projects/wifi/sys/dev/hme/if_hmevar.h#2 integrate
.. //depot/projects/wifi/sys/dev/ic/ns16550.h#2 integrate
.. //depot/projects/wifi/sys/dev/ic/sab82532.h#1 branch
.. //depot/projects/wifi/sys/dev/ic/z8530.h#1 branch
.. //depot/projects/wifi/sys/dev/mc146818/mc146818.c#1 branch
.. //depot/projects/wifi/sys/dev/mc146818/mc146818reg.h#2 integrate
.. //depot/projects/wifi/sys/dev/mc146818/mc146818var.h#1 branch
.. //depot/projects/wifi/sys/dev/mk48txx/mk48txx.c#2 integrate
.. //depot/projects/wifi/sys/dev/mk48txx/mk48txxreg.h#2 integrate
.. //depot/projects/wifi/sys/dev/mk48txx/mk48txxvar.h#1 branch
.. //depot/projects/wifi/sys/dev/uart/uart_bus_isa.c#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_cpu.h#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_cpu_alpha.c#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_cpu_amd64.c#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_cpu_i386.c#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_cpu_ia64.c#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_cpu_pc98.c#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_cpu_sparc64.c#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_dev_i8251.c#2 delete
.. //depot/projects/wifi/sys/dev/uart/uart_dev_i8251.h#2 delete
.. //depot/projects/wifi/sys/dev/uart/uart_dev_ns8250.c#3 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_dev_ns8250.h#2 delete
.. //depot/projects/wifi/sys/dev/uart/uart_dev_sab82532.c#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_dev_sab82532.h#2 delete
.. //depot/projects/wifi/sys/dev/uart/uart_dev_z8530.c#2 integrate
.. //depot/projects/wifi/sys/dev/uart/uart_dev_z8530.h#2 delete
.. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#6 integrate
.. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#4 integrate
.. //depot/projects/wifi/sys/geom/gate/g_gate.c#2 integrate
.. //depot/projects/wifi/sys/geom/uzip/g_uzip.c#2 integrate
.. //depot/projects/wifi/sys/i386/i386/busdma_machdep.c#3 integrate
.. //depot/projects/wifi/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/wifi/sys/i386/i386/locore.s#2 integrate
.. //depot/projects/wifi/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/wifi/sys/i386/include/param.h#2 integrate
.. //depot/projects/wifi/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/wifi/sys/ia64/ia64/genassym.c#2 integrate
.. //depot/projects/wifi/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/wifi/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/wifi/sys/ia64/include/param.h#2 integrate
.. //depot/projects/wifi/sys/ia64/include/pte.h#2 integrate
.. //depot/projects/wifi/sys/kern/imgact_aout.c#2 integrate
.. //depot/projects/wifi/sys/kern/init_main.c#3 integrate
.. //depot/projects/wifi/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/wifi/sys/kern/kern_fork.c#4 integrate
.. //depot/projects/wifi/sys/kern/kern_intr.c#5 integrate
.. //depot/projects/wifi/sys/kern/kern_kse.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_ntptime.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_switch.c#3 integrate
.. //depot/projects/wifi/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/wifi/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/wifi/sys/kern/sys_generic.c#3 integrate
.. //depot/projects/wifi/sys/kern/sys_pipe.c#4 integrate
.. //depot/projects/wifi/sys/kern/sys_socket.c#3 integrate
.. //depot/projects/wifi/sys/kern/syscalls.c#2 integrate
.. //depot/projects/wifi/sys/kern/syscalls.master#2 integrate
.. //depot/projects/wifi/sys/kern/vfs_bio.c#5 integrate
.. //depot/projects/wifi/sys/kern/vfs_default.c#6 integrate
.. //depot/projects/wifi/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/wifi/sys/kern/vfs_vnops.c#4 integrate
.. //depot/projects/wifi/sys/modules/acpi/acpi_snc/Makefile#2 delete
.. //depot/projects/wifi/sys/modules/sio/Makefile#2 integrate
.. //depot/projects/wifi/sys/modules/uart/Makefile#2 integrate
.. //depot/projects/wifi/sys/net/if.c#4 integrate
.. //depot/projects/wifi/sys/net/if.h#2 integrate
.. //depot/projects/wifi/sys/netgraph/atm/sscop/ng_sscop_cust.h#3 integrate
.. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate
.. //depot/projects/wifi/sys/netgraph/ng_cisco.c#3 integrate
.. //depot/projects/wifi/sys/netgraph/ng_iface.c#2 integrate
.. //depot/projects/wifi/sys/netgraph/ng_one2many.c#2 integrate
.. //depot/projects/wifi/sys/netgraph/ng_one2many.h#2 integrate
.. //depot/projects/wifi/sys/netinet/in.c#3 integrate
.. //depot/projects/wifi/sys/netinet/ip_divert.c#5 integrate
.. //depot/projects/wifi/sys/netinet/tcp_fsm.h#2 integrate
.. //depot/projects/wifi/sys/netinet/tcp_input.c#4 integrate
.. //depot/projects/wifi/sys/netinet/tcp_subr.c#4 integrate
.. //depot/projects/wifi/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/wifi/sys/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/wifi/sys/opencrypto/cryptodev.c#2 integrate
.. //depot/projects/wifi/sys/pc98/i386/machdep.c#4 integrate
.. //depot/projects/wifi/sys/pci/if_sf.c#3 integrate
.. //depot/projects/wifi/sys/pci/if_sfreg.h#3 integrate
.. //depot/projects/wifi/sys/pci/if_sk.c#4 integrate
.. //depot/projects/wifi/sys/powerpc/include/param.h#2 integrate
.. //depot/projects/wifi/sys/powerpc/powerpc/genassym.c#2 integrate
.. //depot/projects/wifi/sys/powerpc/powerpc/machdep.c#2 integrate
.. //depot/projects/wifi/sys/security/mac/mac_sysv_msg.c#1 branch
.. //depot/projects/wifi/sys/security/mac/mac_sysv_sem.c#1 branch
.. //depot/projects/wifi/sys/security/mac/mac_sysv_shm.c#1 branch
.. //depot/projects/wifi/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/wifi/sys/sparc64/conf/NOTES#3 integrate
.. //depot/projects/wifi/sys/sparc64/include/eeprom.h#2 integrate
.. //depot/projects/wifi/sys/sparc64/include/param.h#2 integrate
.. //depot/projects/wifi/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/eeprom.c#2 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/eeprom_ebus.c#2 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/eeprom_sbus.c#2 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/genassym.c#2 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/wifi/sys/sparc64/sparc64/rtc.c#1 branch
.. //depot/projects/wifi/sys/sys/buf.h#6 integrate
.. //depot/projects/wifi/sys/sys/filedesc.h#4 integrate
.. //depot/projects/wifi/sys/sys/jail.h#2 integrate
.. //depot/projects/wifi/sys/sys/mac.h#2 integrate
.. //depot/projects/wifi/sys/sys/mac_policy.h#3 integrate
.. //depot/projects/wifi/sys/sys/msg.h#3 integrate
.. //depot/projects/wifi/sys/sys/proc.h#2 integrate
.. //depot/projects/wifi/sys/sys/sem.h#3 integrate
.. //depot/projects/wifi/sys/sys/shm.h#3 integrate
.. //depot/projects/wifi/sys/sys/syscall.h#2 integrate
.. //depot/projects/wifi/sys/sys/syscall.mk#2 integrate
.. //depot/projects/wifi/sys/sys/sysproto.h#2 integrate
.. //depot/projects/wifi/sys/sys/systm.h#4 integrate
.. //depot/projects/wifi/sys/sys/user.h#2 integrate
.. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#4 integrate
.. //depot/projects/wifi/sys/vm/swap_pager.c#4 integrate
.. //depot/projects/wifi/sys/vm/vm_extern.h#2 integrate
.. //depot/projects/wifi/sys/vm/vm_glue.c#4 integrate
.. //depot/projects/wifi/sys/vm/vm_pageout.h#2 integrate
.. //depot/projects/wifi/tools/debugscripts/dot.gdbinit#3 integrate
.. //depot/projects/wifi/tools/debugscripts/gdbinit.i386#2 integrate
.. //depot/projects/wifi/tools/debugscripts/gdbinit.kernel#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/Makefile#2 integrate
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-sgetrune.c#3 delete
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-sgetrune.t#2 delete
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-sputrune.c#3 delete
.. //depot/projects/wifi/tools/regression/lib/libc/locale/test-sputrune.t#2 delete
.. //depot/projects/wifi/tools/test/ppsapi/Makefile#3 integrate
.. //depot/projects/wifi/tools/test/ppsapi/README#2 integrate
.. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.australia#2 integrate
.. //depot/projects/wifi/usr.bin/fetch/fetch.c#2 integrate
.. //depot/projects/wifi/usr.bin/file/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/gcore/aoutcore.c#2 integrate
.. //depot/projects/wifi/usr.bin/make/config.h#4 integrate
.. //depot/projects/wifi/usr.bin/make/job.c#4 integrate
.. //depot/projects/wifi/usr.bin/make/main.c#4 integrate
.. //depot/projects/wifi/usr.bin/make/parse.c#2 integrate
.. //depot/projects/wifi/usr.bin/ncal/Makefile#2 integrate
.. //depot/projects/wifi/usr.bin/ncal/ncal.1#2 integrate
.. //depot/projects/wifi/usr.bin/ncal/ncal.c#2 integrate
.. //depot/projects/wifi/usr.sbin/acpi/acpiconf/acpiconf.c#3 integrate
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/Makefile#3 integrate
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/bthid_config.h#2 integrate
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/bthidd.c#2 integrate
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/bthidd.conf.sample#2 integrate
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/bthidd.h#2 integrate
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/client.c#2 integrate
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/hid.c#2 integrate
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/kbd.c#1 branch
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/kbd.h#1 branch
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/lexer.l#2 integrate
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/parser.y#2 integrate
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/server.c#2 integrate
.. //depot/projects/wifi/usr.sbin/bluetooth/bthidd/session.c#2 integrate
.. //depot/projects/wifi/usr.sbin/jail/Makefile#2 integrate
.. //depot/projects/wifi/usr.sbin/jail/jail.c#2 integrate
.. //depot/projects/wifi/usr.sbin/ppp/README.changes#2 integrate
.. //depot/projects/wifi/usr.sbin/ppp/defs.h#2 integrate
.. //depot/projects/wifi/usr.sbin/ppp/ppp.8.m4#2 integrate
.. //depot/projects/wifi/usr.sbin/pppd/cbcp.c#3 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/devices.c#2 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/menus.c#3 integrate
.. //depot/projects/wifi/usr.sbin/sysinstall/system.c#2 integrate
.. //depot/projects/wifi/usr.sbin/syslogd/syslogd.8#3 integrate
.. //depot/projects/wifi/usr.sbin/syslogd/syslogd.c#4 integrate
Differences ...
==== //depot/projects/wifi/Makefile.inc1#5 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.456 2004/11/15 05:59:10 peter Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.458 2004/11/23 09:09:47 ru Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -393,6 +393,12 @@
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${LIB32TMP}/usr/include >/dev/null
ln -sf ${.CURDIR}/sys ${WORLDTMP}
+.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.for _t in obj depend all
+ cd ${.CURDIR}/kerberos5/tools; \
+ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t}
+.endfor
+.endif
.for _t in obj includes
cd ${.CURDIR}/include; \
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
@@ -413,12 +419,6 @@
cd ${.CURDIR}/${_dir}; \
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
.endfor
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
-.for _t in obj depend all
- cd ${.CURDIR}/kerberos5/tools; \
- MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t}
-.endfor
-.endif
cd ${.CURDIR}; \
${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries
.for _t in obj depend all
@@ -684,7 +684,7 @@
# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
.for target in obj depend all
- cd ${.CURDIR}/sys/modules/aic7xxx/aicasm; \
+ cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
${MAKE} -DNO_CPU_CFLAGS ${target}
.endfor
==== //depot/projects/wifi/bin/ps/ps.c#3 (text+ko) ====
@@ -47,7 +47,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.108 2004/11/14 19:30:02 csjp Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.109 2004/11/19 16:11:54 csjp Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -1179,16 +1179,13 @@
static int
check_procfs(void)
{
- struct statfs *mntbuf;
- size_t mntsize, i;
+ struct statfs mnt;
- mntsize = getmntinfo(&mntbuf, MNT_NOWAIT);
- for (i = 0; i < mntsize; i++)
- if (strcmp(mntbuf[i].f_mntonname, "/proc") == 0 &&
- strcmp(mntbuf[i].f_fstypename, "procfs") == 0) {
- return (1);
- }
- return (0);
+ if (statfs("/proc", &mnt) < 0)
+ return (0);
+ if (strcmp(mnt.f_fstypename, "procfs") != 0)
+ return (0);
+ return (1);
}
static void
==== //depot/projects/wifi/bin/rmdir/rmdir.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.17 2004/05/16 20:41:11 ru Exp $");
+__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.19 2004/11/20 00:41:08 ru Exp $");
#include <err.h>
#include <errno.h>
@@ -78,15 +78,14 @@
usage();
for (errors = 0; *argv; argv++) {
- if (pflag) {
- errors |= rm_path(*argv);
+ if (rmdir(*argv) < 0) {
+ warn("%s", *argv);
+ errors = 1;
} else {
- if (rmdir(*argv) < 0) {
- warn("%s", *argv);
- errors = 1;
- }
if (vflag)
printf("%s\n", *argv);
+ if (pflag)
+ errors |= rm_path(*argv);
}
}
@@ -104,9 +103,11 @@
*++p = '\0';
while ((p = strrchr(path, '/')) != NULL) {
/* Delete trailing slashes. */
- while (--p > path && *p == '/')
+ while (--p >= path && *p == '/')
;
*++p = '\0';
+ if (p == path)
+ break;
if (rmdir(path) < 0) {
warn("%s", path);
==== //depot/projects/wifi/etc/defaults/rc.conf#5 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.231 2004/11/09 21:33:18 keramida Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.232 2004/11/23 20:09:58 mux Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -497,7 +497,9 @@
#jail_example_devfs_enable="NO" # mount devfs in the jail
#jail_example_fdescfs_enable="NO" # mount fdescfs in the jail
#jail_example_procfs_enable="NO" # mount procfs in jail
+#jail_example_mount_enable="NO" # mount/umount jail's fs
#jail_example_devfs_ruleset="ruleset_name" # devfs ruleset to apply to jail
+#jail_example_fstab="" # fstab(5) for mount/umount
##############################################################
### Define source_rc_confs, the mechanism used by /etc/rc.* ##
==== //depot/projects/wifi/etc/ppp/ppp.conf#2 (text+ko) ====
@@ -5,7 +5,7 @@
#
# See /usr/share/examples/ppp/ for some examples
#
-# $FreeBSD: src/etc/ppp/ppp.conf,v 1.8 2001/06/21 15:42:26 brian Exp $
+# $FreeBSD: src/etc/ppp/ppp.conf,v 1.10 2004/11/19 17:12:56 obrien Exp $
#################################################################
default:
@@ -13,9 +13,9 @@
ident user-ppp VERSION (built COMPILATIONDATE)
# Ensure that "device" references the correct serial port
- # for your modem. (cuaa0 = COM1, cuaa1 = COM2)
+ # for your modem. (cuad0 = COM1, cuad1 = COM2)
#
- set device /dev/cuaa1
+ set device /dev/cuad1
set speed 115200
set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \
==== //depot/projects/wifi/etc/rc.d/jail#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/jail,v 1.17 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/jail,v 1.19 2004/11/24 10:44:39 mux Exp $
#
# PROVIDE: jail
@@ -45,11 +45,18 @@
eval jail_procfs=\"\$jail_${_j}_procfs_enable\"
[ -z "${jail_procfs}" ] && jail_procfs="NO"
+ eval jail_mount=\"\$jail_${_j}_mount_enable\"
+ [ -z "${jail_mount}" ] && jail_mount="NO"
+ # "/etc/fstab.${_j}" will be used for {,u}mount(8) if none is specified.
+ eval jail_fstab=\"\$jail_${_j}_fstab\"
+ [ -z "${jail_fstab}" ] && jail_fstab="/etc/fstab.${_j}"
+
# Debugging aid
#
debug "$_j devfs enable: $jail_devfs"
debug "$_j fdescfs enable: $jail_fdescfs"
debug "$_j procfs enable: $jail_procfs"
+ debug "$_j mount enable: $jail_mount"
debug "$_j hostname: $jail_hostname"
debug "$_j ip: $jail_ip"
debug "$_j root: $jail_rootdir"
@@ -57,6 +64,7 @@
debug "$_j fdescdir: $jail_fdescdir"
debug "$_j procdir: $jail_procdir"
debug "$_j ruleset: $jail_ruleset"
+ debug "$_j fstab: $jail_fstab"
}
# set_sysctl rc_knob mib msg
@@ -108,6 +116,10 @@
umount -f ${jail_procdir} >/dev/null 2>&1
fi
fi
+ if checkyesno jail_mount; then
+ [ -f "${jail_fstab}" ] || warn "${jail_fstab} does not exist"
+ umount -a -F "${jail_fstab}" >/dev/null 2>&1
+ fi
}
jail_start()
@@ -127,6 +139,13 @@
for _jail in ${jail_list}
do
init_variables $_jail
+ if checkyesno jail_mount; then
+ info "Mounting fstab for jail ${_jail} (${jail_fstab})"
+ if [ ! -f "${jail_fstab}" ]; then
+ err 3 "$name: ${jail_fstab} does not exist"
+ fi
+ mount -a -F "${jail_fstab}"
+ fi
if checkyesno jail_devfs; then
info "Mounting devfs on ${jail_devdir}"
devfs_mount_jail "${jail_devdir}" ${jail_ruleset}
==== //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/kgdb.1#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.2 2004/08/15 02:39:20 marcel Exp $
+.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.4 2004/11/22 16:07:28 joerg Exp $
.Dd August 1, 2004
.Os
.Dt KGDB 1
@@ -31,16 +31,83 @@
.Nd The kernel debugger
.Sh SYNOPSIS
.Nm
-.Op Ar -v
-.Op Ar -d crashdir
-.Op Ar -c core | -n dumpnr | -r device
-.Op Ar kernel [ Ar core ]
+.Op Fl a
+.Op Fl v
+.Op Fl d Ar crashdir
+.Op Fl c Ar core | Fl n Ar dumpnr | Fl r Ar device
+.Op Ar kernel Op Ar core
.Sh DESCRIPTION
The
.Nm
utility is a debugger based on
.Xr gdb 1
that allows debugging of kernel core files.
+.Pp
+The options are as follows:
+.Bl -tag -width ".Fl d Ar crashdir"
+.It Fl a
+Increase the annotation level.
+An annotation level of 1 features the historical
+.Fl fullname
+option of
+.Xr gdb 1 .
+This is useful when running
+.Nm
+in Emacs.
+.Fl v
+Increase verbosity.
+.It Fl d Ar crashdir
+Use
+.Ar crashdir
+instead of the default,
+.Pa /var/crash
+to locate kernel core dump files in.
+The name
+.Pa vmcore.
+plus the dump number will be appended to determine
+the actual dump file name.
+.It Fl c Ar core
+Explicitly use
+.Ar core
+as the core dump file.
+.It Fl n Ar dumpnr
+Use the kernel core dump file numbered
+.Ar dumpnr
+for debugging.
+.It Fl r Ar device
+Use
+.Ar device
+to connect
+.Nm
+to for a remote debugging session.
+.El
+.Pp
+The
+.Fl c ,
+.Fl n ,
+and
+.Fl r
+options are mutually exclusive.
+.Pp
+Optionally, the name of the kernel symbol file and
+the name of the core dump file can be supplied on the
+command-line as positional arguments.
+If no kernel symbol file name has been given, the
+symbol file of the currently running kernel will be
+used.
+If no core dump file has been specified through either
+of the options or the last command-line argument,
+.Pa /dev/mem
+will be opened to allow debugging the currenlty running
+kernel.
+.Sh FILES
+.Bl -tag -width "Pa /var/crash"
+.It Pa /dev/mem
+Default memory image to open if no core dump file
+has been specified.
+.It Pa /var/crash
+Default directory to locate kernel core dump files.
+.El
.Sh SEE ALSO
.Xr gdb 1
.Sh HISTORY
==== //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/main.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.3 2004/09/03 07:11:42 brooks Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.4 2004/11/22 16:08:19 joerg Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -80,7 +80,7 @@
{
fprintf(stderr,
- "usage: %s [-v] [-d crashdir] [-c core | -n dumpnr | -r device]\n"
+ "usage: %s [-a] [-v] [-d crashdir] [-c core | -n dumpnr | -r device]\n"
"\t[kernel [core]]\n", getprogname());
exit(1);
}
@@ -218,8 +218,11 @@
if (s != NULL)
strlcpy(crashdir, s, sizeof(crashdir));
- while ((ch = getopt(argc, argv, "c:d:n:r:v")) != -1) {
+ while ((ch = getopt(argc, argv, "ac:d:n:r:v")) != -1) {
switch (ch) {
+ case 'a':
+ annotation_level++;
+ break;
case 'c': /* use given core file. */
if (vmcore != NULL) {
warnx("option %c: can only be specified once",
==== //depot/projects/wifi/include/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.228 2004/11/10 22:21:07 markm Exp $
+# $FreeBSD: src/include/Makefile,v 1.229 2004/11/17 23:48:17 ru Exp $
#
# Doing a "make install" builds /usr/include.
@@ -105,7 +105,7 @@
.endif
copies:
-.for i in ${LDIRS} ${LSUBDIRS} crypto machine machine/pc
+.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc
.if exists(${DESTDIR}${INCLUDEDIR}/$i)
cd ${DESTDIR}${INCLUDEDIR}/$i; \
for h in *.h; do \
==== //depot/projects/wifi/lib/libc/gen/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.117 2004/08/24 13:00:55 tjr Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.118 2004/11/18 23:59:19 marks Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -19,7 +19,7 @@
getusershell.c getvfsbyname.c glob.c \
initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \
lockf.c lrand48.c mrand48.c nftw.c nice.c \
- nlist.c nrand48.c ntp_gettime.c opendir.c \
+ nlist.c nrand48.c opendir.c \
pause.c pmadvise.c popen.c posixshm.c pselect.c \
psignal.c pw_scan.c pwcache.c \
raise.c readdir.c readpassphrase.c rewinddir.c \
==== //depot/projects/wifi/lib/libc/posix1e/mac.conf.5#2 (text+ko) ====
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.4 2003/05/24 19:50:43 ru Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.5 2004/11/18 15:24:47 csjp Exp $
.\"
.Dd April 19, 2003
.Dt MAC.CONF 5
@@ -45,12 +45,18 @@
.Ql #
symbol.
.Pp
-Each declaration consists of a single line with two fields separated
-by white space: the object class name, and a list of label elements
-as used by the
+Currently, the implementation supports two syntax styles for label
+element declaration. The old (deprecated) syntax consists of a
+single line with two fields separated by white space: the object
+class name, and a list of label elements as used by the
.Xr mac_prepare 3
library calls prior to an application invocation of a function from
.Xr mac_get 3 .
+.Pp
+The newer more preferred syntax consists of three fields separated by
+white space: the label group, object class name and a list of
+label elements.
+.Pp
Label element names may optionally begin with a
.Ql \&?
symbol to indicate that a failure to retrieve the label element for
@@ -67,7 +73,14 @@
.Bd -literal -offset indent
#
# Default label set to be used by simple MAC applications
+
+default_labels file ?biba,?lomac,?mls,?sebsd
+default_labels ifnet ?biba,?lomac,?mls,?sebsd
+default_labels process ?biba,?lomac,?mls,?partition,?sebsd
+default_labels socket ?biba,?lomac,?mls
+
#
+# Deprecated (old) syntax
default_file_labels ?biba,?mls,?sebsd
default_ifnet_labels ?biba,?mls,?sebsd
==== //depot/projects/wifi/lib/libc/regex/engine.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.14 2004/07/12 07:35:59 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.15 2004/11/21 03:14:32 tjr Exp $");
/*
* The matching engine and friends. This file is #included by regexec.c
@@ -331,7 +331,7 @@
NOTE("false alarm");
/* recycle starting later */
start = m->coldp + XMBRTOWC(NULL, m->coldp,
- m->endp - m->coldp, &m->mbs, 0);
+ stop - m->coldp, &m->mbs, 0);
assert(start <= stop);
}
@@ -807,7 +807,7 @@
if (p == m->endp)
c = OUT;
else
- clen = XMBRTOWC(&c, p, m->endp - p, &m->mbs, BADCHAR);
+ clen = XMBRTOWC(&c, p, stop - p, &m->mbs, BADCHAR);
if (EQ(st, fresh))
coldp = p;
@@ -861,7 +861,7 @@
assert(coldp != NULL);
m->coldp = coldp;
if (ISSET(st, stopst))
- return(p+XMBRTOWC(NULL, p, m->endp - p, &m->mbs, 0));
+ return(p+XMBRTOWC(NULL, p, stop - p, &m->mbs, 0));
else
return(NULL);
}
@@ -913,7 +913,7 @@
c = OUT;
clen = 0;
} else
- clen = XMBRTOWC(&c, p, m->endp - p, &m->mbs, BADCHAR);
+ clen = XMBRTOWC(&c, p, stop - p, &m->mbs, BADCHAR);
/* is there an EOL and/or BOL between lastc and c? */
flagch = '\0';
==== //depot/projects/wifi/lib/libkvm/kvm_proc.c#3 (text+ko) ====
@@ -42,7 +42,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.83 2004/11/13 14:30:34 csjp Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.84 2004/11/20 02:28:26 das Exp $");
/*
* Proc traversal interface for kvm. ps and w are (probably) the exclusive
@@ -201,7 +201,7 @@
* gather kinfo_proc
*/
kp->ki_paddr = p;
- kp->ki_addr = proc.p_uarea;
+ kp->ki_addr = 0; /* XXX uarea */
/* kp->ki_kstack = proc.p_thread.td_kstack; XXXKSE */
kp->ki_args = proc.p_args;
kp->ki_tracep = proc.p_tracevp;
==== //depot/projects/wifi/lib/libmagic/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libmagic/Makefile,v 1.4 2004/10/18 22:18:23 ru Exp $
+# $FreeBSD: src/lib/libmagic/Makefile,v 1.5 2004/11/19 04:04:14 obrien Exp $
# Copyright (c) David E. O'Brien, 2000-2004
CONTRDIR= ${.CURDIR}/../../contrib/file
@@ -10,6 +10,7 @@
SRCS= apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c \
is_tar.c magic.c print.c readelf.c softmagic.c
+INCS= magic.h
MAGICPATH?= /usr/share/misc
==== //depot/projects/wifi/libexec/ftpd/ftpcmd.y#3 (text+ko) ====
@@ -44,10 +44,11 @@
#if 0
static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94";
#endif
-static const char rcsid[] =
- "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.60 2004/11/13 13:15:47 yar Exp $";
#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.64 2004/11/18 13:46:29 yar Exp $");
+
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
@@ -183,7 +184,7 @@
| PORT check_login SP host_port CRLF
{
if (epsvall) {
- reply(501, "no PORT allowed after EPSV ALL");
+ reply(501, "No PORT allowed after EPSV ALL.");
goto port_done;
}
if (!$2)
@@ -206,7 +207,7 @@
| LPRT check_login SP host_long_port CRLF
{
if (epsvall) {
- reply(501, "no LPRT allowed after EPSV ALL");
+ reply(501, "No LPRT allowed after EPSV ALL.");
goto lprt_done;
}
if (!$2)
@@ -236,7 +237,7 @@
int i;
if (epsvall) {
- reply(501, "no EPRT allowed after EPSV ALL");
+ reply(501, "No EPRT allowed after EPSV ALL.");
goto eprt_done;
}
if (!$2)
@@ -329,14 +330,14 @@
| PASV check_login CRLF
{
if (epsvall)
- reply(501, "no PASV allowed after EPSV ALL");
+ reply(501, "No PASV allowed after EPSV ALL.");
else if ($2)
passive();
}
| LPSV check_login CRLF
{
if (epsvall)
- reply(501, "no LPSV allowed after EPSV ALL");
+ reply(501, "No LPSV allowed after EPSV ALL.");
else if ($2)
long_passive("LPSV", PF_UNSPEC);
}
@@ -363,8 +364,7 @@
| EPSV check_login_epsv SP ALL CRLF
{
if ($2) {
- reply(200,
- "EPSV ALL command successful.");
+ reply(200, "EPSV ALL command successful.");
epsvall++;
}
}
@@ -416,7 +416,7 @@
switch ($4) {
case STRU_F:
- reply(200, "STRU F ok.");
+ reply(200, "STRU F accepted.");
break;
default:
@@ -430,7 +430,7 @@
switch ($4) {
case MODE_S:
- reply(200, "MODE S ok.");
+ reply(200, "MODE S accepted.");
break;
default:
@@ -453,7 +453,7 @@
| RETR check_login SP pathname CRLF
{
if (noretr || (guest && noguestretr))
- reply(500, "RETR command is disabled");
+ reply(500, "RETR command disabled.");
else if ($2 && $4 != NULL)
retrieve(NULL, $4);
@@ -626,7 +626,7 @@
if ($4) {
oldmask = umask(0);
(void) umask(oldmask);
- reply(200, "Current UMASK is %03o", oldmask);
+ reply(200, "Current UMASK is %03o.", oldmask);
}
}
| SITE SP UMASK check_login SP octal_number CRLF
@@ -635,11 +635,11 @@
if ($4) {
if (($6 == -1) || ($6 > 0777)) {
- reply(501, "Bad UMASK value");
+ reply(501, "Bad UMASK value.");
} else {
oldmask = umask($6);
reply(200,
- "UMASK set to %03o (was %03o)",
+ "UMASK set to %03o (was %03o).",
$6, oldmask);
}
}
@@ -648,7 +648,7 @@
{
if ($4 && ($8 != NULL)) {
if (($6 == -1 ) || ($6 > 0777))
- reply(501, "Bad mode value");
+ reply(501, "Bad mode value.");
else if (chmod($8, $6) < 0)
perror_reply(550, $8);
else
@@ -661,7 +661,7 @@
{
if ($3)
reply(200,
- "Current IDLE time limit is %d seconds; max %d",
+ "Current IDLE time limit is %d seconds; max %d.",
timeout, maxtimeout);
}
| SITE SP check_login IDLE SP NUMBER CRLF
@@ -669,13 +669,13 @@
if ($3) {
if ($6.i < 30 || $6.i > maxtimeout) {
reply(501,
- "Maximum IDLE time must be between 30 and %d seconds",
+ "Maximum IDLE time must be between 30 and %d seconds.",
maxtimeout);
} else {
timeout = $6.i;
(void) alarm(timeout);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list