PERFORCE change 139844 for review
Warner Losh
imp at FreeBSD.org
Fri Apr 11 22:48:16 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=139844
Change 139844 by imp at imp_paco-paco on 2008/04/11 22:47:18
IFC @139840
Affected files ...
.. //depot/projects/mips2/src/UPDATING#13 integrate
.. //depot/projects/mips2/src/bin/ls/print.c#4 integrate
.. //depot/projects/mips2/src/contrib/top/machine.h#5 integrate
.. //depot/projects/mips2/src/etc/defaults/rc.conf#9 integrate
.. //depot/projects/mips2/src/etc/rc.d/Makefile#8 integrate
.. //depot/projects/mips2/src/etc/rc.d/ppp#6 integrate
.. //depot/projects/mips2/src/etc/rc.d/rfcomm_pppd_server#1 branch
.. //depot/projects/mips2/src/etc/rc.d/wpa_supplicant#2 integrate
.. //depot/projects/mips2/src/include/string.h#2 integrate
.. //depot/projects/mips2/src/include/unistd.h#6 integrate
.. //depot/projects/mips2/src/lib/libc/string/Makefile.inc#2 integrate
.. //depot/projects/mips2/src/lib/libc/string/Symbol.map#3 integrate
.. //depot/projects/mips2/src/lib/libc/string/memchr.3#3 integrate
.. //depot/projects/mips2/src/lib/libc/string/memrchr.c#1 branch
.. //depot/projects/mips2/src/lib/libc/sys/Symbol.map#10 integrate
.. //depot/projects/mips2/src/lib/libstand/nfs.c#2 integrate
.. //depot/projects/mips2/src/libexec/rtld-elf/rtld.c#7 integrate
.. //depot/projects/mips2/src/libexec/rtld-elf/rtld.h#4 integrate
.. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#16 integrate
.. //depot/projects/mips2/src/release/ia64/mkisoimages.sh#2 integrate
.. //depot/projects/mips2/src/sbin/fsck_ffs/fsck.h#3 integrate
.. //depot/projects/mips2/src/sbin/fsck_ffs/fsck_ffs.8#2 integrate
.. //depot/projects/mips2/src/sbin/fsck_ffs/fsutil.c#3 integrate
.. //depot/projects/mips2/src/sbin/fsck_ffs/inode.c#3 integrate
.. //depot/projects/mips2/src/sbin/fsck_ffs/main.c#7 integrate
.. //depot/projects/mips2/src/sbin/gpt/gpt.c#5 integrate
.. //depot/projects/mips2/src/sbin/route/route.c#4 integrate
.. //depot/projects/mips2/src/share/man/man4/asmc.4#2 integrate
.. //depot/projects/mips2/src/share/man/man4/bpf.4#4 integrate
.. //depot/projects/mips2/src/share/man/man4/psm.4#2 integrate
.. //depot/projects/mips2/src/share/man/man5/rc.conf.5#10 integrate
.. //depot/projects/mips2/src/share/man/man9/Makefile#13 integrate
.. //depot/projects/mips2/src/share/man/man9/lock.9#9 integrate
.. //depot/projects/mips2/src/share/mk/bsd.lib.mk#6 integrate
.. //depot/projects/mips2/src/share/mk/sys.mk#13 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/intr_machdep.c#7 integrate
.. //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#19 integrate
.. //depot/projects/mips2/src/sys/amd64/linux32/linux.h#4 integrate
.. //depot/projects/mips2/src/sys/amd64/linux32/linux32_dummy.c#4 integrate
.. //depot/projects/mips2/src/sys/amd64/linux32/linux32_proto.h#6 integrate
.. //depot/projects/mips2/src/sys/amd64/linux32/linux32_syscall.h#6 integrate
.. //depot/projects/mips2/src/sys/amd64/linux32/linux32_sysent.c#6 integrate
.. //depot/projects/mips2/src/sys/amd64/linux32/linux32_sysvec.c#7 integrate
.. //depot/projects/mips2/src/sys/amd64/linux32/syscalls.master#6 integrate
.. //depot/projects/mips2/src/sys/arm/arm/exception.S#2 integrate
.. //depot/projects/mips2/src/sys/arm/arm/intr.c#6 integrate
.. //depot/projects/mips2/src/sys/arm/arm/locore.S#5 integrate
.. //depot/projects/mips2/src/sys/arm/sa11x0/assabet_machdep.c#6 integrate
.. //depot/projects/mips2/src/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate
.. //depot/projects/mips2/src/sys/arm/xscale/i80321/files.ep80219#3 integrate
.. //depot/projects/mips2/src/sys/arm/xscale/i80321/files.iq31244#3 integrate
.. //depot/projects/mips2/src/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate
.. //depot/projects/mips2/src/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate
.. //depot/projects/mips2/src/sys/arm/xscale/i8134x/files.i81342#2 integrate
.. //depot/projects/mips2/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate
.. //depot/projects/mips2/src/sys/arm/xscale/ixp425/files.avila#3 integrate
.. //depot/projects/mips2/src/sys/boot/forth/loader.conf#8 integrate
.. //depot/projects/mips2/src/sys/boot/i386/pxeldr/pxeldr.S#4 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_file.c#9 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_file.h#1 branch
.. //depot/projects/mips2/src/sys/compat/linux/linux_misc.c#9 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_stats.c#5 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_util.c#4 integrate
.. //depot/projects/mips2/src/sys/compat/linux/linux_util.h#3 integrate
.. //depot/projects/mips2/src/sys/compat/svr4/svr4_sysvec.c#5 integrate
.. //depot/projects/mips2/src/sys/conf/options#17 integrate
.. //depot/projects/mips2/src/sys/dev/acpi_support/acpi_asus.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/acpica/Osd/OsdSynch.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/acpica/acpi.c#8 integrate
.. //depot/projects/mips2/src/sys/dev/asmc/asmc.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/asmc/asmcvar.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-all.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-all.h#9 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-card.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-cbus.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-chipset.c#12 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-disk.c#7 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-disk.h#4 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-dma.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-isa.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-lowlevel.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-pci.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-pci.h#9 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-queue.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-raid.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-raid.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata-usb.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/ata/ata_if.m#3 integrate
.. //depot/projects/mips2/src/sys/dev/ata/atapi-cam.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/ata/atapi-cd.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/ata/atapi-cd.h#4 integrate
.. //depot/projects/mips2/src/sys/dev/ata/atapi-fd.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/ata/atapi-fd.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/ata/atapi-tape.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/ata/atapi-tape.h#3 integrate
.. //depot/projects/mips2/src/sys/dev/atkbdc/psm.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/bge/if_bge.c#10 integrate
.. //depot/projects/mips2/src/sys/dev/de/if_de.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/mii/ip1000phy.c#3 integrate
.. //depot/projects/mips2/src/sys/dev/mii/ip1000phyreg.h#2 integrate
.. //depot/projects/mips2/src/sys/dev/mii/miidevs#9 integrate
.. //depot/projects/mips2/src/sys/dev/nfe/if_nfe.c#10 integrate
.. //depot/projects/mips2/src/sys/dev/nfe/if_nfereg.h#5 integrate
.. //depot/projects/mips2/src/sys/dev/ral/rt2661.c#7 integrate
.. //depot/projects/mips2/src/sys/dev/sound/pcm/dsp.c#4 integrate
.. //depot/projects/mips2/src/sys/dev/usb/ehci_pci.c#7 integrate
.. //depot/projects/mips2/src/sys/dev/usb/ubsa.c#6 integrate
.. //depot/projects/mips2/src/sys/dev/usb/uhci_pci.c#5 integrate
.. //depot/projects/mips2/src/sys/dev/usb/usbdevs#16 integrate
.. //depot/projects/mips2/src/sys/fs/unionfs/union_subr.c#8 integrate
.. //depot/projects/mips2/src/sys/i386/i386/intr_machdep.c#7 integrate
.. //depot/projects/mips2/src/sys/i386/i386/mp_machdep.c#9 integrate
.. //depot/projects/mips2/src/sys/i386/i386/pmap.c#17 integrate
.. //depot/projects/mips2/src/sys/i386/ibcs2/ibcs2_util.c#3 integrate
.. //depot/projects/mips2/src/sys/i386/linux/linux.h#4 integrate
.. //depot/projects/mips2/src/sys/i386/linux/linux_dummy.c#3 integrate
.. //depot/projects/mips2/src/sys/i386/linux/linux_proto.h#6 integrate
.. //depot/projects/mips2/src/sys/i386/linux/linux_syscall.h#6 integrate
.. //depot/projects/mips2/src/sys/i386/linux/linux_sysent.c#6 integrate
.. //depot/projects/mips2/src/sys/i386/linux/linux_sysvec.c#7 integrate
.. //depot/projects/mips2/src/sys/i386/linux/syscalls.master#6 integrate
.. //depot/projects/mips2/src/sys/ia64/ia64/interrupt.c#7 integrate
.. //depot/projects/mips2/src/sys/ia64/ia64/sscdisk.c#3 integrate
.. //depot/projects/mips2/src/sys/kern/kern_cpuset.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/kern_intr.c#10 integrate
.. //depot/projects/mips2/src/sys/kern/kern_jail.c#7 integrate
.. //depot/projects/mips2/src/sys/kern/kern_lock.c#11 integrate
.. //depot/projects/mips2/src/sys/kern/kern_timeout.c#11 integrate
.. //depot/projects/mips2/src/sys/kern/subr_firmware.c#3 integrate
.. //depot/projects/mips2/src/sys/kern/subr_taskqueue.c#6 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_cache.c#11 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_lookup.c#10 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_mount.c#13 integrate
.. //depot/projects/mips2/src/sys/kern/vfs_syscalls.c#9 integrate
.. //depot/projects/mips2/src/sys/modules/asmc/Makefile#2 integrate
.. //depot/projects/mips2/src/sys/net/bpf.c#12 integrate
.. //depot/projects/mips2/src/sys/net/bpf_zerocopy.c#3 integrate
.. //depot/projects/mips2/src/sys/net/bpf_zerocopy.h#2 integrate
.. //depot/projects/mips2/src/sys/net/if_loop.c#6 integrate
.. //depot/projects/mips2/src/sys/netgraph/ng_base.c#14 integrate
.. //depot/projects/mips2/src/sys/netinet/in_pcb.c#11 integrate
.. //depot/projects/mips2/src/sys/netinet/ip_input.c#7 integrate
.. //depot/projects/mips2/src/sys/netinet/ip_ipsec.c#7 integrate
.. //depot/projects/mips2/src/sys/netinet/ip_ipsec.h#3 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp.h#6 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_input.c#10 integrate
.. //depot/projects/mips2/src/sys/netinet/tcp_output.c#10 integrate
.. //depot/projects/mips2/src/sys/netinet6/in6_pcb.c#8 integrate
.. //depot/projects/mips2/src/sys/nlm/nlm_prot_impl.c#3 integrate
.. //depot/projects/mips2/src/sys/pc98/cbus/sc_machdep.h#2 integrate
.. //depot/projects/mips2/src/sys/pc98/cbus/syscons_cbus.c#5 integrate
.. //depot/projects/mips2/src/sys/pci/if_rl.c#7 integrate
.. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_add.c#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_compare.c#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_div.c#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_explode.c#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_implode.c#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_mul.c#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_sqrt.c#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/fpu/fpu_subr.c#2 integrate
.. //depot/projects/mips2/src/sys/powerpc/include/atomic.h#6 integrate
.. //depot/projects/mips2/src/sys/powerpc/powerpc/intr_machdep.c#11 integrate
.. //depot/projects/mips2/src/sys/rpc/clnt_rc.c#3 integrate
.. //depot/projects/mips2/src/sys/sparc64/include/intr_machdep.h#4 integrate
.. //depot/projects/mips2/src/sys/sparc64/include/smp.h#3 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/intr_machdep.c#7 integrate
.. //depot/projects/mips2/src/sys/sparc64/sparc64/mp_machdep.c#5 integrate
.. //depot/projects/mips2/src/sys/sun4v/sun4v/intr_machdep.c#4 integrate
.. //depot/projects/mips2/src/sys/sys/_lockmgr.h#1 branch
.. //depot/projects/mips2/src/sys/sys/_stack.h#1 branch
.. //depot/projects/mips2/src/sys/sys/ata.h#7 integrate
.. //depot/projects/mips2/src/sys/sys/cpuset.h#6 integrate
.. //depot/projects/mips2/src/sys/sys/eventhandler.h#6 integrate
.. //depot/projects/mips2/src/sys/sys/interrupt.h#6 integrate
.. //depot/projects/mips2/src/sys/sys/jail.h#4 integrate
.. //depot/projects/mips2/src/sys/sys/kernel.h#8 integrate
.. //depot/projects/mips2/src/sys/sys/lockmgr.h#9 integrate
.. //depot/projects/mips2/src/sys/sys/param.h#16 integrate
.. //depot/projects/mips2/src/sys/sys/proc.h#16 integrate
.. //depot/projects/mips2/src/sys/sys/sleepqueue.h#4 integrate
.. //depot/projects/mips2/src/sys/sys/stack.h#3 integrate
.. //depot/projects/mips2/src/sys/sys/syscallsubr.h#7 integrate
.. //depot/projects/mips2/src/sys/sys/vnode.h#9 integrate
.. //depot/projects/mips2/src/sys/ufs/ffs/ffs_softdep.c#11 integrate
.. //depot/projects/mips2/src/sys/ufs/ufs/dirhash.h#2 integrate
.. //depot/projects/mips2/src/sys/ufs/ufs/ufs_dirhash.c#2 integrate
.. //depot/projects/mips2/src/sys/ufs/ufs/ufs_gjournal.c#3 integrate
.. //depot/projects/mips2/src/sys/ufs/ufs/ufs_lookup.c#6 integrate
.. //depot/projects/mips2/src/sys/vm/vm_page.c#12 integrate
.. //depot/projects/mips2/src/sys/vm/vm_phys.c#4 integrate
.. //depot/projects/mips2/src/sys/vm/vm_reserv.c#2 integrate
.. //depot/projects/mips2/src/sys/vm/vm_reserv.h#2 integrate
.. //depot/projects/mips2/src/tools/tools/README#5 integrate
.. //depot/projects/mips2/src/usr.bin/cpuset/cpuset.c#3 integrate
.. //depot/projects/mips2/src/usr.bin/fstat/zfs.c#1 branch
.. //depot/projects/mips2/src/usr.bin/gprof/gprof.h#4 integrate
.. //depot/projects/mips2/src/usr.bin/top/machine.c#7 integrate
.. //depot/projects/mips2/src/usr.bin/vmstat/vmstat.c#6 integrate
.. //depot/projects/mips2/src/usr.bin/xlint/lint1/param.h#3 integrate
.. //depot/projects/mips2/src/usr.sbin/btxld/btxld.c#2 integrate
.. //depot/projects/mips2/src/usr.sbin/config/main.c#5 integrate
.. //depot/projects/mips2/src/usr.sbin/fifolog/Makefile#2 integrate
.. //depot/projects/mips2/src/usr.sbin/fifolog/Makefile.inc#2 integrate
.. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_create/Makefile#2 integrate
.. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_create/fifolog.1#2 integrate
.. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_reader/Makefile#3 integrate
.. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_writer/Makefile#2 integrate
.. //depot/projects/mips2/src/usr.sbin/fifolog/lib/Makefile#2 integrate
.. //depot/projects/mips2/src/usr.sbin/pkg_install/Makefile#5 integrate
.. //depot/projects/mips2/src/usr.sbin/pkg_install/add/perform.c#4 integrate
.. //depot/projects/mips2/src/usr.sbin/pkg_install/delete/perform.c#3 integrate
.. //depot/projects/mips2/src/usr.sbin/pkg_install/lib/lib.h#5 integrate
.. //depot/projects/mips2/src/usr.sbin/pkg_install/lib/match.c#3 integrate
.. //depot/projects/mips2/src/usr.sbin/rpc.lockd/lockd.c#8 integrate
.. //depot/projects/mips2/src/usr.sbin/rpc.statd/statd.c#7 integrate
.. //depot/projects/mips2/src/usr.sbin/sysinstall/devices.c#4 integrate
.. //depot/projects/mips2/src/usr.sbin/sysinstall/menus.c#7 integrate
Differences ...
==== //depot/projects/mips2/src/UPDATING#13 (text+ko) ====
@@ -22,6 +22,13 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20080408:
+ psm(4) has gained write(2) support in native operation level.
+ Arbitrary commands can be written to /dev/psm%d and status can
+ be read back from it. Therefore, an application is responsible
+ for status validation and error recovery. It is a no-op in
+ other operation levels.
+
20080312:
Support for KSE threading has been removed from the kernel. To
run legacy applications linked against KSE libmap.conf may
@@ -1007,4 +1014,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $
+$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $
==== //depot/projects/mips2/src/bin/ls/print.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.77 2008/04/04 03:57:46 grog Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.78 2008/04/05 21:26:25 imp Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -168,7 +168,7 @@
prevdev = sp->st_dev;
}
np = p->fts_pointer;
- (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink,
+ (void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink,
sp->st_nlink, dp->s_user, np->user, dp->s_group,
np->group);
if (f_flags)
@@ -388,7 +388,7 @@
format = d_first ? "%e %b %R" : "%b %e %R";
else
/* mmm dd yyyy || dd mmm yyyy */
- format = d_first ? "%e %b %Y" : "%b %e %Y";
+ format = d_first ? "%e %b %Y" : "%b %e %Y";
strftime(longstring, sizeof(longstring), format, localtime(&ftime));
fputs(longstring, stdout);
fputc(' ', stdout);
==== //depot/projects/mips2/src/contrib/top/machine.h#5 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $
+ * $FreeBSD: src/contrib/top/machine.h,v 1.11 2008/04/11 11:39:26 ru Exp $
*/
/*
@@ -44,7 +44,6 @@
int *memory;
int *swap;
struct timeval boottime;
- unsigned long cpumask; /* bitfield of cpu states represented */
int ncpus;
};
==== //depot/projects/mips2/src/etc/defaults/rc.conf#9 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.330 2008/04/08 23:50:03 emax Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -105,6 +105,10 @@
#background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background.
synchronous_dhclient="YES" # Start dhclient directly on configured
# interfaces during startup.
+wpa_supplicant_program="/usr/sbin/wpa_supplicant"
+wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant
+wpa_supplicant_conf_file="/etc/wpa_supplicant.conf"
+#
firewall_enable="NO" # Set to YES to enable firewall functionality
firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall
firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall)
@@ -379,6 +383,19 @@
bthidd_config="/etc/bluetooth/bthidd.conf" # bthidd(8) configuration file
bthidd_hids="/var/db/bthidd.hids" # bthidd(8) known HID devices file
+rfcomm_pppd_server_enable="NO" # Enable rfcomm_pppd(8) in server mode (or NO)
+rfcomm_pppd_server_profile="one two" # Profile to use from /etc/ppp/ppp.conf
+#
+#rfcomm_pppd_server_one_bdaddr="" # Override local bdaddr for 'one'
+rfcomm_pppd_server_one_channel="1" # Override local channel for 'one'
+#rfcomm_pppd_server_one_register_sp="NO" # Override SP and DUN register
+#rfcomm_pppd_server_one_register_dun="NO" # for 'one'
+#
+#rfcomm_pppd_server_two_bdaddr="" # Override local bdaddr for 'two'
+rfcomm_pppd_server_two_channel="3" # Override local channel for 'two'
+#rfcomm_pppd_server_two_register_sp="NO" # Override SP and DUN register
+#rfcomm_pppd_server_two_register_dun="NO" # for 'two'
+
### Miscellaneous network options: ###
icmp_bmcastecho="NO" # respond to broadcast ping packets
==== //depot/projects/mips2/src/etc/rc.d/Makefile#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.90 2008/04/08 23:34:12 emax Exp $
.include <bsd.own.mk>
@@ -29,7 +29,7 @@
pf pflog pfsync \
powerd power_profile ppp pppoed pwcheck \
quota \
- random rarpd resolv root \
+ random rarpd resolv rfcomm_pppd_server root \
route6d routed routing rpcbind rtadvd rwho \
savecore sdpd securelevel sendmail \
serial sppp statd swap1 \
==== //depot/projects/mips2/src/etc/rc.d/ppp#6 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ppp,v 1.18 2008/03/28 07:57:51 brooks Exp $
+# $FreeBSD: src/etc/rc.d/ppp,v 1.20 2008/04/10 01:32:49 brooks Exp $
#
# PROVIDE: ppp
@@ -19,6 +19,7 @@
ppp_start_profile()
{
local _ppp_profile _ppp_mode _ppp_nat _ppp_unit
+ local _ppp_profile_cleaned _punct _punct_c
_ppp_profile=$1
_ppp_profile_cleaned=$1
@@ -61,7 +62,7 @@
# Check for hard wired unit
eval _ppp_unit=\$ppp_${_ppp_profile_cleaned}_unit
- if [ -n "_ppp_unit" ]; then
+ if [ -n "${_ppp_unit}" ]; then
_ppp_unit="-unit${_ppp_unit}"
fi
rc_flags="$rc_flags $_ppp_unit"
==== //depot/projects/mips2/src/etc/rc.d/wpa_supplicant#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.2 2005/10/19 22:26:47 jkim Exp $
+# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $
#
# PROVIDE: wpa_supplicant
@@ -12,27 +12,43 @@
name="wpa_supplicant"
rcvar=
-command="/usr/sbin/${name}"
-conf_file="/etc/wpa_supplicant.conf"
ifn="$2"
if [ -z "$ifn" ]; then
return 1
fi
+is_wired_interface()
+{
+ media=`ifconfig $1 2>/dev/null | while read line; do
+ case "$line" in
+ *media:?Ethernet*)
+ echo Ethernet
+ ;;
+ esac
+ done`
+ test "$media" = "Ethernet"
+}
+
case ${ifn} in
ndis*)
driver="ndis"
;;
*)
- driver="bsd"
+ if is_wired_interface ${ifn} ; then
+ driver="wired"
+ else
+ driver="bsd"
+ fi
;;
esac
load_rc_config $name
-pid_file="/var/run/${name}/${ifn}.pid"
-command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file"
+command=${wpa_supplicant_program}
+conf_file=${wpa_supplicant_conf_file}
+pidfile="/var/run/${name}/${ifn}.pid"
+command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile"
required_files=$conf_file
run_rc_command "$1"
==== //depot/projects/mips2/src/include/string.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)string.h 8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/string.h,v 1.25 2005/11/24 08:30:44 ru Exp $
+ * $FreeBSD: src/include/string.h,v 1.26 2008/04/10 00:12:43 delphij Exp $
*/
#ifndef _STRING_H_
@@ -59,6 +59,7 @@
void *memccpy(void * __restrict, const void * __restrict, int, size_t);
#endif
void *memchr(const void *, int, size_t) __pure;
+void *memrchr(const void *, int, size_t) __pure;
int memcmp(const void *, const void *, size_t) __pure;
void *memcpy(void * __restrict, const void * __restrict, size_t);
#if __BSD_VISIBLE
==== //depot/projects/mips2/src/include/unistd.h#6 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)unistd.h 8.12 (Berkeley) 4/27/95
- * $FreeBSD: src/include/unistd.h,v 1.86 2008/04/01 10:49:06 kib Exp $
+ * $FreeBSD: src/include/unistd.h,v 1.87 2008/04/10 12:13:56 kib Exp $
*/
#ifndef _UNISTD_H_
@@ -566,7 +566,7 @@
int fchownat(int, const char *, uid_t, gid_t, int);
int fexecve(int, char *const [], char *const []);
int linkat(int, const char *, int, const char *, int);
-ssize_t readlinkat(int, const char *, char *, size_t);
+ssize_t readlinkat(int, const char * __restrict, char * __restrict, size_t);
int symlinkat(const char *, int, const char *);
int unlinkat(int, const char *, int);
#endif /* __BSD_VISIBLE */
==== //depot/projects/mips2/src/lib/libc/string/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.37 2006/03/13 01:15:00 deischen Exp $
+# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.38 2008/04/10 00:12:44 delphij Exp $
.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string
@@ -7,7 +7,7 @@
# machine-independent string sources
MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c fls.c flsl.c index.c memccpy.c \
- memchr.c memcmp.c \
+ memchr.c memrchr.c memcmp.c \
memcpy.c memmem.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c \
strcat.c strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c \
strerror.c strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c \
@@ -39,6 +39,7 @@
MLINKS+=ffs.3 fls.3
MLINKS+=ffs.3 flsl.3
MLINKS+=index.3 rindex.3
+MLINKS+=memchr.3 memrchr.3
MLINKS+=strcasecmp.3 strncasecmp.3
MLINKS+=strcat.3 strncat.3
MLINKS+=strchr.3 strrchr.3
==== //depot/projects/mips2/src/lib/libc/string/Symbol.map#3 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.2 2007/04/29 14:05:19 deischen Exp $
+ * $FreeBSD: src/lib/libc/string/Symbol.map,v 1.3 2008/04/10 00:12:44 delphij Exp $
*/
FBSD_1.0 {
@@ -77,6 +77,10 @@
wmemset;
};
+FBSD_1.1 {
+ memrchr;
+};
+
FBSDprivate_1.0 {
__strtok_r;
};
==== //depot/projects/mips2/src/lib/libc/string/memchr.3#3 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)memchr.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.9 2007/01/09 00:28:12 imp Exp $
+.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.10 2008/04/10 00:12:44 delphij Exp $
.\"
-.Dd June 4, 1993
+.Dd April 9, 2008
.Dt MEMCHR 3
.Os
.Sh NAME
@@ -44,6 +44,8 @@
.In string.h
.Ft void *
.Fn memchr "const void *b" "int c" "size_t len"
+.Ft void *
+.Fn memrchr "const void *b" "int c" "size_t len"
.Sh DESCRIPTION
The
.Fn memchr
@@ -53,11 +55,22 @@
(converted to an unsigned char)
in string
.Fa b .
+.Pp
+The
+.Fn memrchr
+function behaves like
+.Fn memchr ,
+except that it locates the last occurrence of
+.Fa c
+in string
+.Fa b .
.Sh RETURN VALUES
The
.Fn memchr
-function
-returns a pointer to the byte located,
+and
+.Fn memrchr
+functions
+return a pointer to the byte located,
or NULL if no such byte exists within
.Fa len
bytes.
@@ -77,3 +90,15 @@
function
conforms to
.St -isoC .
+.Pp
+The
+.Fn memrchr
+function is a GNU extension and conforms to no standard.
+.Sh HISTORY
+The
+.Fn memrchr
+function first appeared in GNU libc 2.1.91, this implementation
+first appeared in
+.Fx 8.0 ,
+coming from
+.Ox 4.3 .
==== //depot/projects/mips2/src/lib/libc/sys/Symbol.map#10 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.13 2008/03/31 12:14:04 kib Exp $
+ * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.14 2008/04/07 13:53:51 deischen Exp $
*/
/*
@@ -66,11 +66,6 @@
clock_settime;
close;
connect;
- cpuset;
- cpuset_getid;
- cpuset_setid;
- cpuset_getaffinity;
- cpuset_setaffinity;
dup;
dup2;
eaccess;
@@ -335,6 +330,11 @@
};
FBSD_1.1 {
+ cpuset;
+ cpuset_getid;
+ cpuset_setid;
+ cpuset_getaffinity;
+ cpuset_setaffinity;
faccessat;
fchmodat;
fchownat;
==== //depot/projects/mips2/src/lib/libstand/nfs.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.12 2004/01/21 20:12:23 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.13 2008/04/05 15:03:29 dfr Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -412,9 +412,16 @@
return (ENXIO);
}
+ /*
+ * This is silly - we should look at dv_type but that value is
+ * arch dependant and we can't use it here.
+ */
#ifndef __i386__
if (strcmp(f->f_dev->dv_name, "net") != 0)
return(EINVAL);
+#else
+ if (strcmp(f->f_dev->dv_name, "pxe") != 0)
+ return(EINVAL);
#endif
if (!(desc = socktodesc(*(int *)(f->f_devdata))))
==== //depot/projects/mips2/src/libexec/rtld-elf/rtld.c#7 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.124 2007/05/17 18:00:27 csjp Exp $
+ * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.125 2008/04/04 20:59:26 imp Exp $
*/
/*
==== //depot/projects/mips2/src/libexec/rtld-elf/rtld.h#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/libexec/rtld-elf/rtld.h,v 1.38 2007/04/03 18:31:20 kan Exp $
+ * $FreeBSD: src/libexec/rtld-elf/rtld.h,v 1.39 2008/04/04 20:59:26 imp Exp $
*/
#ifndef RTLD_H /* { */
==== //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#16 (text+ko) ====
@@ -20,7 +20,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1083 2008/03/31 05:06:00 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1084 2008/04/05 18:11:39 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -165,7 +165,7 @@
kernel bug reports that are rich in debugging information, but
are not dependent on kernel symbol tables or precisely
synchronized source code. More information can be found in the
- &man.textdump.4; manual page.</para>
+ &man.textdump.4; manual page. &merged;</para>
<para>Kernel support for M:N threading has been removed. While
the KSE (Kernel Scheduled Entities) project was quite successful
@@ -184,6 +184,10 @@
<para>[&arch.amd64;] The &os; kernel now has support for large
memory page mappings (<quote>superpages</quote>).</para>
+ <para>[&arch.amd64;, &arch.i386;, &arch.powerpc;] The ULE
+ scheduler is now the default process scheduler
+ in <filename>GENERIC</filename> kernels. &merged;</para>
+
<sect3 id="boot">
<title>Boot Loader Changes</title>
@@ -205,11 +209,11 @@
<title>Hardware Support</title>
<para>The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
- PCMCIA smartcard readers, has been added.</para>
+ PCMCIA smartcard readers, has been added. &merged;</para>
<para>The &man.uslcom.4; driver, a driver for Silicon
Laboratories CP2101/CP2102-based USB serial adapters, has been
- imported from OpenBSD.</para>
+ imported from OpenBSD. &merged;</para>
<sect4 id="mm">
<title>Multimedia Support</title>
@@ -271,6 +275,9 @@
<sect3 id="disks">
<title>Disks and Storage</title>
+ <para>The &man.aac.4; driver now supports volumes larger than
+ 2TB in size. &merged;</para>
+
<para>The &man.ata.4; driver now supports a spindown command for
disks; after a configurable amount of time, if no requests
have been received for a disk, the disk will be spun down
@@ -289,12 +296,21 @@
<para>A problem with using &man.mmap.2; on ZFS filesystems has
been fixed.</para>
+ <para>A new kernel-mode NFS lock manager has been added,
+ improving performance and behavior of NFS locking. A new
+ &man.clear.locks.8; command has been added to clear locks held
+ on behalf of an NFS client.</para>
+
</sect3>
</sect2>
<sect2 id="userland">
<title>Userland Changes</title>
+ <para>The &man.adduser.8; utility now supports
+ a <option>-M</option> option to set the mode of a new user's
+ home directory. &merged;</para>
+
<para>BSD-licensed versions of &man.ar.1; and &man.ranlib.1;,
based on <filename>libarchive</filename>, have replaced the GNU
Binutils versions of these utilities.</para>
@@ -316,6 +332,13 @@
command to make it easier to debug crash dumps with kernel
modules.</para>
+ <para>The &man.ls.1; program now supports a <option>-D</option>
+ option to specify a date format string to be used with the long
+ format (<option>-l</option>) output.</para>
+
+ <para>&man.nc.1; now supports a <option>-O</option> switch to
+ disable the use of TCP options.</para>
+
<para>The &man.procstat.1; utility has been added to display
detailed information about processes.</para>
@@ -395,7 +418,11 @@
<sect2 id="ports">
<title>Ports/Packages Collection Infrastructure</title>
- <para></para>
+ <para>The pkg_sign and pkg_check utilities for cryptographically
+ signing &os; packages have been removed. They were only useful
+ for packages compressed using &man.gzip.1;; however
+ &man.bzip2.1; compression has been the norm for some time
+ now.</para>
</sect2>
==== //depot/projects/mips2/src/release/ia64/mkisoimages.sh#2 (text+ko) ====
@@ -4,7 +4,7 @@
# Author: Jordan K Hubbard
# Date: 22 June 2001
#
-# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.11 2005/01/30 21:10:52 kensmith Exp $
+# $FreeBSD: src/release/ia64/mkisoimages.sh,v 1.12 2008/04/08 02:57:59 marcel Exp $
#
# This script is used by release/Makefile to build the (optional) ISO images
# for a FreeBSD release. It is considered architecture dependent since each
@@ -67,7 +67,7 @@
# To create a bootable CD under EFI, the boot image should be an EFI
# system partition.
if [ $bootable = yes ]; then
- EFISZ=32768
+ EFISZ=40960
MNT=/mnt
dd if=/dev/zero of=$BASE/$EFIPART count=$EFISZ
md=`mdconfig -a -t vnode -f $BASE/$EFIPART`
==== //depot/projects/mips2/src/sbin/fsck_ffs/fsck.h#3 (text+ko) ====
@@ -57,7 +57,7 @@
* SUCH DAMAGE.
*
* @(#)fsck.h 8.4 (Berkeley) 5/9/95
- * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.37 2006/10/31 22:06:56 pjd Exp $
+ * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.38 2008/04/10 23:49:23 delphij Exp $
*/
#include <unistd.h>
@@ -270,6 +270,7 @@
int bkgrdflag; /* use a snapshot to run on an active system */
int bflag; /* location of alternate super block */
int debug; /* output debugging info */
+char catastrophicflag; /* run in catastrophic mode */
int cvtlevel; /* convert to newer file system format */
int bkgrdcheck; /* determine if background check is possible */
int bkgrdsumadj; /* whether the kernel have ability to adjust superblock summary */
@@ -335,6 +336,7 @@
void catch(int);
void catchquit(int);
int changeino(ino_t dir, const char *name, ino_t newnum);
+void check_cgmagic(int cg, struct cg *cgp);
int chkrange(ufs2_daddr_t blk, int cnt);
void ckfini(int markclean);
int ckinode(union dinode *dp, struct inodesc *);
==== //depot/projects/mips2/src/sbin/fsck_ffs/fsck_ffs.8#2 (text+ko) ====
@@ -27,9 +27,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fsck.8 8.4 (Berkeley) 5/9/95
-.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34 2005/09/20 08:02:38 delphij Exp $
+.\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.35 2008/04/10 23:49:23 delphij Exp $
.\"
-.Dd April 24, 2001
+.Dd April 10, 2008
.Dt FSCK_FFS 8
.Os
.Sh NAME
@@ -38,7 +38,7 @@
.Nd file system consistency check and interactive repair
.Sh SYNOPSIS
.Nm
-.Op Fl BFpfny
+.Op Fl BCFpfny
.Op Fl b Ar block
.Op Fl c Ar level
.Op Fl m Ar mode
@@ -175,6 +175,26 @@
the super block for the file system.
An alternate super block is usually located at block 32 for UFS1,
and block 160 for UFS2.
+.It Fl C
+Run
+.Nm
+in 'catastrophic recovery' mode, which will enable certain aggressive
+operations that can make
+.Nm
+to survive with file systems that has very serious data damage, which
+is an useful last resort when on disk data damage is very serious
+and causes
+.Nm
+to crash otherwise. Be
+.Em very careful
+using this flag, is dangerous if there are data transmission hazards
+because a false positive cylinder group magic number mismatch could
+cause
+.Em irrevertible data loss!
+.Pp
+This option implies the
+.Fl f
+flag.
.It Fl c
Convert the file system to the specified level.
Note that the level of a file system can only be raised.
==== //depot/projects/mips2/src/sbin/fsck_ffs/fsutil.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.26 2006/10/31 22:06:56 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.27 2008/04/10 23:49:23 delphij Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -418,6 +418,35 @@
}
/*
+ * Check cg's magic number. If catastrophic mode is enabled and the cg's
+ * magic number is bad, offer an option to clear the whole cg.
+ */
+void
+check_cgmagic(int cg, struct cg *cgp)
+{
+
+ if (!cg_chkmagic(cgp)) {
+ pwarn("CG %d: BAD MAGIC NUMBER\n", cg);
+ if (catastrophicflag) {
+ if (reply("CLEAR CG")) {
+ memset(cgp, 0, (size_t)sblock.fs_cgsize);
+ cgp->cg_initediblk = sblock.fs_ipg;
+ cgp->cg_old_niblk = sblock.fs_ipg;
+ cgp->cg_old_ncyl = sblock.fs_old_cpg;
+ cgp->cg_cgx = cg;
+ cgp->cg_niblk = sblock.fs_ipg;
+ cgp->cg_ndblk = sblock.fs_size - cgbase(&sblock, cg);
+ cgp->cg_magic = CG_MAGIC;
+ cgdirty();
+ printf("PLEASE RERUN FSCK.\n");
+ rerun = 1;
+ }
+ } else
+ printf("YOU MAY NEED TO RERUN FSCK WITH -C IF IT CRASHED.\n");
+ }
+}
+
+/*
* allocate a data block with the specified number of fragments
*/
ufs2_daddr_t
@@ -441,8 +470,7 @@
}
cg = dtog(&sblock, i + j);
getblk(&cgblk, cgtod(&sblock, cg), sblock.fs_cgsize);
- if (!cg_chkmagic(cgp))
- pfatal("CG %d: BAD MAGIC NUMBER\n", cg);
+ check_cgmagic(cg, cgp);
baseblk = dtogd(&sblock, i + j);
for (k = 0; k < frags; k++) {
setbmap(i + j + k);
==== //depot/projects/mips2/src/sbin/fsck_ffs/inode.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38 2006/10/31 22:06:56 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.39 2008/04/10 23:49:23 delphij Exp $");
#include <sys/param.h>
#include <sys/stdint.h>
@@ -617,8 +617,7 @@
return (0);
cg = ino_to_cg(&sblock, ino);
getblk(&cgblk, cgtod(&sblock, cg), sblock.fs_cgsize);
- if (!cg_chkmagic(cgp))
- pfatal("CG %d: BAD MAGIC NUMBER\n", cg);
+ check_cgmagic(cg, cgp);
setbit(cg_inosused(cgp), ino % sblock.fs_ipg);
cgp->cg_cs.cs_nifree--;
switch (type & IFMT) {
==== //depot/projects/mips2/src/sbin/fsck_ffs/main.c#7 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.50 2008/04/04 01:50:58 rodrigc Exp $");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.51 2008/04/10 23:49:23 delphij Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -81,7 +81,8 @@
sync();
skipclean = 1;
- while ((ch = getopt(argc, argv, "b:Bc:dfFm:npy")) != -1) {
+ catastrophicflag = 0;
+ while ((ch = getopt(argc, argv, "b:Bc:CdfFm:npy")) != -1) {
switch (ch) {
case 'b':
skipclean = 0;
@@ -105,6 +106,10 @@
debug++;
break;
+ case 'C':
+ catastrophicflag = 1;
+ /* FALLTHROUGH */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list