PERFORCE change 180167 for review
Rafal Jaworowski
raj at FreeBSD.org
Wed Jun 23 21:10:04 UTC 2010
http://p4web.freebsd.org/@@180167?ac=10
Change 180167 by raj at raj_nand on 2010/06/23 21:09:41
IFC @180164
Affected files ...
.. //depot/projects/nand2/Makefile.inc1#4 integrate
.. //depot/projects/nand2/bin/pkill/pkill.1#2 integrate
.. //depot/projects/nand2/bin/pkill/pkill.c#2 integrate
.. //depot/projects/nand2/bin/sh/parser.c#4 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 integrate
.. //depot/projects/nand2/contrib/binutils/binutils/doc/readelf.1#2 integrate
.. //depot/projects/nand2/etc/login.conf#2 integrate
.. //depot/projects/nand2/etc/namedb/named.root#2 integrate
.. //depot/projects/nand2/etc/periodic/daily/Makefile#2 integrate
.. //depot/projects/nand2/gnu/lib/csu/Makefile#2 integrate
.. //depot/projects/nand2/lib/Makefile#4 integrate
.. //depot/projects/nand2/lib/csu/i386-elf/crt1_s.S#2 integrate
.. //depot/projects/nand2/lib/libc/nls/ru_RU.KOI8-R.msg#2 integrate
.. //depot/projects/nand2/lib/libkvm/kvm_proc.c#2 integrate
.. //depot/projects/nand2/libexec/rtld-elf/mips/rtld_start.S#2 integrate
.. //depot/projects/nand2/release/scripts/ports-install.sh#2 integrate
.. //depot/projects/nand2/sbin/fsck_ffs/main.c#3 integrate
.. //depot/projects/nand2/sbin/fsck_ffs/suj.c#2 integrate
.. //depot/projects/nand2/sbin/fsck_msdosfs/Makefile#2 integrate
.. //depot/projects/nand2/sbin/fsck_msdosfs/boot.c#2 integrate
.. //depot/projects/nand2/sbin/fsck_msdosfs/check.c#2 integrate
.. //depot/projects/nand2/sbin/fsck_msdosfs/dir.c#2 integrate
.. //depot/projects/nand2/sbin/fsck_msdosfs/fat.c#2 integrate
.. //depot/projects/nand2/sbin/geom/class/part/geom_part.c#3 integrate
.. //depot/projects/nand2/sbin/geom/class/sched/gsched.8#2 integrate
.. //depot/projects/nand2/sbin/geom/core/geom.c#2 integrate
.. //depot/projects/nand2/sbin/geom/core/geom.h#2 integrate
.. //depot/projects/nand2/sbin/geom/misc/subr.c#3 integrate
.. //depot/projects/nand2/sbin/geom/misc/subr.h#2 integrate
.. //depot/projects/nand2/sbin/ping/ping.c#2 integrate
.. //depot/projects/nand2/sbin/ping6/ping6.c#3 integrate
.. //depot/projects/nand2/share/examples/perfmon/perfmon.c#2 integrate
.. //depot/projects/nand2/share/man/man7/Makefile#2 integrate
.. //depot/projects/nand2/share/man/man7/c99.7#1 branch
.. //depot/projects/nand2/sys/amd64/amd64/apic_vector.S#4 integrate
.. //depot/projects/nand2/sys/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/nand2/sys/amd64/amd64/mp_machdep.c#4 integrate
.. //depot/projects/nand2/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/nand2/sys/amd64/ia32/ia32_signal.c#5 integrate
.. //depot/projects/nand2/sys/amd64/include/apicvar.h#4 integrate
.. //depot/projects/nand2/sys/amd64/include/smp.h#2 integrate
.. //depot/projects/nand2/sys/arm/include/bootinfo.h#3 branch
.. //depot/projects/nand2/sys/arm/mv/discovery/db78xxx.c#3 delete
.. //depot/projects/nand2/sys/boot/ficl/ficl.h#2 integrate
.. //depot/projects/nand2/sys/boot/forth/loader.conf#3 integrate
.. //depot/projects/nand2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate
.. //depot/projects/nand2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate
.. //depot/projects/nand2/sys/compat/x86bios/x86bios.c#4 integrate
.. //depot/projects/nand2/sys/compat/x86bios/x86bios.h#2 integrate
.. //depot/projects/nand2/sys/conf/NOTES#4 integrate
.. //depot/projects/nand2/sys/conf/files#6 integrate
.. //depot/projects/nand2/sys/conf/files.amd64#4 integrate
.. //depot/projects/nand2/sys/conf/files.i386#3 integrate
.. //depot/projects/nand2/sys/conf/files.mips#3 integrate
.. //depot/projects/nand2/sys/conf/options.amd64#3 integrate
.. //depot/projects/nand2/sys/dev/acpica/acpi_cpu.c#4 integrate
.. //depot/projects/nand2/sys/dev/acpica/acpi_hpet.c#3 integrate
.. //depot/projects/nand2/sys/dev/acpica/acpi_hpet.h#2 integrate
.. //depot/projects/nand2/sys/dev/agp/agp_nvidia.c#2 integrate
.. //depot/projects/nand2/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate
.. //depot/projects/nand2/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate
.. //depot/projects/nand2/sys/dev/e1000/if_em.c#4 integrate
.. //depot/projects/nand2/sys/dev/e1000/if_igb.c#5 integrate
.. //depot/projects/nand2/sys/dev/e1000/if_igb.h#4 integrate
.. //depot/projects/nand2/sys/dev/e1000/if_lem.c#3 integrate
.. //depot/projects/nand2/sys/dev/fb/fbreg.h#2 integrate
.. //depot/projects/nand2/sys/dev/fb/vesa.c#4 integrate
.. //depot/projects/nand2/sys/dev/hptiop/hptiop.c#2 integrate
.. //depot/projects/nand2/sys/dev/hptmv/entry.c#2 integrate
.. //depot/projects/nand2/sys/dev/iicbus/iiconf.c#2 integrate
.. //depot/projects/nand2/sys/dev/ofw/ofw_bus_subr.c#3 integrate
.. //depot/projects/nand2/sys/dev/ofw/ofw_bus_subr.h#3 integrate
.. //depot/projects/nand2/sys/dev/sound/usb/uaudio.c#3 integrate
.. //depot/projects/nand2/sys/dev/sound/usb/uaudioreg.h#2 integrate
.. //depot/projects/nand2/sys/dev/twa/tw_cl_misc.c#3 integrate
.. //depot/projects/nand2/sys/dev/usb/controller/ehci.c#3 integrate
.. //depot/projects/nand2/sys/dev/usb/controller/ohci.c#2 integrate
.. //depot/projects/nand2/sys/dev/usb/controller/uhci.c#3 integrate
.. //depot/projects/nand2/sys/dev/usb/net/if_rue.c#3 integrate
.. //depot/projects/nand2/sys/dev/usb/quirk/usb_quirk.c#4 integrate
.. //depot/projects/nand2/sys/dev/usb/usb_transfer.c#4 integrate
.. //depot/projects/nand2/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/nand2/sys/dev/usb/wlan/if_upgt.c#3 integrate
.. //depot/projects/nand2/sys/fs/nwfs/nwfs_io.c#3 integrate
.. //depot/projects/nand2/sys/fs/smbfs/smbfs_io.c#3 integrate
.. //depot/projects/nand2/sys/fs/udf/udf_vnops.c#3 integrate
.. //depot/projects/nand2/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/nand2/sys/i386/i386/identcpu.c#4 integrate
.. //depot/projects/nand2/sys/i386/i386/machdep.c#4 integrate
.. //depot/projects/nand2/sys/i386/i386/mp_machdep.c#4 integrate
.. //depot/projects/nand2/sys/i386/i386/support.s#2 integrate
.. //depot/projects/nand2/sys/i386/i386/vm_machdep.c#3 integrate
.. //depot/projects/nand2/sys/i386/include/apicvar.h#4 integrate
.. //depot/projects/nand2/sys/i386/include/md_var.h#3 integrate
.. //depot/projects/nand2/sys/i386/include/npx.h#3 integrate
.. //depot/projects/nand2/sys/i386/include/pcb.h#3 integrate
.. //depot/projects/nand2/sys/i386/isa/npx.c#3 integrate
.. //depot/projects/nand2/sys/isa/rtc.h#2 integrate
.. //depot/projects/nand2/sys/kern/kern_acct.c#2 integrate
.. //depot/projects/nand2/sys/kern/kern_clock.c#3 integrate
.. //depot/projects/nand2/sys/kern/kern_conf.c#3 integrate
.. //depot/projects/nand2/sys/kern/kern_et.c#1 branch
.. //depot/projects/nand2/sys/kern/kern_malloc.c#2 integrate
.. //depot/projects/nand2/sys/kern/kern_mbuf.c#2 integrate
.. //depot/projects/nand2/sys/kern/kern_module.c#3 integrate
.. //depot/projects/nand2/sys/kern/kern_resource.c#3 integrate
.. //depot/projects/nand2/sys/kern/kern_sdt.c#2 integrate
.. //depot/projects/nand2/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/nand2/sys/kern/kern_tc.c#3 integrate
.. //depot/projects/nand2/sys/kern/kern_umtx.c#3 integrate
.. //depot/projects/nand2/sys/kern/makesyscalls.sh#2 integrate
.. //depot/projects/nand2/sys/kern/subr_bus.c#3 integrate
.. //depot/projects/nand2/sys/kern/subr_devstat.c#2 integrate
.. //depot/projects/nand2/sys/kern/subr_fattime.c#2 integrate
.. //depot/projects/nand2/sys/kern/subr_lock.c#3 integrate
.. //depot/projects/nand2/sys/kern/subr_mchain.c#2 integrate
.. //depot/projects/nand2/sys/kern/subr_module.c#2 integrate
.. //depot/projects/nand2/sys/kern/subr_trap.c#3 integrate
.. //depot/projects/nand2/sys/kern/subr_unit.c#2 integrate
.. //depot/projects/nand2/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/nand2/sys/kern/sys_process.c#4 integrate
.. //depot/projects/nand2/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/nand2/sys/kern/uipc_mbuf.c#3 integrate
.. //depot/projects/nand2/sys/kern/uipc_mbuf2.c#2 integrate
.. //depot/projects/nand2/sys/kern/uipc_mqueue.c#3 integrate
.. //depot/projects/nand2/sys/kern/uipc_syscalls.c#4 integrate
.. //depot/projects/nand2/sys/kern/vfs_cache.c#3 integrate
.. //depot/projects/nand2/sys/kern/vfs_subr.c#3 integrate
.. //depot/projects/nand2/sys/mips/atheros/ar71xx_wdog.c#2 integrate
.. //depot/projects/nand2/sys/mips/atheros/ar71xxreg.h#2 integrate
.. //depot/projects/nand2/sys/mips/include/cpu.h#3 integrate
.. //depot/projects/nand2/sys/mips/include/pmap.h#4 integrate
.. //depot/projects/nand2/sys/mips/include/pte.h#3 integrate
.. //depot/projects/nand2/sys/mips/include/tlb.h#1 branch
.. //depot/projects/nand2/sys/mips/include/vm.h#2 integrate
.. //depot/projects/nand2/sys/mips/mips/cpu.c#3 integrate
.. //depot/projects/nand2/sys/mips/mips/machdep.c#3 integrate
.. //depot/projects/nand2/sys/mips/mips/mp_machdep.c#4 integrate
.. //depot/projects/nand2/sys/mips/mips/pmap.c#4 integrate
.. //depot/projects/nand2/sys/mips/mips/tlb.c#1 branch
.. //depot/projects/nand2/sys/mips/mips/trap.c#4 integrate
.. //depot/projects/nand2/sys/mips/mips/vm_machdep.c#4 integrate
.. //depot/projects/nand2/sys/mips/rmi/board.c#2 integrate
.. //depot/projects/nand2/sys/mips/rmi/board.h#2 integrate
.. //depot/projects/nand2/sys/mips/rmi/dev/xlr/rge.c#3 integrate
.. //depot/projects/nand2/sys/modules/mqueue/Makefile#2 integrate
.. //depot/projects/nand2/sys/netinet/sctp.h#2 integrate
.. //depot/projects/nand2/sys/netinet/sctp_pcb.c#5 integrate
.. //depot/projects/nand2/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/nand2/sys/netinet/sctputil.c#4 integrate
.. //depot/projects/nand2/sys/pc98/cbus/clock.c#3 integrate
.. //depot/projects/nand2/sys/pc98/include/npx.h#2 integrate
.. //depot/projects/nand2/sys/pc98/pc98/machdep.c#4 integrate
.. //depot/projects/nand2/sys/powerpc/aim/interrupt.c#3 integrate
.. //depot/projects/nand2/sys/powerpc/aim/mmu_oea.c#3 integrate
.. //depot/projects/nand2/sys/powerpc/aim/nexus.c#3 integrate
.. //depot/projects/nand2/sys/powerpc/booke/interrupt.c#3 integrate
.. //depot/projects/nand2/sys/powerpc/include/intr_machdep.h#3 integrate
.. //depot/projects/nand2/sys/powerpc/include/ocpbus.h#2 integrate
.. //depot/projects/nand2/sys/powerpc/include/openpicvar.h#2 integrate
.. //depot/projects/nand2/sys/powerpc/mpc85xx/atpic.c#2 integrate
.. //depot/projects/nand2/sys/powerpc/mpc85xx/isa.c#2 integrate
.. //depot/projects/nand2/sys/powerpc/mpc85xx/ocpbus.c#3 integrate
.. //depot/projects/nand2/sys/powerpc/mpc85xx/ocpbus.h#3 integrate
.. //depot/projects/nand2/sys/powerpc/mpc85xx/opic.c#2 integrate
.. //depot/projects/nand2/sys/powerpc/mpc85xx/pci_ocp.c#3 integrate
.. //depot/projects/nand2/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate
.. //depot/projects/nand2/sys/powerpc/ofw/ofw_pcibus.c#3 integrate
.. //depot/projects/nand2/sys/powerpc/powermac/cpcht.c#3 integrate
.. //depot/projects/nand2/sys/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/nand2/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/nand2/sys/powerpc/powermac/kiic.c#3 integrate
.. //depot/projects/nand2/sys/powerpc/powermac/macgpio.c#3 integrate
.. //depot/projects/nand2/sys/powerpc/powermac/macio.c#2 integrate
.. //depot/projects/nand2/sys/powerpc/powermac/openpic_macio.c#2 integrate
.. //depot/projects/nand2/sys/powerpc/powermac/uninorth.c#4 integrate
.. //depot/projects/nand2/sys/powerpc/powermac/uninorthpci.c#2 integrate
.. //depot/projects/nand2/sys/powerpc/powerpc/intr_machdep.c#3 integrate
.. //depot/projects/nand2/sys/powerpc/powerpc/mp_machdep.c#2 integrate
.. //depot/projects/nand2/sys/powerpc/powerpc/openpic.c#3 integrate
.. //depot/projects/nand2/sys/powerpc/powerpc/pic_if.m#2 integrate
.. //depot/projects/nand2/sys/sparc64/ebus/ebus.c#2 integrate
.. //depot/projects/nand2/sys/sparc64/isa/ofw_isa.c#2 integrate
.. //depot/projects/nand2/sys/sparc64/pci/fire.c#2 integrate
.. //depot/projects/nand2/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate
.. //depot/projects/nand2/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/nand2/sys/sparc64/pci/schizo.c#4 integrate
.. //depot/projects/nand2/sys/sun4v/sun4v/hv_pci.c#2 integrate
.. //depot/projects/nand2/sys/sys/conf.h#3 integrate
.. //depot/projects/nand2/sys/sys/pcpu.h#4 integrate
.. //depot/projects/nand2/sys/sys/systm.h#3 integrate
.. //depot/projects/nand2/sys/sys/timeet.h#1 branch
.. //depot/projects/nand2/sys/ufs/ufs/ufs_lookup.c#3 integrate
.. //depot/projects/nand2/sys/vm/vm_page.c#4 integrate
.. //depot/projects/nand2/sys/vm/vm_page.h#3 integrate
.. //depot/projects/nand2/sys/vm/vm_pageout.c#4 integrate
.. //depot/projects/nand2/sys/x86/cpufreq/est.c#2 integrate
.. //depot/projects/nand2/sys/x86/isa/atrtc.c#2 integrate
.. //depot/projects/nand2/sys/x86/isa/clock.c#3 integrate
.. //depot/projects/nand2/sys/x86/x86/local_apic.c#2 integrate
.. //depot/projects/nand2/sys/x86/x86/timeevents.c#1 branch
.. //depot/projects/nand2/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate
.. //depot/projects/nand2/tools/tools/netrate/tcpp/README#3 integrate
.. //depot/projects/nand2/tools/tools/netrate/tcpp/parallelism.csh#1 branch
.. //depot/projects/nand2/tools/tools/netrate/tcpp/runit.pl#1 branch
.. //depot/projects/nand2/tools/tools/tinybsd/conf/default/TINYBSD#2 integrate
.. //depot/projects/nand2/tools/tools/tinybsd/conf/vpn/TINYBSD#2 integrate
.. //depot/projects/nand2/usr.bin/c99/c99.1#3 integrate
.. //depot/projects/nand2/usr.bin/du/du.1#2 integrate
.. //depot/projects/nand2/usr.bin/du/du.c#2 integrate
.. //depot/projects/nand2/usr.bin/systat/vmstat.c#2 integrate
.. //depot/projects/nand2/usr.bin/ypwhich/ypwhich.c#2 integrate
.. //depot/projects/nand2/usr.sbin/boot0cfg/boot0cfg.c#2 integrate
.. //depot/projects/nand2/usr.sbin/cpucontrol/amd.c#2 integrate
.. //depot/projects/nand2/usr.sbin/cpucontrol/intel.c#2 integrate
.. //depot/projects/nand2/usr.sbin/mptutil/mptutil.8#3 integrate
.. //depot/projects/nand2/usr.sbin/powerd/powerd.c#2 integrate
.. //depot/projects/nand2/usr.sbin/sysinstall/Makefile#3 integrate
.. //depot/projects/nand2/usr.sbin/sysinstall/devices.c#3 integrate
.. //depot/projects/nand2/usr.sbin/sysinstall/disks.c#4 integrate
.. //depot/projects/nand2/usr.sbin/sysinstall/dist.c#2 integrate
.. //depot/projects/nand2/usr.sbin/sysinstall/index.c#2 integrate
.. //depot/projects/nand2/usr.sbin/sysinstall/install.c#3 integrate
.. //depot/projects/nand2/usr.sbin/sysinstall/label.c#2 integrate
.. //depot/projects/nand2/usr.sbin/sysinstall/misc.c#2 integrate
.. //depot/projects/nand2/usr.sbin/sysinstall/sysinstall.8#3 integrate
.. //depot/projects/nand2/usr.sbin/sysinstall/sysinstall.h#3 integrate
.. //depot/projects/nand2/usr.sbin/timed/timed/measure.c#2 integrate
Differences ...
==== //depot/projects/nand2/Makefile.inc1#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.652 2010/06/13 13:02:43 raj Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.653 2010/06/16 16:52:35 raj Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1458,8 +1458,8 @@
DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
-FDT_DTS_FILE!= grep "^makeoptions[[:space:]]\+FDT_DTS_FILE" \
- ${KERNCONFDIR}/${KERNCONF} 2> /dev/null | cut -d= -f2
+FDT_DTS_FILE!= awk '/^makeoptions[[:space:]]+FDT_DTS_FILE/ {FS="=|[ \t]+"; print $$3}' \
+ ${KERNCONFDIR}/${KERNCONF}
.endif
.endif
==== //depot/projects/nand2/bin/pkill/pkill.1#2 (text+ko) ====
@@ -1,6 +1,6 @@
.\" $NetBSD: pkill.1,v 1.8 2003/02/14 15:59:18 grant Exp $
.\"
-.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.6 2010/03/02 07:20:46 joel Exp $
+.\" $FreeBSD: src/bin/pkill/pkill.1,v 1.7 2010/06/20 08:48:30 brian Exp $
.\"
.\" Copyright (c) 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -156,14 +156,16 @@
matches processes not in jail.
.It Fl l
Long output.
-Print the process name in addition to the process ID for each matching
+For
+.Nm pgrep ,
+print the process name in addition to the process ID for each matching
process.
If used in conjunction with
.Fl f ,
print the process ID and the full argument list for each matching process.
-This option can only be used with the
-.Nm pgrep
-command.
+For
+.Nm pkill ,
+display the kill command used for each process killed.
.It Fl n
Select only the newest (most recently started) of the matching processes.
.It Fl o
==== //depot/projects/nand2/bin/pkill/pkill.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.10 2010/03/02 07:20:46 joel Exp $");
+__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.11 2010/06/20 08:48:30 brian Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -128,7 +128,7 @@
{
char buf[_POSIX2_LINE_MAX], *mstr, **pargv, *p, *q, *pidfile;
const char *execf, *coref;
- int ancestors, debug_opt;
+ int ancestors, debug_opt, did_action;
int i, ch, bestidx, rv, criteria, pidfromfile, pidfilelock;
size_t jsz;
int (*action)(const struct kinfo_proc *);
@@ -242,8 +242,6 @@
criteria = 1;
break;
case 'l':
- if (!pgrep)
- usage();
longfmt = 1;
break;
case 'n':
@@ -530,16 +528,24 @@
/*
* Take the appropriate action for each matched process, if any.
*/
+ did_action = 0;
for (i = 0, rv = 0, kp = plist; i < nproc; i++, kp++) {
if (PSKIP(kp))
continue;
if (selected[i]) {
+ if (longfmt && !pgrep) {
+ did_action = 1;
+ printf("kill -%d %d\n", signum, kp->ki_pid);
+ }
if (inverse)
continue;
} else if (!inverse)
continue;
rv |= (*action)(kp);
}
+ if (!did_action && !pgrep && longfmt)
+ fprintf(stderr,
+ "No matching processes belonging to you were found\n");
exit(rv ? STATUS_MATCH : STATUS_NOMATCH);
}
@@ -552,7 +558,7 @@
if (pgrep)
ustr = "[-LSfilnoqvx] [-d delim]";
else
- ustr = "[-signal] [-ILfinovx]";
+ ustr = "[-signal] [-ILfilnovx]";
fprintf(stderr,
"usage: %s %s [-F pidfile] [-G gid] [-M core] [-N system]\n"
==== //depot/projects/nand2/bin/sh/parser.c#4 (text+ko) ====
@@ -36,10 +36,11 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.80 2010/05/30 14:20:32 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.81 2010/06/19 10:33:04 jilles Exp $");
#include <stdlib.h>
#include <unistd.h>
+#include <stdio.h>
#include "shell.h"
#include "parser.h"
==== //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 (text+ko) ====
@@ -45,7 +45,7 @@
#undef input
#undef unput
#else
-/*
+/*
* Define YY_INPUT for flex since input() can't be re-defined.
*/
#define YY_INPUT(buf,result,max_size) \
@@ -60,6 +60,19 @@
buf[n] = *yypcb->pcb_strptr++; \
result = n; \
}
+/*
+ * Do not EOF let tokens to be put back. This does not work with flex.
+ * On the other hand, leaving current buffer in same state it was when
+ * last EOF was received guarantees that input() will keep returning EOF
+ * for all subsequent invocations, which is the effect desired.
+ */
+#undef unput
+#define unput(c) \
+ do { \
+ int _c = c; \
+ if (_c != EOF) \
+ yyunput(_c, yytext_ptr); \
+ } while(0)
#endif
static int id_or_type(const char *);
@@ -811,8 +824,7 @@
longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
}
- if (c0 != EOF)
- unput(c0);
+ unput(c0);
return (ttok);
}
==== //depot/projects/nand2/contrib/binutils/binutils/doc/readelf.1#2 (text+ko) ====
@@ -247,14 +247,6 @@
.PD
Displays the contents of the file's unwind section, if it has one. Only
the unwind sections for \s-1IA64\s0 \s-1ELF\s0 files are currently supported.
-.IP "\fB\-u\fR" 4
-.IX Item "-u"
-.PD 0
-.IP "\fB\-\-unwind\fR" 4
-.IX Item "--unwind"
-.PD
-Displays the contents of the file's unwind section, if it has one. Only
-the unwind sections for \s-1IA64\s0 \s-1ELF\s0 files are currently supported.
.IP "\fB\-d\fR" 4
.IX Item "-d"
.PD 0
==== //depot/projects/nand2/etc/login.conf#2 (text+ko) ====
@@ -7,7 +7,7 @@
# This file controls resource limits, accounting limits and
# default user environment settings.
#
-# $FreeBSD: src/etc/login.conf,v 1.53 2009/06/23 20:57:27 kib Exp $
+# $FreeBSD: src/etc/login.conf,v 1.54 2010/06/19 09:21:34 brian Exp $
#
# Default settings effectively disable resource limits, see the
@@ -228,7 +228,7 @@
#
#
##
-## The dialer class should be used for a dialup PPP/SLIP accounts
+## The dialer class should be used for a dialup PPP account
## Welcome messages/news suppressed
##
#dialer:\
@@ -247,7 +247,7 @@
#
#
##
-## Site full-time 24/7 PPP/SLIP connections
+## Site full-time 24/7 PPP connection
## - no time accounting, restricted to access via dialin lines
##
#site:\
@@ -306,11 +306,6 @@
# :tc=subscriber:
#
#
-#subslip|SLIP Subscriber Accounts:\
-# :tc=dialer:\
-# :tc=subscriber:
-#
-#
#subshell|Shell Subscriber Accounts:\
# :tc=subscriber:
#
==== //depot/projects/nand2/etc/namedb/named.root#2 (text+ko) ====
@@ -1,5 +1,5 @@
;
-; $FreeBSD: src/etc/namedb/named.root,v 1.15 2009/12/11 01:06:04 dougb Exp $
+; $FreeBSD: src/etc/namedb/named.root,v 1.16 2010/06/18 08:11:52 dougb Exp $
;
; This file holds the information on root name servers needed to
@@ -13,8 +13,8 @@
; on server FTP.INTERNIC.NET
; -OR- RS.INTERNIC.NET
;
-; last update: Dec 12, 2008
-; related version of root zone: 2008121200
+; last update: Jun 17, 2010
+; related version of root zone: 2010061700
;
; formerly NS.INTERNIC.NET
;
@@ -63,6 +63,7 @@
;
. 3600000 NS I.ROOT-SERVERS.NET.
I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17
+I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FE::53
;
; OPERATED BY VERISIGN, INC.
;
==== //depot/projects/nand2/etc/periodic/daily/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.17 2008/09/21 22:02:26 sam Exp $
+# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.18 2010/06/17 12:25:47 netchild Exp $
.include <bsd.own.mk>
@@ -8,7 +8,6 @@
200.backup-passwd \
330.news \
400.status-disks \
- 404.status-zfs \
405.status-ata-raid \
406.status-gmirror \
407.status-graid3 \
@@ -53,4 +52,9 @@
500.queuerun
.endif
+.if ${MK_ZFS} != "no"
+FILES+= 404.status-zfs \
+ 800.scrub-zfs
+.endif
+
.include <bsd.prog.mk>
==== //depot/projects/nand2/gnu/lib/csu/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.32 2009/02/21 15:04:31 ru Exp $
+# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.33 2010/06/18 11:09:51 kib Exp $
.include <bsd.own.mk>
MK_SSP= no
@@ -17,7 +17,8 @@
CFLAGS+= -DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3
CFLAGS+= -finhibit-size-directive -fno-inline-functions \
-fno-exceptions -fno-zero-initialized-in-bss \
- -fno-zero-initialized-in-bss -fno-toplevel-reorder
+ -fno-zero-initialized-in-bss -fno-toplevel-reorder \
+ -fno-asynchronous-unwind-tables -fno-omit-frame-pointer
CFLAGS+= -I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \
-I${CCDIR}/cc_tools
CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG}
==== //depot/projects/nand2/lib/Makefile#4 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.248 2010/06/09 19:57:20 rdivacky Exp $
+# $FreeBSD: src/lib/Makefile,v 1.249 2010/06/21 19:44:29 ed Exp $
.include <bsd.own.mk>
@@ -138,7 +138,7 @@
_libbsnmp= libbsnmp
.endif
-.if ${MK_CLANG} != "no"
+.if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT)
_clang= clang
.endif
==== //depot/projects/nand2/lib/csu/i386-elf/crt1_s.S#2 (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/lib/csu/i386-elf/crt1_s.S,v 1.1 2009/12/02 16:34:20 kib Exp $
+ * $FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.2 2010/06/18 11:10:39 kib Exp $
*/
@@ -30,15 +30,22 @@
.align 4
.globl _start
.type _start, @function
-_start: xorl %ebp,%ebp
+_start:
+ .cfi_startproc
+ xorl %ebp,%ebp
pushl %ebp
+ .cfi_def_cfa_offset 4
movl %esp,%ebp
+ .cfi_offset %ebp,-8
+ .cfi_def_cfa_register %ebp
andl $0xfffffff0,%esp # align stack
leal 8(%ebp),%eax
pushl %eax # argv
pushl 4(%ebp) # argc
pushl %edx # rtld cleanup
call _start1
+ int3
+ .cfi_endproc
.size _start, . - _start
- .ident "$FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.1 2009/12/02 16:34:20 kib Exp $"
+ .ident "$FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.2 2010/06/18 11:10:39 kib Exp $"
==== //depot/projects/nand2/lib/libc/nls/ru_RU.KOI8-R.msg#2 (text+ko) ====
@@ -1,4 +1,4 @@
-$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.2 2009/03/21 10:10:33 maxim Exp $
+$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.3 2010/06/20 06:52:10 maxim Exp $
$
$ Message catalog for ru_RU.KOI8-R locale
$
@@ -183,6 +183,16 @@
87 áÔÒÉÂÕÔ ÎÅ ÎÁÊÄÅÎ
$ EDOOFUS
88 ïÛÉÂËÁ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ
+$ EBADMSG
+89 ðÌÏÈÏÊ ÆÏÒÍÁÔ ÓÏÏÂÝÅÎÉÑ
+$ EMULTIHOP
+90 ðÏÐÙÔËÁ ÍÕÌØÔÉÈÏÐÁ
+$ ENOLINK
+91 ëÁÎÁÌ ÒÁÚÏÒ×ÁÎ
+$ EPROTO
+92 ïÛÉÂËÁ ÐÒÏÔÏËÏÌÁ
+$ ENOTCAPABLE
+93 îÅÄÏÓÔÁÔÏÞÎÏ ×ÏÚÍÏÖÎÏÓÔÅÊ
$
$ strsignal() support catalog
$
==== //depot/projects/nand2/lib/libkvm/kvm_proc.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.102 2009/12/10 21:16:16 brooks Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.103 2010/06/18 01:17:16 sbruno Exp $");
/*
* Proc traversal interface for kvm. ps and w are (probably) the exclusive
@@ -323,7 +323,12 @@
(void)kvm_read(kd, (u_long)proc.p_vmspace,
(char *)&vmspace, sizeof(vmspace));
kp->ki_size = vmspace.vm_map.size;
- kp->ki_rssize = vmspace.vm_swrss; /* XXX */
+ /*
+ * Approximate the kernel's method of calculating
+ * this field.
+ */
+#define pmap_resident_count(pm) ((pm)->pm_stats.resident_count)
+ kp->ki_rssize = pmap_resident_count(&vmspace.vm_pmap);
kp->ki_swrss = vmspace.vm_swrss;
kp->ki_tsize = vmspace.vm_tsize;
kp->ki_dsize = vmspace.vm_dsize;
==== //depot/projects/nand2/libexec/rtld-elf/mips/rtld_start.S#2 (text+ko) ====
@@ -27,7 +27,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/mips/rtld_start.S,v 1.2 2010/03/04 04:53:05 imp Exp $
+ * $FreeBSD: src/libexec/rtld-elf/mips/rtld_start.S,v 1.3 2010/06/16 16:39:01 jchandra Exp $
*/
#include <machine/asm.h>
@@ -68,7 +68,8 @@
move a0, s0 /* sp */
PTR_ADDU a1, sp, 2*PTR_SIZE /* &our atexit function */
PTR_ADDU a2, sp, 3*PTR_SIZE /* obj_main entry */
- jal _C_LABEL(_rtld) /* v0 = _rtld(sp, cleanup, objp) */
+ PTR_LA t9, _C_LABEL(_rtld)
+ jalr t9 /* v0 = _rtld(sp, cleanup, objp) */
nop
PTR_L a1, 2*PTR_SIZE(sp) /* our atexit function */
@@ -123,7 +124,7 @@
move s0, sp
move a0, v1 /* old GP */
- subu a0, a0, 0x7ff0 /* The offset of $gp from the */
+ PTR_SUBU a0, a0, 0x7ff0 /* The offset of $gp from the */
/* beginning of the .got section: */
/* $gp = .got + 0x7ff0, so */
/* .got = $gp - 0x7ff0 */
@@ -136,7 +137,8 @@
and a0, a0, 0x7fffffff
move a1, t8 /* symbol index */
- jal _C_LABEL(_mips_rtld_bind)
+ PTR_LA t9, _C_LABEL(_mips_rtld_bind)
+ jalr t9
nop
move sp, s0
==== //depot/projects/nand2/release/scripts/ports-install.sh#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/release/scripts/ports-install.sh,v 1.3 2001/04/08 23:09:21 obrien Exp $
+# $FreeBSD: src/release/scripts/ports-install.sh,v 1.4 2010/06/19 09:33:11 brian Exp $
#
if [ "`id -u`" != "0" ]; then
@@ -8,5 +8,5 @@
exit 1
fi
echo "Extracting ports tarball into ${DESTDIR}/usr"
-cat ports.tgz | tar --unlink -xpzf - -C ${DESTDIR}/usr
+tar --unlink -xpzf ports.tgz -C ${DESTDIR}/usr
exit 0
==== //depot/projects/nand2/sbin/fsck_ffs/main.c#3 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.59 2010/04/24 07:05:35 jeff Exp $");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.60 2010/06/22 00:26:07 delphij Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -388,16 +388,18 @@
/*
* Determine if we can and should do journal recovery.
*/
- if ((sblock.fs_flags & (FS_SUJ | FS_NEEDSFSCK)) == FS_SUJ) {
- if (preen || reply("USE JOURNAL?")) {
- if (suj_check(filesys) == 0) {
- if (chkdoreload(mntp) == 0)
- exit(0);
- exit(4);
+ if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) {
+ if ((sblock.fs_flags & FS_NEEDSFSCK) != FS_NEEDSFSCK && skipclean) {
+ if (preen || reply("USE JOURNAL?")) {
+ if (suj_check(filesys) == 0) {
+ printf("\n***** FILE SYSTEM MARKED CLEAN *****\n");
+ if (chkdoreload(mntp) == 0)
+ exit(0);
+ exit(4);
+ }
}
- /* suj_check failed, fall through. */
+ printf("** Skipping journal, falling through to full fsck\n\n");
}
- printf("** Skipping journal, falling through to full fsck\n");
/*
* Write the superblock so we don't try to recover the
* journal on another pass.
==== //depot/projects/nand2/sbin/fsck_ffs/suj.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/fsck_ffs/suj.c,v 1.2 2010/04/24 07:58:59 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/fsck_ffs/suj.c,v 1.3 2010/06/22 00:26:07 delphij Exp $");
#include <sys/param.h>
#include <sys/disklabel.h>
@@ -37,12 +37,15 @@
#include <ufs/ufs/dir.h>
#include <ufs/ffs/fs.h>
+#include <setjmp.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <libufs.h>
#include <string.h>
#include <strings.h>
+#include <sysexits.h>
#include <err.h>
#include <assert.h>
@@ -141,7 +144,10 @@
uint64_t jbytes;
uint64_t jrecs;
+static jmp_buf jmpbuf;
+
typedef void (*ino_visitor)(ino_t, ufs_lbn_t, ufs2_daddr_t, int);
+static void err_suj(const char *, ...) __dead2;
static void ino_trunc(ino_t, off_t);
static void ino_decr(ino_t);
static void ino_adjust(struct suj_ino *);
@@ -155,11 +161,30 @@
a = malloc(n);
if (a == NULL)
- errx(1, "malloc(%zu)", n);
+ err(EX_OSERR, "malloc(%zu)", n);
return (a);
}
/*
+ * When hit a fatal error in journalling check, print out
+ * the error and then offer to fallback to normal fsck.
+ */
+static void
+err_suj(const char * restrict fmt, ...)
+{
+ va_list ap;
+
+ if (preen)
+ (void)fprintf(stdout, "%s: ", cdevname);
+
+ va_start(ap, fmt);
+ (void)vfprintf(stdout, fmt, ap);
+ va_end(ap);
+
+ longjmp(jmpbuf, -1);
+}
+
+/*
* Open the given provider, load superblock.
*/
static void
@@ -169,9 +194,9 @@
return;
disk = malloc(sizeof(*disk));
if (disk == NULL)
- errx(1, "malloc(%zu)", sizeof(*disk));
+ err(EX_OSERR, "malloc(%zu)", sizeof(*disk));
if (ufs_disk_fillout(disk, devnam) == -1) {
- err(1, "ufs_disk_fillout(%s) failed: %s", devnam,
+ err(EX_OSERR, "ufs_disk_fillout(%s) failed: %s", devnam,
disk->d_error);
}
fs = &disk->d_fs;
@@ -203,9 +228,9 @@
fs->fs_time = time(NULL);
fs->fs_mtime = time(NULL);
if (sbwrite(disk, 0) == -1)
- err(1, "sbwrite(%s)", devnam);
+ err(EX_OSERR, "sbwrite(%s)", devnam);
if (ufs_disk_close(disk) == -1)
- err(1, "ufs_disk_close(%s)", devnam);
+ err(EX_OSERR, "ufs_disk_close(%s)", devnam);
free(disk);
disk = NULL;
fs = NULL;
@@ -221,10 +246,8 @@
struct cghd *hd;
struct suj_cg *sc;
- if (cgx < 0 || cgx >= fs->fs_ncg) {
- abort();
- errx(1, "Bad cg number %d", cgx);
- }
+ if (cgx < 0 || cgx >= fs->fs_ncg)
+ err_suj("Bad cg number %d\n", cgx);
if (lastcg && lastcg->sc_cgx == cgx)
return (lastcg);
hd = &cghash[SUJ_HASH(cgx)];
@@ -241,7 +264,7 @@
LIST_INSERT_HEAD(hd, sc, sc_next);
if (bread(disk, fsbtodb(fs, cgtod(fs, sc->sc_cgx)), sc->sc_cgbuf,
fs->fs_bsize) == -1)
- err(1, "Unable to read cylinder group %d", sc->sc_cgx);
+ err_suj("Unable to read cylinder group %d\n", sc->sc_cgx);
return (sc);
}
@@ -344,7 +367,7 @@
dblk->db_buf = errmalloc(size);
dblk->db_size = size;
if (bread(disk, fsbtodb(fs, blk), dblk->db_buf, size) == -1)
- err(1, "Failed to read data block %jd", blk);
+ err_suj("Failed to read data block %jd\n", blk);
}
return (dblk->db_buf);
}
@@ -370,7 +393,7 @@
continue;
if (bwrite(disk, fsbtodb(fs, dblk->db_blk),
dblk->db_buf, dblk->db_size) == -1)
- err(1, "Unable to write block %jd",
+ err_suj("Unable to write block %jd\n",
dblk->db_blk);
}
}
@@ -403,7 +426,7 @@
iblk->ib_blk = blk;
LIST_INSERT_HEAD(hd, iblk, ib_next);
if (bread(disk, fsbtodb(fs, blk), iblk->ib_buf, fs->fs_bsize) == -1)
- err(1, "Failed to read inode block %jd", blk);
+ err_suj("Failed to read inode block %jd\n", blk);
found:
sc->sc_lastiblk = iblk;
off = ino_to_fsbo(fs, ino);
@@ -447,7 +470,7 @@
return;
if (bwrite(disk, fsbtodb(fs, iblk->ib_blk), iblk->ib_buf,
fs->fs_bsize) == -1)
- err(1, "Failed to write inode block %jd", iblk->ib_blk);
+ err_suj("Failed to write inode block %jd\n", iblk->ib_blk);
}
static int
@@ -679,9 +702,9 @@
return (0);
level = lbn_level(cur);
if (level == -1)
- errx(1, "Invalid indir lbn %jd", lbn);
+ err_suj("Invalid indir lbn %jd\n", lbn);
if (level == 0 && lbn < 0)
- errx(1, "Invalid lbn %jd", lbn);
+ err_suj("Invalid lbn %jd\n", lbn);
bap2 = (void *)dblk_read(blk, fs->fs_bsize);
bap1 = (void *)bap2;
lbnadd = 1;
@@ -693,7 +716,7 @@
else
i = (-lbn - base) / lbnadd;
if (i < 0 || i >= NINDIR(fs))
- errx(1, "Invalid indirect index %d produced by lbn %jd",
+ err_suj("Invalid indirect index %d produced by lbn %jd\n",
i, lbn);
if (level == 0)
cur = base + (i * lbnadd);
@@ -705,10 +728,8 @@
blk = bap2[i];
if (cur == lbn)
return (blk);
- if (level == 0) {
- abort();
- errx(1, "Invalid lbn %jd at level 0", lbn);
- }
+ if (level == 0)
+ err_suj("Invalid lbn %jd at level 0\n", lbn);
return indir_blkatoff(blk, ino, cur, lbn);
}
@@ -762,7 +783,8 @@
continue;
return indir_blkatoff(DIP(ip, di_ib[i]), ino, -cur - i, lbn);
}
- errx(1, "lbn %jd not in ino", lbn);
+ err_suj("lbn %jd not in ino\n", lbn);
+ /* NOTREACHED */
}
/*
@@ -851,7 +873,7 @@
dpoff += dp->d_reclen;
} while (dpoff <= doff);
if (dpoff > fs->fs_bsize)
- errx(1, "Corrupt directory block in dir ino %d", parent);
+ err_suj("Corrupt directory block in dir ino %d\n", parent);
/* Not found. */
if (dpoff != doff) {
if (debug)
@@ -907,7 +929,7 @@
return;
level = lbn_level(lbn);
if (level == -1)
- errx(1, "Invalid level for lbn %jd", lbn);
+ err_suj("Invalid level for lbn %jd\n", lbn);
if ((flags & VISIT_ROOT) == 0 && blk_isindir(blk, ino, lbn) == 0) {
if (debug)
printf("blk %jd ino %d lbn %jd(%d) is not indir.\n",
@@ -1203,7 +1225,7 @@
uint32_t gen;
if (ino == ROOTINO)
- errx(1, "Attempting to free ROOTINO");
+ err_suj("Attempting to free ROOTINO\n");
if (debug)
printf("Truncating and freeing ino %d, nlink %d, mode %o\n",
ino, DIP(ip, di_nlink), DIP(ip, di_mode));
@@ -1240,9 +1262,9 @@
nlink = DIP(ip, di_nlink);
mode = DIP(ip, di_mode);
if (nlink < 1)
- errx(1, "Inode %d link count %d invalid", ino, nlink);
+ err_suj("Inode %d link count %d invalid\n", ino, nlink);
if (mode == 0)
- errx(1, "Inode %d has a link of %d with 0 mode.", ino, nlink);
+ err_suj("Inode %d has a link of %d with 0 mode\n", ino, nlink);
nlink--;
if ((mode & IFMT) == IFDIR)
reqlink = 2;
@@ -1300,8 +1322,8 @@
ip = ino_read(ino);
mode = DIP(ip, di_mode) & IFMT;
if (nlink > LINK_MAX)
- errx(1,
- "ino %d nlink manipulation error, new link %d, old link %d",
+ err_suj(
+ "ino %d nlink manipulation error, new link %d, old link %d\n",
ino, nlink, DIP(ip, di_nlink));
if (debug)
printf("Adjusting ino %d, nlink %d, old link %d lastmode %o\n",
@@ -1359,7 +1381,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list