Date: Thu, 26 Nov 2009 22:47:31 GMT From: Rafal Jaworowski <raj@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 171075 for review Message-ID: <200911262247.nAQMlV1g040946@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=171075 Change 171075 by raj@raj_fdt on 2009/11/26 22:47:23 IFC @171074 Affected files ... .. //depot/projects/fdt/UPDATING#4 integrate .. //depot/projects/fdt/bin/sh/cd.c#2 integrate .. //depot/projects/fdt/bin/sh/error.c#2 integrate .. //depot/projects/fdt/bin/sh/error.h#2 integrate .. //depot/projects/fdt/bin/sh/eval.c#2 integrate .. //depot/projects/fdt/bin/sh/histedit.c#2 integrate .. //depot/projects/fdt/bin/sh/input.c#2 integrate .. //depot/projects/fdt/bin/sh/input.h#2 integrate .. //depot/projects/fdt/bin/sh/jobs.c#2 integrate .. //depot/projects/fdt/bin/sh/main.c#2 integrate .. //depot/projects/fdt/bin/sh/output.c#2 integrate .. //depot/projects/fdt/bin/sh/output.h#2 integrate .. //depot/projects/fdt/bin/sh/parser.c#3 integrate .. //depot/projects/fdt/bin/sh/redir.c#2 integrate .. //depot/projects/fdt/bin/sh/trap.c#3 integrate .. //depot/projects/fdt/bin/sh/var.c#2 integrate .. //depot/projects/fdt/crypto/openssh/sshd.c#2 integrate .. //depot/projects/fdt/games/factor/factor.c#2 integrate .. //depot/projects/fdt/include/signal.h#2 integrate .. //depot/projects/fdt/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/fdt/lib/libc/compat-43/Symbol.map#2 integrate .. //depot/projects/fdt/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/fdt/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/fdt/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/fdt/lib/libc/gen/_once_stub.c#1 branch .. //depot/projects/fdt/lib/libc/gen/_pthread_stubs.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/fts.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/fts.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/wordexp.c#2 integrate .. //depot/projects/fdt/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/fdt/lib/libc/rpc/clnt_raw.c#2 integrate .. //depot/projects/fdt/lib/libc/rpc/getnetconfig.c#2 integrate .. //depot/projects/fdt/lib/libc/rpc/getrpcent.c#2 integrate .. //depot/projects/fdt/lib/libc/rpc/key_call.c#2 integrate .. //depot/projects/fdt/lib/libc/rpc/svc_raw.c#2 integrate .. //depot/projects/fdt/lib/libc/stdio/fgetws.c#2 integrate .. //depot/projects/fdt/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/fdt/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/fdt/lib/libc/stdio/xprintf_time.c#2 integrate .. //depot/projects/fdt/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/fdt/lib/libc/yp/yplib.c#2 integrate .. //depot/projects/fdt/lib/libfetch/ftp.c#2 integrate .. //depot/projects/fdt/lib/libtacplus/taclib.c#2 integrate .. //depot/projects/fdt/lib/libthr/Makefile#2 integrate .. //depot/projects/fdt/lib/libusb/libusb10.c#3 integrate .. //depot/projects/fdt/lib/libusb/libusb10.h#2 integrate .. //depot/projects/fdt/lib/libusb/libusb20.3#2 integrate .. //depot/projects/fdt/lib/libusb/libusb20.c#3 integrate .. //depot/projects/fdt/lib/libusb/libusb20.h#2 integrate .. //depot/projects/fdt/lib/libutil/pw_util.c#2 integrate .. //depot/projects/fdt/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/fdt/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/fdt/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/fdt/sbin/camcontrol/camcontrol.8#3 integrate .. //depot/projects/fdt/sbin/camcontrol/camcontrol.c#3 integrate .. //depot/projects/fdt/sbin/fsck/fsck.c#2 integrate .. //depot/projects/fdt/sbin/ifconfig/ifconfig.c#4 integrate .. //depot/projects/fdt/sbin/ipfw/dummynet.c#2 integrate .. //depot/projects/fdt/sbin/mount_cd9660/mount_cd9660.c#2 integrate .. //depot/projects/fdt/share/man/man4/Makefile#3 integrate .. //depot/projects/fdt/share/man/man4/ada.4#1 branch .. //depot/projects/fdt/share/man/man4/ata.4#3 integrate .. //depot/projects/fdt/share/man/man4/mfi.4#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate .. //depot/projects/fdt/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate .. //depot/projects/fdt/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/fdt/sys/boot/Makefile#2 integrate .. //depot/projects/fdt/sys/boot/i386/Makefile#2 integrate .. //depot/projects/fdt/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/fdt/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/fdt/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/fdt/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/fdt/sys/boot/i386/zfsboot/zfsldr.S#2 integrate .. //depot/projects/fdt/sys/boot/i386/zfsloader/Makefile#1 branch .. //depot/projects/fdt/sys/cam/ata/ata_all.c#3 integrate .. //depot/projects/fdt/sys/cam/ata/ata_all.h#3 integrate .. //depot/projects/fdt/sys/cam/ata/ata_pmp.c#4 integrate .. //depot/projects/fdt/sys/cam/ata/ata_xpt.c#4 integrate .. //depot/projects/fdt/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/fdt/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/fdt/sys/conf/files#5 integrate .. //depot/projects/fdt/sys/dev/ahci/ahci.c#4 integrate .. //depot/projects/fdt/sys/dev/ahci/ahci.h#4 integrate .. //depot/projects/fdt/sys/dev/an/if_an.c#3 integrate .. //depot/projects/fdt/sys/dev/an/if_an_isa.c#3 integrate .. //depot/projects/fdt/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/fdt/sys/dev/an/if_an_pci.c#3 integrate .. //depot/projects/fdt/sys/dev/an/if_anreg.h#3 integrate .. //depot/projects/fdt/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/fdt/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/fdt/sys/dev/ata/ata-usb.c#2 delete .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/fdt/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/fdt/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/fdt/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/fdt/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/fdt/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/fdt/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/fdt/sys/dev/et/if_et.c#2 integrate .. //depot/projects/fdt/sys/dev/et/if_etreg.h#2 integrate .. //depot/projects/fdt/sys/dev/et/if_etvar.h#2 integrate .. //depot/projects/fdt/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/fdt/sys/dev/fatm/if_fatmvar.h#2 integrate .. //depot/projects/fdt/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/fdt/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/fdt/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/fdt/sys/dev/ixgb/if_ixgb.h#3 integrate .. //depot/projects/fdt/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/fdt/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/fdt/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/fdt/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/fdt/sys/dev/malo/if_malo.c#2 integrate .. //depot/projects/fdt/sys/dev/malo/if_malo.h#2 integrate .. //depot/projects/fdt/sys/dev/mwl/if_mwl.c#2 integrate .. //depot/projects/fdt/sys/dev/mwl/if_mwlvar.h#2 integrate .. //depot/projects/fdt/sys/dev/my/if_my.c#2 integrate .. //depot/projects/fdt/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/fdt/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/fdt/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/fdt/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/fdt/sys/dev/pci/pci.c#2 integrate .. //depot/projects/fdt/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/fdt/sys/dev/pcn/if_pcnreg.h#2 integrate .. //depot/projects/fdt/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/fdt/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/fdt/sys/dev/pdq/pdq_freebsd.h#2 integrate .. //depot/projects/fdt/sys/dev/pdq/pdq_ifsubr.c#2 integrate .. //depot/projects/fdt/sys/dev/re/if_re.c#3 integrate .. //depot/projects/fdt/sys/dev/siis/siis.c#4 integrate .. //depot/projects/fdt/sys/dev/siis/siis.h#3 integrate .. //depot/projects/fdt/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/fdt/sys/dev/sn/if_snvar.h#3 integrate .. //depot/projects/fdt/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/fdt/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/fdt/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/fdt/sys/dev/ste/if_stereg.h#2 integrate .. //depot/projects/fdt/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/fdt/sys/dev/ti/if_tireg.h#2 integrate .. //depot/projects/fdt/sys/dev/tl/if_tl.c#3 integrate .. //depot/projects/fdt/sys/dev/tl/if_tlreg.h#3 integrate .. //depot/projects/fdt/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/avr32dci.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/controller/musb_otg.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/uhci.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/uhcireg.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/input/atp.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/input/ukbd.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/storage/umass.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_busdma.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_core.h#3 integrate .. //depot/projects/fdt/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_request.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/usbdi.h#3 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/fdt/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/fdt/sys/dev/vge/if_vgevar.h#4 integrate .. //depot/projects/fdt/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/fdt/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/fdt/sys/dev/wb/if_wb.c#3 integrate .. //depot/projects/fdt/sys/dev/wb/if_wbreg.h#3 integrate .. //depot/projects/fdt/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/fdt/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/fdt/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/fdt/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/fdt/sys/fs/nfs/nfs_var.h#2 integrate .. //depot/projects/fdt/sys/fs/nfsserver/nfs_nfsdport.c#2 integrate .. //depot/projects/fdt/sys/fs/nfsserver/nfs_nfsdserv.c#2 integrate .. //depot/projects/fdt/sys/i386/i386/bpf_jit_machdep.c#4 integrate .. //depot/projects/fdt/sys/i386/i386/bpf_jit_machdep.h#3 integrate .. //depot/projects/fdt/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/fdt/sys/ia64/ia64/exception.S#3 integrate .. //depot/projects/fdt/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/fdt/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/fdt/sys/ia64/include/param.h#2 integrate .. //depot/projects/fdt/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/fdt/sys/kern/sched_ule.c#3 integrate .. //depot/projects/fdt/sys/kern/sys_process.c#2 integrate .. //depot/projects/fdt/sys/mips/adm5120/if_admsw.c#2 integrate .. //depot/projects/fdt/sys/mips/adm5120/if_admswvar.h#2 integrate .. //depot/projects/fdt/sys/modules/ata/atausb/Makefile#2 delete .. //depot/projects/fdt/sys/net/bpf_jitter.c#3 integrate .. //depot/projects/fdt/sys/net/bpf_jitter.h#3 integrate .. //depot/projects/fdt/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/fdt/sys/powerpc/mpc85xx/pci_ocp.c#2 integrate .. //depot/projects/fdt/sys/sys/ata.h#3 integrate .. //depot/projects/fdt/sys/sys/elf_common.h#2 integrate .. //depot/projects/fdt/sys/sys/param.h#4 integrate .. //depot/projects/fdt/sys/sys/signal.h#3 integrate .. //depot/projects/fdt/sys/sys/signalvar.h#4 integrate .. //depot/projects/fdt/sys/vm/vm.h#2 integrate .. //depot/projects/fdt/sys/vm/vm_fault.c#4 integrate .. //depot/projects/fdt/sys/vm/vm_map.c#4 integrate .. //depot/projects/fdt/tools/regression/bin/sh/builtins/cd1.0#2 integrate .. //depot/projects/fdt/tools/regression/bin/sh/builtins/cd2.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/builtins/fc1.0#1 branch .. //depot/projects/fdt/tools/regression/bin/sh/builtins/trap3.0#1 branch .. //depot/projects/fdt/tools/regression/bpf/bpf_filter/Makefile#3 integrate .. //depot/projects/fdt/tools/regression/bpf/bpf_filter/bpf_test.c#2 integrate .. //depot/projects/fdt/tools/regression/bpf/bpf_filter/tests/test0075.h#2 integrate .. //depot/projects/fdt/tools/regression/bpf/bpf_filter/tests/test0076.h#2 integrate .. //depot/projects/fdt/tools/regression/bpf/bpf_filter/tests/test0077.h#2 integrate .. //depot/projects/fdt/tools/regression/bpf/bpf_filter/tests/test0078.h#2 integrate .. //depot/projects/fdt/tools/regression/bpf/bpf_filter/tests/test0080.h#2 integrate .. //depot/projects/fdt/tools/regression/bpf/bpf_filter/tests/test0084.h#2 integrate .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/ALIX_DSK#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/ALIX_NFS#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/Files/etc/rc.conf#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/Files/etc/ttys#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/Files/root/.cshrc#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/Files/root/.k5login#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/Files/root/.login#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/Files/root/change_password#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/Files/root/save_cfg#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/Files/root/save_sshkeys#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/Files/root/updatep1#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/Files/root/updatep2#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/Files/usr/ports/.keepme#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/alix_dsk.conf#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/alix_nfs.conf#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/build.sh#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/common.conf#1 branch .. //depot/projects/fdt/tools/tools/nanobsd/pcengines/test.sh#1 branch .. //depot/projects/fdt/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/fdt/usr.bin/gcore/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/gcore/elfcore.c#2 integrate .. //depot/projects/fdt/usr.bin/gcore/gcore.1#2 integrate .. //depot/projects/fdt/usr.bin/gcore/gcore.c#2 integrate .. //depot/projects/fdt/usr.bin/netstat/if.c#2 integrate .. //depot/projects/fdt/usr.bin/perror/perror.c#2 integrate .. //depot/projects/fdt/usr.bin/unifdef/unifdef.1#2 integrate .. //depot/projects/fdt/usr.bin/unifdef/unifdef.c#2 integrate .. //depot/projects/fdt/usr.bin/unifdef/unifdefall.sh#2 integrate .. //depot/projects/fdt/usr.bin/w/w.c#2 integrate .. //depot/projects/fdt/usr.sbin/cron/cron/cron.c#2 integrate .. //depot/projects/fdt/usr.sbin/inetd/inetd.c#2 integrate .. //depot/projects/fdt/usr.sbin/jail/jail.8#2 integrate .. //depot/projects/fdt/usr.sbin/syslogd/syslogd.c#2 integrate Differences ... ==== //depot/projects/fdt/UPDATING#4 (text+ko) ==== @@ -42,6 +42,10 @@ Applications that require wireless scan results (e.g. ifconfig(8)) from net80211 need to be recompiled. + Applications such as wpa_supplicant(8) may require a full world + build without using NO_CLEAN in order to get synchronized with the + new structure. + 20091025: The iwn(4) driver has been updated to support the 5000 and 5150 series. There's one kernel module for each firmware. Adding "device iwnfw" @@ -1072,4 +1076,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.647 2009/11/13 11:28:54 ed Exp $ +$FreeBSD: src/UPDATING,v 1.648 2009/11/21 01:43:22 dougb Exp $ ==== //depot/projects/fdt/bin/sh/cd.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.36 2008/02/24 16:50:55 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.37 2009/11/21 14:53:22 stefanf Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -70,7 +70,7 @@ STATIC char *getcomponent(void); STATIC char *findcwd(char *); STATIC void updatepwd(char *); -STATIC char *getpwd2(char *, size_t); +STATIC char *getpwd2(void); STATIC char *curdir = NULL; /* current working directory */ STATIC char *prevdir; /* previous working directory */ @@ -263,10 +263,8 @@ * any more because we traversed a symbolic link or something * we couldn't stat(). */ - if (dir == NULL || curdir == NULL) { - p = stalloc(PATH_MAX); - return getpwd2(p, PATH_MAX); - } + if (dir == NULL || curdir == NULL) + return getpwd2(); cdcomppath = stalloc(strlen(dir) + 1); scopy(dir, cdcomppath); STARTSTACKSTR(new); @@ -313,7 +311,7 @@ int pwdcmd(int argc, char **argv) { - char buf[PATH_MAX]; + char *p; int ch, phys; optreset = 1; optind = 1; opterr = 0; /* initialize getopt */ @@ -341,9 +339,9 @@ out1str(curdir); out1c('\n'); } else { - if (getcwd(buf, sizeof(buf)) == NULL) + if ((p = getpwd2()) == NULL) error(".: %s", strerror(errno)); - out1str(buf); + out1str(p); out1c('\n'); } @@ -356,36 +354,45 @@ char * getpwd(void) { - char buf[PATH_MAX]; char *p; if (curdir) return curdir; - p = getpwd2(buf, sizeof(buf)); + p = getpwd2(); if (p != NULL) curdir = savestr(p); return curdir; } +#define MAXPWD 256 + /* * Return the current directory. */ STATIC char * -getpwd2(char *buf, size_t size) +getpwd2(void) { - if (getcwd(buf, size) == NULL) { - char *pwd = getenv("PWD"); - struct stat stdot, stpwd; + struct stat stdot, stpwd; + char *pwd; + int i; - if (pwd && *pwd == '/' && stat(".", &stdot) != -1 && - stat(pwd, &stpwd) != -1 && - stdot.st_dev == stpwd.st_dev && - stdot.st_ino == stpwd.st_ino) { + for (i = MAXPWD;; i *= 2) { + pwd = stalloc(i); + if (getcwd(pwd, i) != NULL) return pwd; - } - return NULL; + stunalloc(pwd); + if (errno != ERANGE) + break; + } + + pwd = getenv("PWD"); + if (pwd && *pwd == '/' && stat(".", &stdot) != -1 && + stat(pwd, &stpwd) != -1 && + stdot.st_dev == stpwd.st_dev && + stdot.st_ino == stpwd.st_ino) { + return pwd; } - return buf; + return NULL; } ==== //depot/projects/fdt/bin/sh/error.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.26 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.27 2009/11/22 18:23:30 jilles Exp $"); /* * Errors and exceptions. @@ -73,11 +73,15 @@ * Called to raise an exception. Since C doesn't include exceptions, we * just do a longjmp to the exception handler. The type of exception is * stored in the global variable "exception". + * + * Interrupts are disabled; they should be reenabled when the exception is + * caught. */ void exraise(int e) { + INTOFF; if (handler == NULL) abort(); exception = e; @@ -138,8 +142,15 @@ static void exverror(int cond, const char *msg, va_list ap) { - CLEAR_PENDING_INT; - INTOFF; + /* + * An interrupt trumps an error. Certain places catch error + * exceptions or transform them to a plain nonzero exit code + * in child processes, and if an error exception can be handled, + * an interrupt can be handled as well. + * + * exraise() will disable interrupts for the exception handler. + */ + FORCEINTON; #ifdef DEBUG if (msg) ==== //depot/projects/fdt/bin/sh/error.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)error.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/error.h,v 1.17 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/error.h,v 1.18 2009/11/22 18:23:30 jilles Exp $ */ /* @@ -72,6 +72,8 @@ #define INTOFF suppressint++ #define INTON { if (--suppressint == 0 && intpending) onint(); } +#define is_int_on() suppressint +#define SETINTON(s) suppressint = (s) #define FORCEINTON {suppressint = 0; if (intpending) onint();} #define CLEAR_PENDING_INT intpending = 0 #define int_pending() intpending ==== //depot/projects/fdt/bin/sh/eval.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.69 2009/11/22 18:23:30 jilles Exp $"); #include <paths.h> #include <signal.h> @@ -593,6 +593,7 @@ char *savecmdname; struct shparam saveparam; struct localvar *savelocalvars; + struct parsefile *savetopfile; volatile int e; char *lastarg; int realstatus; @@ -781,7 +782,6 @@ savelocalvars = localvars; localvars = NULL; reffunc(cmdentry.u.func); - INTON; savehandler = handler; if (setjmp(jmploc.loc)) { if (exception == EXSHELLPROC) @@ -797,6 +797,7 @@ longjmp(handler->loc, 1); } handler = &jmploc; + INTON; for (sp = varlist.list ; sp ; sp = sp->next) mklocal(sp->text); funcnest++; @@ -833,6 +834,7 @@ mode |= REDIR_BACKQ; } savecmdname = commandname; + savetopfile = getcurrentfile(); cmdenviron = varlist.list; e = -1; savehandler = handler; @@ -867,6 +869,7 @@ if ((e != EXERROR && e != EXEXEC) || cmdentry.special) exraise(e); + popfilesupto(savetopfile); FORCEINTON; } if (cmdentry.u.index != EXECCMD) ==== //depot/projects/fdt/bin/sh/histedit.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.31 2009/06/23 20:45:12 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.32 2009/11/21 14:28:32 jilles Exp $"); #include <sys/param.h> #include <limits.h> @@ -92,7 +92,7 @@ if (hist != NULL) sethistsize(histsizeval()); else - out2str("sh: can't initialize history\n"); + out2fmt_flush("sh: can't initialize history\n"); } if (editing && !el && isatty(0)) { /* && isatty(2) ??? */ /* @@ -114,7 +114,7 @@ el_set(el, EL_PROMPT, getprompt); } else { bad: - out2str("sh: can't initialize editing\n"); + out2fmt_flush("sh: can't initialize editing\n"); } INTON; } else if (!editing && el) { @@ -336,6 +336,7 @@ if (sflg) { if (displayhist) { out2str(s); + flushout(out2); } evalstring(s, 0); if (displayhist && hist) { ==== //depot/projects/fdt/bin/sh/input.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.25 2009/06/17 21:58:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.27 2009/11/22 14:04:20 jilles Exp $"); #include <stdio.h> /* defines BUFSIZ */ #include <fcntl.h> @@ -215,7 +215,7 @@ if (flags >= 0 && flags & O_NONBLOCK) { flags &=~ O_NONBLOCK; if (fcntl(0, F_SETFL, flags) >= 0) { - out2str("sh: turning off NDELAY mode\n"); + out2fmt_flush("sh: turning off NDELAY mode\n"); goto retry; } } @@ -359,7 +359,7 @@ struct strpush *sp; INTOFF; -/*dprintf("*** calling pushstring: %s, %d\n", s, len);*/ +/*out2fmt_flush("*** calling pushstring: %s, %d\n", s, len);*/ if (parsefile->strpush) { sp = ckmalloc(sizeof (struct strpush)); sp->prev = parsefile->strpush; @@ -386,7 +386,7 @@ parsenextc = sp->prevstring; parsenleft = sp->prevnleft; parselleft = sp->prevlleft; -/*dprintf("*** calling popstring: restoring to '%s'\n", parsenextc);*/ +/*out2fmt_flush("*** calling popstring: restoring to '%s'\n", parsenextc);*/ if (sp->ap) sp->ap->flag &= ~ALIASINUSE; parsefile->strpush = sp->prev; @@ -509,6 +509,32 @@ /* + * Return current file (to go back to it later using popfilesupto()). + */ + +struct parsefile * +getcurrentfile(void) +{ + return parsefile; +} + + +/* + * Pop files until the given file is on top again. Useful for regular + * builtins that read shell commands from files or strings. + * If the given file is not an active file, an error is raised. + */ + +void +popfilesupto(struct parsefile *file) +{ + while (parsefile != file && parsefile != &basepf) + popfile(); + if (parsefile != file) + error("popfilesupto() misused"); +} + +/* * Return to top level. */ ==== //depot/projects/fdt/bin/sh/input.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)input.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/input.h,v 1.10 2009/06/13 21:17:45 jilles Exp $ + * $FreeBSD: src/bin/sh/input.h,v 1.11 2009/11/22 14:04:20 jilles Exp $ */ /* PEOF (the end of file marker) is defined in syntax.h */ @@ -45,6 +45,8 @@ extern char *parsenextc; /* next character in input buffer */ extern int init_editline; /* 0 == not setup, 1 == OK, -1 == failed */ +struct parsefile; + char *pfgets(char *, int); int pgetc(void); int preadbuffer(void); @@ -56,6 +58,8 @@ void setinputfd(int, int); void setinputstring(char *, int); void popfile(void); +struct parsefile *getcurrentfile(void); +void popfilesupto(struct parsefile *); void popallfiles(void); void closescript(void); ==== //depot/projects/fdt/bin/sh/jobs.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.72 2006/10/07 16:51:16 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.73 2009/11/21 14:28:32 jilles Exp $"); #include <fcntl.h> #include <signal.h> @@ -146,7 +146,7 @@ do { /* while we are in the background */ initialpgrp = tcgetpgrp(ttyfd); if (initialpgrp < 0) { -out: out2str("sh: can't access tty; job control turned off\n"); +out: out2fmt_flush("sh: can't access tty; job control turned off\n"); mflag = 0; return; } @@ -1046,7 +1046,7 @@ if (jp->used == 0) continue; if (jp->state == JOBSTOPPED) { - out2str("You have stopped jobs.\n"); + out2fmt_flush("You have stopped jobs.\n"); job_warning = 2; return (1); } ==== //depot/projects/fdt/bin/sh/main.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.31 2009/06/13 21:17:45 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.32 2009/11/21 14:28:32 jilles Exp $"); #include <stdio.h> #include <signal.h> @@ -154,7 +154,7 @@ setstackmark(&smark); procargs(argc, argv); if (getpwd() == NULL && iflag) - out2str("sh: cannot determine working directory\n"); + out2fmt_flush("sh: cannot determine working directory\n"); if (getpwd() != NULL) setvar ("PWD", getpwd(), VEXPORT); if (argv[0] && argv[0][0] == '-') { @@ -223,7 +223,7 @@ if (!stoppedjobs()) { if (!Iflag) break; - out2str("\nUse \"exit\" to leave shell.\n"); + out2fmt_flush("\nUse \"exit\" to leave shell.\n"); } numeof++; } else if (n != NULL && nflag == 0) { ==== //depot/projects/fdt/bin/sh/output.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.21 2009/06/19 22:09:55 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.22 2009/11/21 14:28:32 jilles Exp $"); /* * Shell output routines. We use our own output routines because: @@ -71,7 +71,7 @@ static int doformat_wr(void *, const char *, int); struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0}; -struct output errout = {NULL, 0, NULL, 100, 2, 0}; +struct output errout = {NULL, 0, NULL, 256, 2, 0}; struct output memout = {NULL, 0, NULL, 0, MEM_OUT, 0}; struct output *out1 = &output; struct output *out2 = &errout; @@ -124,8 +124,6 @@ { while (*p) outc(*p++, file); - if (file == out2) - flushout(file); } /* Like outstr(), but quote for re-input into the shell. */ @@ -255,7 +253,7 @@ } void -dprintf(const char *fmt, ...) +out2fmt_flush(const char *fmt, ...) { va_list ap; ==== //depot/projects/fdt/bin/sh/output.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)output.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/output.h,v 1.13 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/output.h,v 1.14 2009/11/21 14:28:32 jilles Exp $ */ #ifndef OUTPUT_INCL @@ -65,7 +65,7 @@ void freestdout(void); void outfmt(struct output *, const char *, ...) __printflike(2, 3); void out1fmt(const char *, ...) __printflike(1, 2); -void dprintf(const char *, ...) __printflike(1, 2); +void out2fmt_flush(const char *, ...) __printflike(1, 2); void fmtstr(char *, int, const char *, ...) __printflike(3, 4); void doformat(struct output *, const char *, va_list) __printflike(2, 0); int xwrite(int, char *, int); ==== //depot/projects/fdt/bin/sh/parser.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.66 2009/11/14 22:08:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.68 2009/11/22 18:23:30 jilles Exp $"); #include <stdlib.h> #include <unistd.h> @@ -1312,6 +1312,7 @@ int saveprompt; const int bq_startlinno = plinno; + str = NULL; if (setjmp(jmploc.loc)) { if (str) ckfree(str); @@ -1323,7 +1324,6 @@ longjmp(handler->loc, 1); } INTOFF; - str = NULL; savelen = out - stackblock(); if (savelen > 0) { str = ckmalloc(savelen); @@ -1563,7 +1563,10 @@ #ifndef NO_HISTORY if (!el) #endif + { out2str(getprompt(NULL)); + flushout(out2); + } } /* ==== //depot/projects/fdt/bin/sh/redir.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.27 2009/06/20 20:44:27 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.28 2009/11/22 18:23:30 jilles Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -166,8 +166,11 @@ /* * We suppress interrupts so that we won't leave open file - * descriptors around. This may not be such a good idea because - * an open of a device or a fifo can block indefinitely. + * descriptors around. Because the signal handler remains + * installed and we do not use system call restart, interrupts + * will still abort blocking opens such as fifos (they will fail + * with EINTR). There is, however, a race condition if an interrupt + * arrives after INTOFF and before open blocks. */ INTOFF; memory[fd] = 0; ==== //depot/projects/fdt/bin/sh/trap.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.35 2009/11/11 23:13:24 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.36 2009/11/21 20:44:34 jilles Exp $"); #include <signal.h> #include <unistd.h> @@ -149,6 +149,7 @@ { char *action; int signo; + int errors = 0; if (argc <= 1) { for (signo = 0 ; signo < sys_nsig ; signo++) { @@ -183,8 +184,10 @@ } } while (*argv) { - if ((signo = sigstring_to_signum(*argv)) == -1) - error("bad signal %s", *argv); + if ((signo = sigstring_to_signum(*argv)) == -1) { + out2fmt_flush("trap: bad signal %s\n", *argv); + errors = 1; + } INTOFF; if (action) action = savestr(action); @@ -196,7 +199,7 @@ INTON; argv++; } - return 0; + return errors; } ==== //depot/projects/fdt/bin/sh/var.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.39 2009/06/23 20:45:12 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.40 2009/11/22 18:23:30 jilles Exp $"); #include <unistd.h> #include <stdlib.h> @@ -195,7 +195,9 @@ struct jmploc jmploc; struct jmploc *const savehandler = handler; int err = 0; + int inton; + inton = is_int_on(); if (setjmp(jmploc.loc)) err = 1; else { @@ -203,6 +205,7 @@ setvar(name, val, flags); } handler = savehandler; + SETINTON(inton); return err; } ==== //depot/projects/fdt/crypto/openssh/sshd.c#2 (text+ko) ==== @@ -43,10 +43,11 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.49 2009/10/01 17:12:52 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.50 2009/11/25 15:12:24 attilio Exp $"); #include <sys/types.h> #include <sys/ioctl.h> +#include <sys/mman.h> #include <sys/socket.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> @@ -1293,6 +1294,10 @@ /* Initialize configuration options to their default values. */ initialize_server_options(&options); + /* Avoid killing the process in high-pressure swapping environments. */ + if (madvise(NULL, 0, MADV_PROTECT) != 0) + debug("madvise(): %.200s", strerror(errno)); + /* Parse command-line arguments. */ while ((opt = getopt(ac, av, "f:p:b:k:h:g:u:o:C:dDeiqrtQRT46")) != -1) { switch (opt) { ==== //depot/projects/fdt/games/factor/factor.c#2 (text+ko) ==== @@ -13,11 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,18 +31,20 @@ */ #ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1989, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)factor.c 8.4 (Berkeley) 5/4/95"; -__RCSID("$NetBSD: factor.c,v 1.13 2002/06/18 23:07:36 simonb Exp $"); +#include <sys/cdefs.h> +#ifdef __COPYRIGHT +__COPYRIGHT("@(#) Copyright (c) 1989, 1993\ + The Regents of the University of California. All rights reserved."); +#endif +#ifdef __SCCSID +__SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95"); +#endif +#ifdef __RCSID +__RCSID("$NetBSD: factor.c,v 1.19 2009/08/12 05:54:31 dholland Exp $"); +#endif >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911262247.nAQMlV1g040946>