Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Dec 2009 00:05:23 GMT
From:      Alexander Motin <mav@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 172250 for review
Message-ID:  <200912260005.nBQ05NbM081347@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=172250

Change 172250 by mav@mav_mavbook on 2009/12/26 00:04:36

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/UPDATING#25 integrate
.. //depot/projects/scottl-camlock/src/bin/pax/sel_subs.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/alias.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/alias.h#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/arith.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/arith.y#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/cd.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/error.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/error.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/exec.c#7 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/exec.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/expand.c#5 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/expand.h#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/histedit.c#5 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/input.c#5 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/input.h#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/jobs.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/mail.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/main.h#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/memalloc.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/memalloc.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/myhistedit.h#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/options.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/options.h#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/output.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/output.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/parser.c#9 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/parser.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/show.c#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/show.h#2 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/trap.h#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/var.c#6 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/var.h#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/pf/man/pf.conf.5#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/pf/pfctl/parse.y#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/pf/pfctl/pf_print_state.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/pf/pfctl/pfctl_parser.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/top/username.c#2 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.subr#8 integrate
.. //depot/projects/scottl-camlock/src/include/signal.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_delete_entry.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdio/sprintf.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdio/sscanf.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdio/vsscanf.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdtime/localtime.c#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdtime/tzfile.5#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/libpmc.c#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.xscale.3#1 branch
.. //depot/projects/scottl-camlock/src/lib/libstand/bzipfs.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libstand/gzipfs.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libulog/ulog_pututxline.c#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/atrun/atrun.c#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/talkd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/talkd/process.c#2 integrate
.. //depot/projects/scottl-camlock/src/release/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/sbin/dumpfs/dumpfs.c#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount/mntopts.h#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount/mount.8#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount/mount.c#6 integrate
.. //depot/projects/scottl-camlock/src/sbin/tunefs/tunefs.8#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/tunefs/tunefs.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#17 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/gem.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mk48txx.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man4/ste.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/watchdog.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#13 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/usbdi.9#3 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#10 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/europe#6 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/zone.tab#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#11 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA#7 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/pmc_mdep.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/files.ixp425#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/dev_net.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/kgzldr/crt.s#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/main.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#45 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.arm#11 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.sun4v#7 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pfvar.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ae/if_ae.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#91 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#29 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-amd.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/auxio/auxio.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_arm.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_xscale.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_xscale.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/pmc_events.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_usb.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/jme/if_jme.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mc146818/mc146818.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mc146818/mc146818reg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mc146818/mc146818var.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mk48txx/mk48txx.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mk48txx/mk48txxreg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mk48txx/mk48txxvar.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ste/if_ste.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ste/if_stereg.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/twe/twe.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/twe/twe_freebsd.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/twe/twevar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_acpi.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_ebus.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_sparc64.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_pci.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#35 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vge.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonacl.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_var.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdport.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/concat/g_concat.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_dev.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/stripe/g_stripe.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/clock.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/clock.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/mca.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/md_var.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_rmlock.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_var.h#29 integrate
.. //depot/projects/scottl-camlock/src/sys/net/netisr.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ipfw.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ipfw.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_log.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_nat.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_private.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_table.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/mld6_var.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/central/central.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/ebus/ebus.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/fhc/fhc.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/bus_common.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/intr_machdep.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/iommureg.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/iommuvar.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/isa/ofw_isa.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/apb.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/ofw_pci.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/ofw_pcib.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/ofw_pcibus.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizo.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sbus/dma_sbus.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sbus/sbus.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/eeprom.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/identcpu.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/interrupt.S#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/intr_machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/iommu.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/nexus.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/ofw_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/rtc.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/upa.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/conf/NOTES#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/acl.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/disk.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/mount.h#22 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/fs.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/acl.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_acl.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_lookup.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vnops.c#21 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/acltools/02.t#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/fc2.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/README#4 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/notescheck/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/notescheck/notescheck.py#1 branch
.. //depot/projects/scottl-camlock/src/usr.bin/finger/finger.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/killall/killall.1#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/rwho/rwho.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/sockstat/sockstat.1#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/amd64-fbsd32.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/i386-fbsd.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/syscalls.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/unzip/unzip.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/apm/apm.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/apm/apm.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/burncd/burncd.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/burncd/burncd.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/diskinfo/diskinfo.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/diskinfo/diskinfo.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/newsyslog/newsyslog.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/powerd/powerd.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/service/service.8#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/service/service.sh#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/syslogd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/syslogd/syslogd.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/watchdogd/watchdogd.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/zic/Theory#4 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/UPDATING#25 (text+ko) ====

@@ -161,7 +161,7 @@
 20090712: 
 	Padding has been added to struct tcpcb, sackhint and tcpstat in
 	<netinet/tcp_var.h> to facilitate future MFCs and bug fixes whilst
-	maintainig the ABI. However, this change breaks the ABI, so bump
+	maintaining the ABI. However, this change breaks the ABI, so bump
 	__FreeBSD_version to 800102. User space tools that rely on the size of
 	any of these structs (e.g. sockstat) need to be recompiled.
 
@@ -895,7 +895,7 @@
 	-------------
 	Avoid using make -j when upgrading.  While generally safe, there are
 	sometimes problems using -j to upgrade.  If your upgrade fails with
-	-j, please try again wtihout -j.  From time to time in the past there
+	-j, please try again without -j.  From time to time in the past there
 	have been problems using -j with buildworld and/or installworld.  This
 	is especially true when upgrading between "distant" versions (eg one
 	that cross a major release boundary or several minor releases, or when
@@ -1089,4 +1089,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.649 2009/12/18 16:35:28 ume Exp $
+$FreeBSD: src/UPDATING,v 1.650 2009/12/25 21:14:34 ru Exp $

==== //depot/projects/scottl-camlock/src/bin/pax/sel_subs.c#3 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $");
+__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.22 2009/12/21 19:18:27 delphij Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -396,6 +396,7 @@
 			default:
 				paxwarn(1, "Bad option %c with time range %s",
 				    *flgpt, str);
+				free(pt);
 				goto out;
 			}
 			++flgpt;

==== //depot/projects/scottl-camlock/src/bin/sh/alias.c#4 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.25 2009/06/01 10:50:17 rse Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.26 2009/12/24 18:41:14 jilles Exp $");
 
 #include <stdlib.h>
 #include "shell.h"
@@ -52,13 +52,13 @@
 STATIC struct alias *atab[ATABSIZE];
 STATIC int aliases;
 
-STATIC void setalias(char *, char *);
+STATIC void setalias(const char *, const char *);
 STATIC int unalias(const char *);
 STATIC struct alias **hashalias(const char *);
 
 STATIC
 void
-setalias(char *name, char *val)
+setalias(const char *name, const char *val)
 {
 	struct alias *ap, **app;
 
@@ -176,7 +176,7 @@
 }
 
 struct alias *
-lookupalias(char *name, int check)
+lookupalias(const char *name, int check)
 {
 	struct alias *ap = *hashalias(name);
 

==== //depot/projects/scottl-camlock/src/bin/sh/alias.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)alias.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/alias.h,v 1.8 2004/04/06 20:06:51 markm Exp $
+ * $FreeBSD: src/bin/sh/alias.h,v 1.9 2009/12/24 18:41:14 jilles Exp $
  */
 
 #define ALIASINUSE	1
@@ -42,7 +42,7 @@
 	int flag;
 };
 
-struct alias *lookupalias(char *, int);
+struct alias *lookupalias(const char *, int);
 int aliascmd(int, char **);
 int unaliascmd(int, char **);
 void rmaliases(void);

==== //depot/projects/scottl-camlock/src/bin/sh/arith.h#3 (text+ko) ====

@@ -27,15 +27,15 @@
  * SUCH DAMAGE.
  *
  *	@(#)arith.h	1.1 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/arith.h,v 1.12 2008/04/27 20:46:45 stefanf Exp $
+ * $FreeBSD: src/bin/sh/arith.h,v 1.13 2009/12/24 18:41:14 jilles Exp $
  */
 
 #include "shell.h"
 
 #define DIGITS(var) (3 + (2 + CHAR_BIT * sizeof((var))) / 3)
 
-extern char *arith_buf, *arith_startbuf;
+extern const char *arith_buf, *arith_startbuf;
 
-arith_t arith(char *);
+arith_t arith(const char *);
 void arith_lex_reset(void);
 int expcmd(int, char **);

==== //depot/projects/scottl-camlock/src/bin/sh/arith.y#3 (text+ko) ====

@@ -38,7 +38,7 @@
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.22 2008/04/27 20:46:45 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.23 2009/12/24 18:41:14 jilles Exp $");
 
 #include <limits.h>
 #include <stdio.h>
@@ -265,7 +265,7 @@
 #define YYPARSE_PARAM_TYPE arith_t *
 #define YYPARSE_PARAM result
 
-char *arith_buf, *arith_startbuf;
+const char *arith_buf, *arith_startbuf;
 
 int yylex(void);
 int yyparse(YYPARSE_PARAM_TYPE);
@@ -284,7 +284,7 @@
 }
 
 arith_t
-arith(char *s)
+arith(const char *s)
 {
 	arith_t result;
 
@@ -299,7 +299,7 @@
 }
 
 static void
-yyerror(char *s)
+yyerror(const char *s)
 {
 
 	yyerrok;
@@ -354,7 +354,7 @@
 	printf("%d\n", exp(argv[1]));
 }
 
-error(char *s)
+error(const char *s)
 {
 	fprintf(stderr, "exp: %s\n", s);
 	exit(1);

==== //depot/projects/scottl-camlock/src/bin/sh/cd.c#4 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.37 2009/11/21 14:53:22 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.38 2009/12/24 18:41:14 jilles Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -80,7 +80,7 @@
 cdcmd(int argc, char **argv)
 {
 	char *dest;
-	char *path;
+	const char *path;
 	char *p;
 	struct stat statb;
 	int ch, phys, print = 0;

==== //depot/projects/scottl-camlock/src/bin/sh/error.c#3 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.27 2009/11/22 18:23:30 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.28 2009/12/24 20:55:14 jilles Exp $");
 
 /*
  * Errors and exceptions.
@@ -67,7 +67,7 @@
 char *commandname;
 
 
-static void exverror(int, const char *, va_list) __printf0like(2, 0);
+static void exverror(int, const char *, va_list) __printf0like(2, 0) __dead2;
 
 /*
  * Called to raise an exception.  Since C doesn't include exceptions, we

==== //depot/projects/scottl-camlock/src/bin/sh/error.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)error.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/error.h,v 1.18 2009/11/22 18:23:30 jilles Exp $
+ * $FreeBSD: src/bin/sh/error.h,v 1.19 2009/12/24 20:55:14 jilles Exp $
  */
 
 /*
@@ -78,10 +78,10 @@
 #define CLEAR_PENDING_INT intpending = 0
 #define int_pending() intpending
 
-void exraise(int);
+void exraise(int) __dead2;
 void onint(void);
-void error(const char *, ...) __printf0like(1, 2);
-void exerror(int, const char *, ...) __printf0like(2, 3);
+void error(const char *, ...) __printf0like(1, 2) __dead2;
+void exerror(int, const char *, ...) __printf0like(2, 3) __dead2;
 
 
 /*

==== //depot/projects/scottl-camlock/src/bin/sh/exec.c#7 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.38 2009/12/24 18:41:14 jilles Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -98,7 +98,7 @@
 
 STATIC void tryexec(char *, char **, char **);
 STATIC void printentry(struct tblentry *, int);
-STATIC struct tblentry *cmdlookup(char *, int);
+STATIC struct tblentry *cmdlookup(const char *, int);
 STATIC void delete_cmd_entry(void);
 
 
@@ -109,7 +109,7 @@
  */
 
 void
-shellexec(char **argv, char **envp, char *path, int index)
+shellexec(char **argv, char **envp, const char *path, int index)
 {
 	char *cmdname;
 	int e;
@@ -175,13 +175,13 @@
  * NULL.
  */
 
-char *pathopt;
+const char *pathopt;
 
 char *
-padvance(char **path, char *name)
+padvance(const char **path, const char *name)
 {
-	char *p, *q;
-	char *start;
+	const char *p, *start;
+	char *q;
 	int len;
 
 	if (*path == NULL)
@@ -269,7 +269,7 @@
 printentry(struct tblentry *cmdp, int verbose)
 {
 	int index;
-	char *path;
+	const char *path;
 	char *name;
 
 	if (cmdp->cmdtype == CMDNORMAL) {
@@ -310,7 +310,8 @@
  */
 
 void
-find_command(char *name, struct cmdentry *entry, int printerr, char *path)
+find_command(const char *name, struct cmdentry *entry, int printerr,
+    const char *path)
 {
 	struct tblentry *cmdp;
 	int index;
@@ -446,7 +447,7 @@
  */
 
 int
-find_builtin(char *name, int *special)
+find_builtin(const char *name, int *special)
 {
 	const struct builtincmd *bp;
 
@@ -608,10 +609,10 @@
 
 
 STATIC struct tblentry *
-cmdlookup(char *name, int add)
+cmdlookup(const char *name, int add)
 {
 	int hashval;
-	char *p;
+	const char *p;
 	struct tblentry *cmdp;
 	struct tblentry **pp;
 
@@ -664,7 +665,7 @@
  */
 
 void
-addcmdentry(char *name, struct cmdentry *entry)
+addcmdentry(const char *name, struct cmdentry *entry)
 {
 	struct tblentry *cmdp;
 
@@ -684,7 +685,7 @@
  */
 
 void
-defun(char *name, union node *func)
+defun(const char *name, union node *func)
 {
 	struct cmdentry entry;
 
@@ -701,7 +702,7 @@
  */
 
 int
-unsetfunc(char *name)
+unsetfunc(const char *name)
 {
 	struct tblentry *cmdp;
 
@@ -767,7 +768,8 @@
 		switch (entry.cmdtype) {
 		case CMDNORMAL: {
 			if (strchr(argv[i], '/') == NULL) {
-				char *path = pathval(), *name;
+				const char *path = pathval();
+				char *name;
 				int j = entry.u.index;
 				do {
 					name = padvance(&path, argv[i]);

==== //depot/projects/scottl-camlock/src/bin/sh/exec.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 6/8/95
- * $FreeBSD: src/bin/sh/exec.h,v 1.16 2009/08/23 21:09:46 jilles Exp $
+ * $FreeBSD: src/bin/sh/exec.h,v 1.18 2009/12/24 20:55:14 jilles Exp $
  */
 
 /* values of cmdtype */
@@ -57,20 +57,20 @@
 };
 
 
-extern char *pathopt;		/* set by padvance */
+extern const char *pathopt;	/* set by padvance */
 extern int exerrno;		/* last exec error */
 
-void shellexec(char **, char **, char *, int);
-char *padvance(char **, char *);
+void shellexec(char **, char **, const char *, int) __dead2;
+char *padvance(const char **, const char *);
 int hashcmd(int, char **);
-void find_command(char *, struct cmdentry *, int, char *);
-int find_builtin(char *, int *);
+void find_command(const char *, struct cmdentry *, int, const char *);
+int find_builtin(const char *, int *);
 void hashcd(void);
 void changepath(const char *);
 void deletefuncs(void);
-void addcmdentry(char *, struct cmdentry *);
-void defun(char *, union node *);
-int unsetfunc(char *);
+void addcmdentry(const char *, struct cmdentry *);
+void defun(const char *, union node *);
+int unsetfunc(const char *);
 int typecmd_impl(int, char **, int);
 int typecmd(int, char **);
 void clearcmdentry(int);

==== //depot/projects/scottl-camlock/src/bin/sh/expand.c#5 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.56 2009/10/24 21:20:04 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.58 2009/12/25 15:29:18 jilles Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -107,7 +107,7 @@
 STATIC void addfname(char *);
 STATIC struct strlist *expsort(struct strlist *);
 STATIC struct strlist *msort(struct strlist *, int);
-STATIC int pmatch(char *, char *, int);
+STATIC int pmatch(const char *, const char *, int);
 STATIC char *cvtnum(int, char *);
 STATIC int collate_range_cmp(int, int);
 
@@ -271,8 +271,13 @@
 
 	while ((c = *p) != '\0') {
 		switch(c) {
-		case CTLESC:
-			return (startp);
+		case CTLESC: /* This means CTL* are always considered quoted. */
+		case CTLVAR:
+		case CTLENDVAR:
+		case CTLBACKQ:
+		case CTLBACKQ | CTLQUOTE:
+		case CTLARI:
+		case CTLENDARI:
 		case CTLQUOTEMARK:
 			return (startp);
 		case ':':
@@ -1338,7 +1343,7 @@
  */
 
 int
-patmatch(char *pattern, char *string, int squoted)
+patmatch(const char *pattern, const char *string, int squoted)
 {
 #ifdef notdef
 	if (pattern[0] == '!' && pattern[1] == '!')
@@ -1350,9 +1355,9 @@
 
 
 STATIC int
-pmatch(char *pattern, char *string, int squoted)
+pmatch(const char *pattern, const char *string, int squoted)
 {
-	char *p, *q;
+	const char *p, *q;
 	char c;
 
 	p = pattern;
@@ -1400,7 +1405,7 @@
 			} while (*q++ != '\0');
 			return 0;
 		case '[': {
-			char *endp;
+			const char *endp;
 			int invert, found;
 			char chr;
 
@@ -1504,7 +1509,7 @@
  */
 
 int
-casematch(union node *pattern, char *val)
+casematch(union node *pattern, const char *val)
 {
 	struct stackmark smark;
 	int result;

==== //depot/projects/scottl-camlock/src/bin/sh/expand.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)expand.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/expand.h,v 1.12 2004/04/06 20:06:51 markm Exp $
+ * $FreeBSD: src/bin/sh/expand.h,v 1.13 2009/12/24 18:41:14 jilles Exp $
  */
 
 struct strlist {
@@ -58,7 +58,7 @@
 void expandhere(union node *, int);
 void expandarg(union node *, struct arglist *, int);
 void expari(int);
-int patmatch(char *, char *, int);
+int patmatch(const char *, const char *, int);
 void rmescapes(char *);
-int casematch(union node *, char *);
+int casematch(union node *, const char *);
 int wordexpcmd(int, char **);

==== //depot/projects/scottl-camlock/src/bin/sh/histedit.c#5 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.32 2009/11/21 14:28:32 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.33 2009/12/24 18:41:14 jilles Exp $");
 
 #include <sys/param.h>
 #include <limits.h>
@@ -406,7 +406,7 @@
 }
 
 int
-not_fcnumber(char *s)
+not_fcnumber(const char *s)
 {
 	if (s == NULL)
 		return (0);
@@ -416,10 +416,10 @@
 }
 
 int
-str_to_event(char *str, int last)
+str_to_event(const char *str, int last)
 {
 	HistEvent he;
-	char *s = str;
+	const char *s = str;
 	int relative = 0;
 	int i, retval;
 

==== //depot/projects/scottl-camlock/src/bin/sh/input.c#5 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.27 2009/11/22 14:04:20 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.28 2009/12/24 18:41:14 jilles Exp $");
 
 #include <stdio.h>	/* defines BUFSIZ */
 #include <fcntl.h>
@@ -401,7 +401,7 @@
  */
 
 void
-setinputfile(char *fname, int push)
+setinputfile(const char *fname, int push)
 {
 	int fd;
 	int fd2;

==== //depot/projects/scottl-camlock/src/bin/sh/input.h#4 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)input.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/input.h,v 1.11 2009/11/22 14:04:20 jilles Exp $
+ * $FreeBSD: src/bin/sh/input.h,v 1.12 2009/12/24 18:41:14 jilles Exp $
  */
 
 /* PEOF (the end of file marker) is defined in syntax.h */
@@ -54,7 +54,7 @@
 void pungetc(void);
 void pushstring(char *, int, void *);
 void popstring(void);
-void setinputfile(char *, int);
+void setinputfile(const char *, int);
 void setinputfd(int, int);
 void setinputstring(char *, int);
 void popfile(void);

==== //depot/projects/scottl-camlock/src/bin/sh/jobs.c#3 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.73 2009/11/21 14:28:32 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.74 2009/12/25 20:21:35 jilles Exp $");
 
 #include <fcntl.h>
 #include <signal.h>
@@ -757,6 +757,7 @@
 		TRACE(("Child shell %d\n", (int)getpid()));
 		wasroot = rootshell;
 		rootshell = 0;
+		handler = &main_handler;
 		closescript();
 		INTON;
 		clear_traps();

==== //depot/projects/scottl-camlock/src/bin/sh/mail.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.14 2005/08/13 08:26:58 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.15 2009/12/24 18:41:14 jilles Exp $");
 
 /*
  * Routines to check for mail.  (Perhaps make part of main.c?)
@@ -72,7 +72,7 @@
 chkmail(int silent)
 {
 	int i;
-	char *mpath;
+	const char *mpath;
 	char *p;
 	char *q;
 	struct stackmark smark;

==== //depot/projects/scottl-camlock/src/bin/sh/main.c#4 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.32 2009/11/21 14:28:32 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.35 2009/12/25 20:21:35 jilles Exp $");
 
 #include <stdio.h>
 #include <signal.h>
@@ -75,6 +75,7 @@
 
 int rootpid;
 int rootshell;
+struct jmploc main_handler;
 
 STATIC void read_profile(char *);
 STATIC char *find_dot_file(char *);
@@ -90,14 +91,13 @@
 int
 main(int argc, char *argv[])
 {
-	struct jmploc jmploc;
 	struct stackmark smark;
 	volatile int state;
 	char *shinit;
 
 	(void) setlocale(LC_ALL, "");
 	state = 0;
-	if (setjmp(jmploc.loc)) {
+	if (setjmp(main_handler.loc)) {
 		/*
 		 * When a shell procedure is executed, we raise the
 		 * exception EXSHELLPROC to clean up before executing
@@ -143,7 +143,7 @@
 		else
 			goto state4;
 	}
-	handler = &jmploc;
+	handler = &main_handler;
 #ifdef DEBUG
 	opentrace();
 	trputs("Shell args:  ");  trargs(argv);
@@ -269,7 +269,7 @@
  */
 
 void
-readcmdfile(char *name)
+readcmdfile(const char *name)
 {
 	int fd;
 
@@ -296,7 +296,7 @@
 {
 	static char localname[FILENAME_MAX+1];
 	char *fullname;
-	char *path = pathval();
+	const char *path = pathval();
 	struct stat statb;
 
 	/* don't try this for absolute or relative paths */
@@ -315,7 +315,6 @@
 int
 dotcmd(int argc, char **argv)
 {
-	struct strlist *sp;
 	char *fullname;
 
 	if (argc < 2)
@@ -323,9 +322,6 @@
 
 	exitstatus = 0;
 
-	for (sp = cmdenviron; sp ; sp = sp->next)
-		setvareq(savestr(sp->text), VSTRFIXED|VTEXTFIXED);
-
 	fullname = find_dot_file(argv[1]);
 	setinputfile(fullname, 1);
 	commandname = fullname;

==== //depot/projects/scottl-camlock/src/bin/sh/main.h#2 (text+ko) ====

@@ -30,13 +30,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)main.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/main.h,v 1.8 2004/04/06 20:06:51 markm Exp $
+ * $FreeBSD: src/bin/sh/main.h,v 1.10 2009/12/25 20:21:35 jilles Exp $
  */
 
 extern int rootpid;	/* pid of main shell */
 extern int rootshell;	/* true if we aren't a child of the main shell */
+extern struct jmploc main_handler;	/* top level exception handler */
 
-void readcmdfile(char *);
+void readcmdfile(const char *);
 void cmdloop(int);
 int dotcmd(int, char **);
 int exitcmd(int, char **);

==== //depot/projects/scottl-camlock/src/bin/sh/memalloc.c#3 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.28 2009/06/01 10:50:17 rse Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.29 2009/12/24 18:41:14 jilles Exp $");
 
 #include <sys/param.h>
 #include "shell.h"
@@ -95,7 +95,7 @@
  */
 
 char *
-savestr(char *s)
+savestr(const char *s)
 {
 	char *p;
 

==== //depot/projects/scottl-camlock/src/bin/sh/memalloc.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)memalloc.h	8.2 (Berkeley) 5/4/95
- * $FreeBSD: src/bin/sh/memalloc.h,v 1.11 2009/06/01 10:50:17 rse Exp $
+ * $FreeBSD: src/bin/sh/memalloc.h,v 1.12 2009/12/24 18:41:14 jilles Exp $
  */
 
 #include <string.h>
@@ -51,7 +51,7 @@
 pointer ckmalloc(size_t);
 pointer ckrealloc(pointer, int);
 void ckfree(pointer);
-char *savestr(char *);
+char *savestr(const char *);

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912260005.nBQ05NbM081347>