Date: Sat, 1 Nov 2008 13:10:39 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 152311 for review Message-ID: <200811011310.mA1DAdMx063900@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=152311 Change 152311 by ed@ed_dull on 2008/11/01 13:10:17 IFC. Affected files ... .. //depot/projects/mpsafetty/UPDATING#12 integrate .. //depot/projects/mpsafetty/bin/cat/cat.c#2 integrate .. //depot/projects/mpsafetty/bin/chio/chio.c#2 integrate .. //depot/projects/mpsafetty/bin/cp/utils.c#5 integrate .. //depot/projects/mpsafetty/bin/rcp/rcp.c#2 integrate .. //depot/projects/mpsafetty/etc/Makefile#5 integrate .. //depot/projects/mpsafetty/etc/rc.d/netif#2 integrate .. //depot/projects/mpsafetty/lib/libc/gen/err.3#2 integrate .. //depot/projects/mpsafetty/lib/libc/stdtime/strftime.c#2 integrate .. //depot/projects/mpsafetty/lib/libcam/camlib.c#2 integrate .. //depot/projects/mpsafetty/lib/libutil/pty.c#4 integrate .. //depot/projects/mpsafetty/share/man/man4/Makefile#13 integrate .. //depot/projects/mpsafetty/share/man/man4/u3g.4#4 integrate .. //depot/projects/mpsafetty/share/man/man9/VOP_ACCESS.9#2 integrate .. //depot/projects/mpsafetty/share/man/man9/style.9#4 integrate .. //depot/projects/mpsafetty/share/man/man9/vaccess.9#2 integrate .. //depot/projects/mpsafetty/share/man/man9/vaccess_acl_posix1e.9#2 integrate .. //depot/projects/mpsafetty/share/misc/bsd-family-tree#3 integrate .. //depot/projects/mpsafetty/share/zoneinfo/southamerica#6 integrate .. //depot/projects/mpsafetty/share/zoneinfo/zone.tab#4 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/dump_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/minidump_machdep.c#5 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_mci.c#6 integrate .. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/boot1.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#15 integrate .. //depot/projects/mpsafetty/sys/conf/files#24 integrate .. //depot/projects/mpsafetty/sys/conf/options#13 integrate .. //depot/projects/mpsafetty/sys/dev/adb/adb_bus.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/adb/adbvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_dma.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_drv.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmc.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcbrvar.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcsd.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcvar.h#6 integrate .. //depot/projects/mpsafetty/sys/dev/sdhci/sdhci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/mpsafetty/sys/dev/usb/u3g.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/geom_disk.c#4 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/i386/dump_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/i386/local_apic.c#6 integrate .. //depot/projects/mpsafetty/sys/i386/i386/minidump_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/init_main.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/kern_proc.c#9 integrate .. //depot/projects/mpsafetty/sys/kern/kern_thr.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/sched_ule.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_stack.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#64 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/vnode_if.src#3 integrate .. //depot/projects/mpsafetty/sys/modules/rl/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_adhoc.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#6 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_sta.c#6 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/mpsafetty/sys/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/mpsafetty/sys/pci/if_rl.c#3 integrate .. //depot/projects/mpsafetty/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/cpufunc.h#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/endian.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/ata_dbdma.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/cuda.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/dbdma.c#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/dbdmavar.h#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/pmu.c#2 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_bsm_klib.c#6 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_cred.c#1 branch .. //depot/projects/mpsafetty/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_policy.h#5 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_process.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_syscalls.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/mpsafetty/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate .. //depot/projects/mpsafetty/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate .. //depot/projects/mpsafetty/sys/security/mac_bsdextended/ugidfw_vnode.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_lomac/mac_lomac.c#8 integrate .. //depot/projects/mpsafetty/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/mpsafetty/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/mpsafetty/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/mpsafetty/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/schizo.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/stack_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/sun4v/sun4v/db_trace.c#2 integrate .. //depot/projects/mpsafetty/sys/sun4v/sun4v/stack_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sys/_types.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/extattr.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#18 integrate .. //depot/projects/mpsafetty/sys/sys/tty.h#24 integrate .. //depot/projects/mpsafetty/sys/sys/types.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/user.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/vnode.h#7 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/mpsafetty/tools/tools/ath/athdebug/athdebug.c#2 integrate .. //depot/projects/mpsafetty/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/mpsafetty/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/mpsafetty/tools/tools/ath/athstats/main.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/UPDATING#12 (text+ko) ==== @@ -22,6 +22,9 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081028: + dummynet(4) ABI has changed. ipfw(8) needs to be recompiled. + 20081009: The uhci, ohci, ehci and slhci USB Host controller drivers have been put into separate modules. If you load the usb module @@ -1146,4 +1149,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.545 2008/10/10 06:37:51 n_hibma Exp $ +$FreeBSD: src/UPDATING,v 1.546 2008/10/28 14:14:57 oleg Exp $ ==== //depot/projects/mpsafetty/bin/cat/cat.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.32 2005/01/10 08:39:20 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.33 2008/10/30 14:05:57 ivoras Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -77,6 +77,17 @@ static int udom_open(const char *path, int flags); #endif +/* Memory strategy threshold, in pages: if physmem is larger then this, use a + * large buffer */ +#define PHYSPAGES_THRESHOLD (32*1024) + +/* Maximum buffer size in bytes - do not allow it to grow larger than this */ +#define BUFSIZE_MAX (2*1024*1024) + +/* Small (default) buffer size in bytes. It's inefficient for this to be + * smaller than MAXPHYS */ +#define BUFSIZE_SMALL (MAXPHYS) + int main(int argc, char *argv[]) { @@ -247,9 +258,17 @@ if (buf == NULL) { if (fstat(wfd, &sbuf)) err(1, "%s", filename); - bsize = MAX(sbuf.st_blksize, 1024); + if (S_ISREG(sbuf.st_mode)) { + /* If there's plenty of RAM, use a large copy buffer */ + if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) + bsize = MIN(BUFSIZE_MAX, MAXPHYS*8); + else + bsize = BUFSIZE_SMALL; + } else + bsize = MAX(sbuf.st_blksize, + (blksize_t)sysconf(_SC_PAGESIZE)); if ((buf = malloc(bsize)) == NULL) - err(1, "buffer"); + err(1, "malloc() failure of IO buffer"); } while ((nr = read(rfd, buf, bsize)) > 0) for (off = 0; nr; nr -= nw, off += nw) ==== //depot/projects/mpsafetty/bin/chio/chio.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.27 2005/01/10 08:39:20 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.28 2008/10/30 19:51:02 joerg Exp $"); #include <sys/param.h> #include <sys/chio.h> @@ -69,7 +69,7 @@ static void find_element(char *, uint16_t *, uint16_t *); static struct changer_element_status *get_element_status - (unsigned int, unsigned int); + (unsigned int, unsigned int, int); static int do_move(const char *, int, char **); static int do_exchange(const char *, int, char **); @@ -969,7 +969,8 @@ ++argv; --argc; /* Get the status */ - ces = get_element_status((unsigned int)type, (unsigned int)element); + ces = get_element_status((unsigned int)type, (unsigned int)element, + CHET_VT == type); if (NULL == ces) errx(1, "%s: null element status pointer", cname); @@ -1004,7 +1005,7 @@ * should free() it when done. */ static struct changer_element_status * -get_element_status(unsigned int type, unsigned int element) +get_element_status(unsigned int type, unsigned int element, int use_voltags) { struct changer_element_status_request cesr; struct changer_element_status *ces; @@ -1020,7 +1021,8 @@ cesr.cesr_element_type = (uint16_t)type; cesr.cesr_element_base = (uint16_t)element; cesr.cesr_element_count = 1; /* Only this one element */ - cesr.cesr_flags |= CESR_VOLTAGS; /* Grab voltags as well */ + if (use_voltags) + cesr.cesr_flags |= CESR_VOLTAGS; /* Grab voltags as well */ cesr.cesr_element_status = ces; if (ioctl(changer_fd, CHIOGSTATUS, (char *)&cesr) == -1) { ==== //depot/projects/mpsafetty/bin/cp/utils.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.56 2008/10/27 15:21:15 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.57 2008/10/30 14:05:57 ivoras Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -57,10 +57,22 @@ #define cp_pct(x, y) ((y == 0) ? 0 : (int)(100.0 * (x) / (y))) +/* Memory strategy threshold, in pages: if physmem is larger then this, use a + * large buffer */ +#define PHYSPAGES_THRESHOLD (32*1024) + +/* Maximum buffer size in bytes - do not allow it to grow larger than this */ +#define BUFSIZE_MAX (2*1024*1024) + +/* Small (default) buffer size in bytes. It's inefficient for this to be + * smaller than MAXPHYS */ +#define BUFSIZE_SMALL (MAXPHYS) + int copy_file(const FTSENT *entp, int dne) { - static char buf[MAXBSIZE]; + static char *buf = NULL; + static size_t bufsize; struct stat *fs; ssize_t wcount; size_t wresid; @@ -174,8 +186,23 @@ } else #endif { + if (buf == NULL) { + /* + * Note that buf and bufsize are static. If + * malloc() fails, it will fail at the start + * and not copy only some files. + */ + if (sysconf(_SC_PHYS_PAGES) > + PHYSPAGES_THRESHOLD) + bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + else + bufsize = BUFSIZE_SMALL; + buf = malloc(bufsize); + if (buf == NULL) + err(1, "Not enough memory"); + } wtotal = 0; - while ((rcount = read(from_fd, buf, MAXBSIZE)) > 0) { + while ((rcount = read(from_fd, buf, bufsize)) > 0) { for (bufp = buf, wresid = rcount; ; bufp += wcount, wresid -= wcount) { wcount = write(to_fd, bufp, wresid); ==== //depot/projects/mpsafetty/bin/rcp/rcp.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.46 2007/05/22 04:21:00 cperciva Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.47 2008/10/28 17:15:46 rdivacky Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -789,6 +789,4 @@ vwarnx(fmt, ap); va_end(ap); } - - va_end(ap); } ==== //depot/projects/mpsafetty/etc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.372 2008/10/27 16:13:28 sam Exp $ +# $FreeBSD: src/etc/Makefile,v 1.373 2008/10/29 18:46:47 mp Exp $ .include <bsd.own.mk> @@ -154,7 +154,7 @@ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; .if ${MK_TCSH} == "no" - sed -i "" -e 's;/bin/csh;;' ${DESTDIR}/etc/master.passwd + sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd .endif pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ ${DESTDIR}/etc/master.passwd ==== //depot/projects/mpsafetty/etc/rc.d/netif#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/etc/rc.d/netif,v 1.29 2008/06/23 20:50:11 mtm Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.30 2008/10/30 20:24:25 pjd Exp $ # # PROVIDE: netif @@ -141,7 +141,9 @@ esac echo "${_str} Network:${_ok}." if [ -z "${rc_quiet}" ]; then - /sbin/ifconfig ${_ok} + for ifn in ${_ok}; do + /sbin/ifconfig ${ifn} + done fi fi ==== //depot/projects/mpsafetty/lib/libc/gen/err.3#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)err.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.23 2007/01/09 00:27:53 imp Exp $ +.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.24 2008/10/31 15:14:40 rwatson Exp $ .\" .Dd March 6, 1999 .Dt ERR 3 @@ -178,15 +178,16 @@ Display the current errno information string and exit: .Bd -literal -offset indent if ((p = malloc(size)) == NULL) - err(1, NULL); + err(EX_OSERR, NULL); if ((fd = open(file_name, O_RDONLY, 0)) == -1) - err(1, "%s", file_name); + err(EX_NOINPUT, "%s", file_name); .Ed .Pp Display an error message and exit: .Bd -literal -offset indent if (tm.tm_hour < START_TIME) - errx(1, "too early, wait until %s", start_time_string); + errx(EX_DATAERR, "too early, wait until %s", + start_time_string); .Ed .Pp Warn of an error: @@ -195,7 +196,7 @@ warnx("%s: %s: trying the block device", raw_device, strerror(errno)); if ((fd = open(block_device, O_RDONLY, 0)) == -1) - err(1, "%s", block_device); + err(EX_OSFILE, "%s", block_device); .Ed .Pp Warn of an error without using the global variable ==== //depot/projects/mpsafetty/lib/libc/stdtime/strftime.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ static const char sccsid[] = "@(#)strftime.c 5.4 (Berkeley) 3/14/89"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.41 2004/11/04 08:34:57 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.42 2008/10/30 00:19:19 delphij Exp $"); #include "tzfile.h" #include <fcntl.h> @@ -177,7 +177,7 @@ { int warn2 = IN_SOME; - pt = _fmt(tptr->c_fmt, t, pt, ptlim, warnp); + pt = _fmt(tptr->c_fmt, t, pt, ptlim, &warn2); if (warn2 == IN_ALL) warn2 = IN_THIS; if (warn2 > *warnp) ==== //depot/projects/mpsafetty/lib/libcam/camlib.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.16 2006/11/02 00:54:32 mjacob Exp $"); +__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.17 2008/10/27 21:46:58 marius Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -346,6 +346,9 @@ bzero(&ccb, sizeof(union ccb)); ccb.ccb_h.func_code = XPT_DEV_MATCH; + ccb.ccb_h.path_id = CAM_XPT_PATH_ID; + ccb.ccb_h.target_id = CAM_TARGET_WILDCARD; + ccb.ccb_h.target_lun = CAM_LUN_WILDCARD; /* Setup the result buffer */ bufsize = sizeof(struct dev_match_result); ==== //depot/projects/mpsafetty/lib/libutil/pty.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.23 2008/10/03 09:42:50 ed Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.24 2008/10/28 06:00:13 ed Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -47,7 +47,6 @@ #include <stdlib.h> #include <string.h> #include <termios.h> -#include <unistd.h> int openpty(int *amaster, int *aslave, char *name, struct termios *termp, @@ -70,9 +69,6 @@ if (slavename == NULL) goto bad; - if (revoke(slavename) == -1) - goto bad; - slave = open(slavename, O_RDWR); if (slave == -1) goto bad; ==== //depot/projects/mpsafetty/share/man/man4/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.434 2008/10/09 21:25:01 n_hibma Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.435 2008/10/29 16:17:34 n_hibma Exp $ MAN= aac.4 \ acpi.4 \ @@ -553,6 +553,7 @@ MLINKS+=tun.4 if_tun.4 MLINKS+=tx.4 if_tx.4 MLINKS+=txp.4 if_txp.4 +MLINKS+=u3g.4 u3gstub.4 MLINKS+=udav.4 if_udav.4 MLINKS+=ural.4 if_ural.4 MLINKS+=vge.4 if_vge.4 ==== //depot/projects/mpsafetty/share/man/man4/u3g.4#4 (text+ko) ==== @@ -2,7 +2,7 @@ .\" Copyright (c) 2008 AnyWi Technologies .\" All rights reserved. .\" -.\" This code is derived from uark.c +.\" This code is derived from uark.c .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -16,7 +16,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.6 2008/10/19 17:19:42 simon Exp $ +.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.8 2008/10/29 18:49:37 brueffer Exp $ .\" .Dd October 7, 2008 .Dt U3G 4 @@ -43,7 +43,7 @@ The .Nm driver provides support for the multiple USB-to-serial interfaces exposed by -many 3G usb/pccard modems. +many 3G USB/PCCard modems. .Pp The device is accessed through the .Xr ucom 4 @@ -76,18 +76,30 @@ .It Sierra cards .El -(See /sys/dev/u3g.c for the complete list of supported cards for each vendor -mentioned above). +.Pp +See +.Pa /sys/dev/u3g.c +for the complete list of supported cards for each vendor +mentioned above. .Pp The supported 3G cards provide the necessary modem port for ppp, pppd, or mpd connections as well as extra ports (depending on the specific -device) to provide other functions (diagnostic port, SIM toolkit port) +device) to provide other functions (diagnostic port, SIM toolkit port). .Pp -In some of these devices a mass storage device supported by the +In some of these devices a mass storage device supported by the .Xr umass 4 -driver is present which contains Windows and Mac OSX drivers. This device is -hidden, unless the machine was booted in verbose (see -.Xr boot 8 ). +driver is present which contains Windows and Mac OS X drivers. +This device is +hidden, unless the machine was booted in verbose mode (see +.Xr boot 8 ) . +To temporarily unhide the device, set +.Va debug.bootverbose +to 1 using +.Xr sysctl 8 +and replug the device. +The +.Xr u3gstub 4 +device will attach temporarily and detach within seconds. .Sh SEE ALSO .Xr tty 4 , .Xr ucom 4 , @@ -95,10 +107,11 @@ .Sh HISTORY The .Nm -driver -appeared in +driver appeared in .Fx 8.0 , -is based on the uark driver, and written by +is based on the +.Xr uark 4 +driver, and written by .An Andrea Guzzo Aq aguzzo@anywi.com in September 2008. .Sh AUTHORS @@ -108,4 +121,4 @@ .An Andrea Guzzo Aq aguzzo@anywi.com and .An Nick Hibma Aq n_hibma@freebsd.org . -Hardware for testing provided by AnyWi Technologies, Leiden, NL. +Hardware for testing was provided by AnyWi Technologies, Leiden, NL. ==== //depot/projects/mpsafetty/share/man/man9/VOP_ACCESS.9#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/share/man/man9/VOP_ACCESS.9,v 1.21 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.22 2008/10/28 13:44:11 trasz Exp $ .\" .Dd July 24, 1996 .Os @@ -39,16 +39,16 @@ .In sys/param.h .In sys/vnode.h .Ft int -.Fn VOP_ACCESS "struct vnode *vp" "int mode" "struct ucred *cred" "struct thread *td" +.Fn VOP_ACCESS "struct vnode *vp" "accmode_t accmode" "struct ucred *cred" "struct thread *td" .Sh DESCRIPTION This entry point checks the access permissions of the file against the given credentials. .Pp Its arguments are: -.Bl -tag -width mode +.Bl -tag -width accmode .It Fa vp The vnode of the file to check. -.It Fa mode +.It Fa accmode The type of access required. .It Fa cred The user credentials to check. @@ -57,8 +57,8 @@ .El .Pp The -.Fa mode -is a mask which can contain +.Fa accmode +is a mask which can contain flags described in <sys/vnode.h>, e.g. .Dv VREAD , .Dv VWRITE or @@ -71,7 +71,7 @@ .Sh PSEUDOCODE .Bd -literal int -vop_access(struct vnode *vp, int mode, struct ucred *cred, struct thread *td) +vop_access(struct vnode *vp, accmode_t accmode, struct ucred *cred, struct thread *td) { int error; @@ -80,7 +80,7 @@ * unless the file is a socket, fifo, or a block or * character device resident on the filesystem. */ - if (mode & VWRITE) { + if (accmode & VWRITE) { switch (vp->v_type) { case VDIR: case VLNK: @@ -93,7 +93,7 @@ } /* If immutable bit set, nobody gets to write it. */ - if ((mode & VWRITE) && vp has immutable bit set) + if ((accmode & VWRITE) && vp has immutable bit set) return EPERM; /* Otherwise, user id 0 always gets access. */ @@ -104,11 +104,11 @@ /* Otherwise, check the owner. */ if (cred->cr_uid == owner of vp) { - if (mode & VEXEC) + if (accmode & VEXEC) mask |= S_IXUSR; - if (mode & VREAD) + if (accmode & VREAD) mask |= S_IRUSR; - if (mode & VWRITE) + if (accmode & VWRITE) mask |= S_IWUSR; return (((mode of vp) & mask) == mask ? 0 : EACCES); } @@ -116,21 +116,21 @@ /* Otherwise, check the groups. */ for (i = 0, gp = cred->cr_groups; i < cred->cr_ngroups; i++, gp++) if (group of vp == *gp) { - if (mode & VEXEC) + if (accmode & VEXEC) mask |= S_IXGRP; - if (mode & VREAD) + if (accmode & VREAD) mask |= S_IRGRP; - if (mode & VWRITE) + if (accmode & VWRITE) mask |= S_IWGRP; return (((mode of vp) & mask) == mask ? 0 : EACCES); } /* Otherwise, check everyone else. */ - if (mode & VEXEC) + if (accmode & VEXEC) mask |= S_IXOTH; - if (mode & VREAD) + if (accmode & VREAD) mask |= S_IROTH; - if (mode & VWRITE) + if (accmode & VWRITE) mask |= S_IWOTH; return (((mode of vp) & mask) == mask ? 0 : EACCES); } ==== //depot/projects/mpsafetty/share/man/man9/style.9#4 (text+ko) ==== @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)style 1.14 (Berkeley) 4/28/95 -.\" $FreeBSD: src/share/man/man9/style.9,v 1.127 2008/07/10 11:24:41 danger Exp $ +.\" $FreeBSD: src/share/man/man9/style.9,v 1.128 2008/10/31 14:47:15 rwatson Exp $ .\" .Dd February 10, 2005 .Dt STYLE 9 @@ -46,7 +46,7 @@ * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). * * @(#)style 1.14 (Berkeley) 4/28/95 - * $FreeBSD: src/share/man/man9/style.9,v 1.127 2008/07/10 11:24:41 danger Exp $ + * $FreeBSD: src/share/man/man9/style.9,v 1.128 2008/10/31 14:47:15 rwatson Exp $ */ /* @@ -111,7 +111,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.127 2008/07/10 11:24:41 danger Exp $"); +__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.128 2008/10/31 14:47:15 rwatson Exp $"); .Ed .Pp Leave another blank line before the header files. @@ -716,9 +716,9 @@ do not roll your own. .Bd -literal if ((four = malloc(sizeof(struct foo))) == NULL) - err(1, (char *)NULL); + err(EX_OSERR, NULL); if ((six = (int *)overflow()) == NULL) - errx(1, "number overflowed"); + errx(EX_DATAERR, "number overflowed"); return (eight); } .Ed ==== //depot/projects/mpsafetty/share/man/man9/vaccess.9#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vaccess.9,v 1.9 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/vaccess.9,v 1.10 2008/10/28 13:44:11 trasz Exp $ .\" .Dd August 22, 2001 .Os @@ -40,7 +40,7 @@ .Fa "mode_t file_mode" .Fa "uid_t file_uid" .Fa "gid_t file_gid" -.Fa "mode_t acc_mode" +.Fa "accmode_t accmode" .Fa "struct ucred *cred" .Fa "int *privused" .Fc @@ -59,7 +59,7 @@ owning GID .Fa file_gid , desired access mode -.Fa acc_mode , +.Fa accmode , requesting credential .Fa cred , and an optional call-by-reference ==== //depot/projects/mpsafetty/share/man/man9/vaccess_acl_posix1e.9#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vaccess_acl_posix1e.9,v 1.5 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/vaccess_acl_posix1e.9,v 1.6 2008/10/28 13:44:11 trasz Exp $ .\" .Dd August 22, 2001 .Os @@ -41,7 +41,7 @@ .Fa "uid_t file_uid" .Fa "gid_t file_gid" .Fa "struct acl *acl" -.Fa "mode_t acc_mode" +.Fa "accmode_t accmode" .Fa "struct ucred *cred" .Fa "int *privused" .Fc @@ -59,7 +59,7 @@ access ACL for the file .Fa acl , desired access mode -.Fa acc_mode , +.Fa accmode , requesting credential .Fa cred , and an optional call-by-reference ==== //depot/projects/mpsafetty/share/misc/bsd-family-tree#3 (text+ko) ==== @@ -222,6 +222,7 @@ | 7.0 | | | | | | | | OpenBSD 4.3 | | V | | | DragonFly 2.0.0 + | | | OpenBSD 4.4 | | | | | | FreeBSD 8 -current | NetBSD -current OpenBSD -current | | | | | | @@ -486,6 +487,7 @@ FreeBSD 7.0 2008-02-27 [FBD] OpenBSD 4.3 2008-05-01 [OBD] DragonFly 2.0.0 2008-07-21 [DFB] +OpenBSD 4.4 2008-11-01 [OBD] Bibliography ------------------------ @@ -546,4 +548,4 @@ Copyright (c) 1997-2007 Wolfram Schneider <wosch@FreeBSD.ORG> URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.121 2008/07/23 14:25:39 maxim Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.122 2008/11/01 06:48:28 maxim Exp $ ==== //depot/projects/mpsafetty/share/zoneinfo/southamerica#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)southamerica 8.30 +# @(#)southamerica 8.33 # <pre> # This data is by no means authoritative; if you think you know better, @@ -193,6 +193,26 @@ # </a> # So there is no summer time in Argentina for now. +# From Mariano Absatz (2008-10-20): +# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina +# From 2008-10-19 until 2009-03-15 +# <a href="http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01">; +# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01 +# </a> +# +# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer 2008/2009: +# Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La Pampa, Neuquen, Rio Negro, Chubut, Santa Cruz +# and Tierra del Fuego +# <a href="http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01">; +# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01 +# </a> +# +# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying +# it will not apply DST either (even when it was not included in Decree 1705/2008) +# <a href="http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc">; +# http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc +# </a> + Rule Arg 2007 only - Dec 30 0:00 1:00 S Rule Arg 2008 max - Mar Sun>=15 0:00 0 - Rule Arg 2008 max - Oct Sun>=15 0:00 1:00 S @@ -343,9 +363,8 @@ -4:00 Arg AR%sT 2000 Mar 3 -3:00 Arg AR%sT # -# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC), -# Formosa (FM), Salta (SA), Santiago del Estero (SE), Cordoba (CB), -# La Pampa (LP), Neuquen (NQ), Rio Negro (RN) +# Cordoba (CB), Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), +# Chaco (CC), Formosa (FM), Santiago del Estero (SE) # # Shanks & Pottenger also make the following claims, which we haven't verified: # - Formosa switched to -3:00 on 1991-01-07. @@ -364,6 +383,18 @@ -4:00 Arg AR%sT 2000 Mar 3 -3:00 Arg AR%sT # +# Salta (SA), La Pampa (LP), Neuquen (NQ), Rio Negro (RN) +Zone America/Argentina/Salta -4:21:40 - LMT 1894 Oct 31 + -4:16:48 - CMT 1920 May + -4:00 - ART 1930 Dec + -4:00 Arg AR%sT 1969 Oct 5 + -3:00 Arg AR%sT 1991 Mar 3 + -4:00 - WART 1991 Oct 20 + -3:00 Arg AR%sT 1999 Oct 3 + -4:00 Arg AR%sT 2000 Mar 3 + -3:00 Arg AR%sT 2008 Oct 18 + -3:00 - ART +# # Tucuman (TM) Zone America/Argentina/Tucuman -4:20:52 - LMT 1894 Oct 31 -4:16:48 - CMT 1920 May @@ -388,7 +419,8 @@ -4:00 Arg AR%sT 2000 Mar 3 -3:00 - ART 2004 Jun 1 -4:00 - WART 2004 Jun 20 - -3:00 Arg AR%sT + -3:00 Arg AR%sT 2008 Oct 18 + -3:00 - ART # # San Juan (SJ) Zone America/Argentina/San_Juan -4:34:04 - LMT 1894 Oct 31 @@ -401,7 +433,8 @@ -4:00 Arg AR%sT 2000 Mar 3 -3:00 - ART 2004 May 31 -4:00 - WART 2004 Jul 25 - -3:00 Arg AR%sT + -3:00 Arg AR%sT 2008 Oct 18 + -3:00 - ART # # Jujuy (JY) Zone America/Argentina/Jujuy -4:21:12 - LMT 1894 Oct 31 @@ -415,7 +448,8 @@ -3:00 1:00 ARST 1992 -3:00 Arg AR%sT 1999 Oct 3 -4:00 Arg AR%sT 2000 Mar 3 - -3:00 Arg AR%sT + -3:00 Arg AR%sT 2008 Oct 18 + -3:00 - ART # # Catamarca (CT), Chubut (CH) Zone America/Argentina/Catamarca -4:23:08 - LMT 1894 Oct 31 @@ -428,7 +462,8 @@ -4:00 Arg AR%sT 2000 Mar 3 -3:00 - ART 2004 Jun 1 -4:00 - WART 2004 Jun 20 - -3:00 Arg AR%sT + -3:00 Arg AR%sT 2008 Oct 18 + -3:00 - ART # # Mendoza (MZ) Zone America/Argentina/Mendoza -4:35:16 - LMT 1894 Oct 31 @@ -445,7 +480,8 @@ -4:00 Arg AR%sT 2000 Mar 3 -3:00 - ART 2004 May 23 -4:00 - WART 2004 Sep 26 - -3:00 Arg AR%sT + -3:00 Arg AR%sT 2008 Oct 18 + -3:00 - ART # # San Luis (SL) Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31 @@ -473,7 +509,8 @@ -4:00 Arg AR%sT 2000 Mar 3 -3:00 - ART 2004 Jun 1 -4:00 - WART 2004 Jun 20 - -3:00 Arg AR%sT + -3:00 Arg AR%sT 2008 Oct 18 + -3:00 - ART # # Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF) Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31 @@ -484,7 +521,8 @@ -4:00 Arg AR%sT 2000 Mar 3 -3:00 - ART 2004 May 30 -4:00 - WART 2004 Jun 20 - -3:00 Arg AR%sT + -3:00 Arg AR%sT 2008 Oct 18 + -3:00 - ART # Aruba # Zone NAME GMTOFF RULES FORMAT [UNTIL] ==== //depot/projects/mpsafetty/share/zoneinfo/zone.tab#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)zone.tab 8.19 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811011310.mA1DAdMx063900>