From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 00:44:41 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B362106564A; Sun, 6 Nov 2011 00:44:41 +0000 (UTC) (envelope-from mjacob@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EF35D8FC08; Sun, 6 Nov 2011 00:44:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA60ieg0091691; Sun, 6 Nov 2011 00:44:40 GMT (envelope-from mjacob@svn.freebsd.org) Received: (from mjacob@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA60ie5H091688; Sun, 6 Nov 2011 00:44:40 GMT (envelope-from mjacob@svn.freebsd.org) Message-Id: <201111060044.pA60ie5H091688@svn.freebsd.org> From: Matt Jacob Date: Sun, 6 Nov 2011 00:44:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227126 - head/sys/dev/isp X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 00:44:41 -0000 Author: mjacob Date: Sun Nov 6 00:44:40 2011 New Revision: 227126 URL: http://svn.freebsd.org/changeset/base/227126 Log: Implement the sysctl's for fibre channel that are listed in the man page. MFC after: 3 days Modified: head/sys/dev/isp/isp_freebsd.c head/sys/dev/isp/isp_freebsd.h Modified: head/sys/dev/isp/isp_freebsd.c ============================================================================== --- head/sys/dev/isp/isp_freebsd.c Sat Nov 5 22:44:37 2011 (r227125) +++ head/sys/dev/isp/isp_freebsd.c Sun Nov 6 00:44:40 2011 (r227126) @@ -175,6 +175,14 @@ isp_attach_chan(ispsoftc_t *isp, struct isp_prt(isp, ISP_LOGERR, "cannot create test target thread"); } #endif + if (chan == 0) { + struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(isp->isp_osinfo.dev); + struct sysctl_oid *tree = device_get_sysctl_tree(isp->isp_osinfo.dev); + SYSCTL_ADD_QUAD(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "wwnn", CTLFLAG_RD, &FCPARAM(isp, 0)->isp_wwnn, "World Wide Node Name"); + SYSCTL_ADD_QUAD(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "wwpn", CTLFLAG_RD, &FCPARAM(isp, 0)->isp_wwpn, "World Wide Port Name"); + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "loop_down_limit", CTLFLAG_RW, &ISP_FC_PC(isp, 0)->loop_down_limit, 0, "Loop Down Limit"); + SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "gone_device_time", CTLFLAG_RW, &ISP_FC_PC(isp, 0)->gone_device_time, 0, "Gone Device Time"); + } } return (0); } Modified: head/sys/dev/isp/isp_freebsd.h ============================================================================== --- head/sys/dev/isp/isp_freebsd.h Sat Nov 5 22:44:37 2011 (r227125) +++ head/sys/dev/isp/isp_freebsd.h Sun Nov 6 00:44:40 2011 (r227126) @@ -38,6 +38,7 @@ #include #include #include +#include #include #include From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 02:03:27 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E613106566C; Sun, 6 Nov 2011 02:03:27 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 64A998FC1F; Sun, 6 Nov 2011 02:03:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA623R46094058; Sun, 6 Nov 2011 02:03:27 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA623Rdi094056; Sun, 6 Nov 2011 02:03:27 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201111060203.pA623Rdi094056@svn.freebsd.org> From: Alan Cox Date: Sun, 6 Nov 2011 02:03:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227127 - head/sys/vm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 02:03:27 -0000 Author: alc Date: Sun Nov 6 02:03:27 2011 New Revision: 227127 URL: http://svn.freebsd.org/changeset/base/227127 Log: Wake up the page daemon in vm_page_alloc_freelist() if it couldn't allocate the requested page because too few pages are cached or free. Document the VM_ALLOC_COUNT() option to vm_page_alloc() and vm_page_alloc_freelist(). Make style changes to vm_page_alloc() and vm_page_alloc_freelist(), such as using a variable name that more closely corresponds to the comments. Modified: head/sys/vm/vm_page.c Modified: head/sys/vm/vm_page.c ============================================================================== --- head/sys/vm/vm_page.c Sun Nov 6 00:44:40 2011 (r227126) +++ head/sys/vm/vm_page.c Sun Nov 6 02:03:27 2011 (r227127) @@ -1298,6 +1298,8 @@ vm_page_cache_transfer(vm_object_t orig_ * VM_ALLOC_INTERRUPT interrupt time request * * optional allocation flags: + * VM_ALLOC_COUNT(number) the number of additional pages that the caller + * intends to allocate * VM_ALLOC_IFCACHED return page only if it is cached * VM_ALLOC_IFNOTCACHED return NULL, do not reactivate if the page * is cached @@ -1315,27 +1317,26 @@ vm_page_alloc(vm_object_t object, vm_pin struct vnode *vp = NULL; vm_object_t m_object; vm_page_t m; - int flags, page_req; + int flags, req_class; - if ((req & VM_ALLOC_NOOBJ) == 0) { - KASSERT(object != NULL, - ("vm_page_alloc: NULL object.")); + KASSERT((object != NULL) == ((req & VM_ALLOC_NOOBJ) == 0), + ("vm_page_alloc: inconsistent object/req")); + if (object != NULL) VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); - } - page_req = req & VM_ALLOC_CLASS_MASK; + req_class = req & VM_ALLOC_CLASS_MASK; /* - * The pager is allowed to eat deeper into the free page list. + * The page daemon is allowed to dig deeper into the free page list. */ - if ((curproc == pageproc) && (page_req != VM_ALLOC_INTERRUPT)) - page_req = VM_ALLOC_SYSTEM; + if (curproc == pageproc && req_class != VM_ALLOC_INTERRUPT) + req_class = VM_ALLOC_SYSTEM; mtx_lock(&vm_page_queue_free_mtx); if (cnt.v_free_count + cnt.v_cache_count > cnt.v_free_reserved || - (page_req == VM_ALLOC_SYSTEM && + (req_class == VM_ALLOC_SYSTEM && cnt.v_free_count + cnt.v_cache_count > cnt.v_interrupt_free_min) || - (page_req == VM_ALLOC_INTERRUPT && + (req_class == VM_ALLOC_INTERRUPT && cnt.v_free_count + cnt.v_cache_count > 0)) { /* * Allocate from the free queue if the number of free pages @@ -1383,7 +1384,7 @@ vm_page_alloc(vm_object_t object, vm_pin */ mtx_unlock(&vm_page_queue_free_mtx); atomic_add_int(&vm_pageout_deficit, - MAX((u_int)req >> VM_ALLOC_COUNT_SHIFT, 1)); + max((u_int)req >> VM_ALLOC_COUNT_SHIFT, 1)); pagedaemon_wakeup(); return (NULL); } @@ -1391,7 +1392,6 @@ vm_page_alloc(vm_object_t object, vm_pin /* * At this point we had better have found a good page. */ - KASSERT(m != NULL, ("vm_page_alloc: missing page")); KASSERT(m->queue == PQ_NONE, ("vm_page_alloc: page %p has unexpected queue %d", m, m->queue)); @@ -1403,6 +1403,8 @@ vm_page_alloc(vm_object_t object, vm_pin ("vm_page_alloc: page %p has unexpected memattr %d", m, pmap_page_get_memattr(m))); if ((m->flags & PG_CACHED) != 0) { + KASSERT((m->flags & PG_ZERO) == 0, + ("vm_page_alloc: cached page %p is PG_ZERO", m)); KASSERT(m->valid != 0, ("vm_page_alloc: cached page %p is invalid", m)); if (m->object == object && m->pindex == pindex) @@ -1546,6 +1548,8 @@ vm_page_alloc_init(vm_page_t m) * VM_ALLOC_INTERRUPT interrupt time request * * optional allocation flags: + * VM_ALLOC_COUNT(number) the number of additional pages that the caller + * intends to allocate * VM_ALLOC_WIRED wire the allocated page * VM_ALLOC_ZERO prefer a zeroed page * @@ -1557,20 +1561,32 @@ vm_page_alloc_freelist(int flind, int re struct vnode *drop; vm_page_t m; u_int flags; - int page_req; + int req_class; + + req_class = req & VM_ALLOC_CLASS_MASK; + + /* + * The page daemon is allowed to dig deeper into the free page list. + */ + if (curproc == pageproc && req_class != VM_ALLOC_INTERRUPT) + req_class = VM_ALLOC_SYSTEM; - m = NULL; - page_req = req & VM_ALLOC_CLASS_MASK; - mtx_lock(&vm_page_queue_free_mtx); /* * Do not allocate reserved pages unless the req has asked for it. */ + mtx_lock(&vm_page_queue_free_mtx); if (cnt.v_free_count + cnt.v_cache_count > cnt.v_free_reserved || - (page_req == VM_ALLOC_SYSTEM && + (req_class == VM_ALLOC_SYSTEM && cnt.v_free_count + cnt.v_cache_count > cnt.v_interrupt_free_min) || - (page_req == VM_ALLOC_INTERRUPT && - cnt.v_free_count + cnt.v_cache_count > 0)) { + (req_class == VM_ALLOC_INTERRUPT && + cnt.v_free_count + cnt.v_cache_count > 0)) m = vm_phys_alloc_freelist_pages(flind, VM_FREEPOOL_DIRECT, 0); + else { + mtx_unlock(&vm_page_queue_free_mtx); + atomic_add_int(&vm_pageout_deficit, + max((u_int)req >> VM_ALLOC_COUNT_SHIFT, 1)); + pagedaemon_wakeup(); + return (NULL); } if (m == NULL) { mtx_unlock(&vm_page_queue_free_mtx); From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 02:10:41 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24808106566B; Sun, 6 Nov 2011 02:10:41 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1399D8FC12; Sun, 6 Nov 2011 02:10:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA62AeTt094308; Sun, 6 Nov 2011 02:10:40 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA62Ae9D094304; Sun, 6 Nov 2011 02:10:40 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201111060210.pA62Ae9D094304@svn.freebsd.org> From: "David E. O'Brien" Date: Sun, 6 Nov 2011 02:10:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227128 - in stable/9: contrib/gcc gnu/usr.bin/cc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 02:10:41 -0000 Author: obrien Date: Sun Nov 6 02:10:40 2011 New Revision: 227128 URL: http://svn.freebsd.org/changeset/base/227128 Log: MFC: r226702 * Don't give the impression that this compiler is GPLv3. (It is "well known" that GCC 4.2.2 is GPLv3.) * Don't give the impression that this compiler isn't "trustable". * Fix dependency nit. Approved by: re (kib) Modified: stable/9/contrib/gcc/BASE-VER stable/9/contrib/gcc/DEV-PHASE stable/9/gnu/usr.bin/cc/Makefile.ver Directory Properties: stable/9/ (props changed) stable/9/contrib/gcc/ (props changed) Modified: stable/9/contrib/gcc/BASE-VER ============================================================================== --- stable/9/contrib/gcc/BASE-VER Sun Nov 6 02:03:27 2011 (r227127) +++ stable/9/contrib/gcc/BASE-VER Sun Nov 6 02:10:40 2011 (r227128) @@ -1 +1 @@ -4.2.2 +4.2.1 Modified: stable/9/contrib/gcc/DEV-PHASE ============================================================================== --- stable/9/contrib/gcc/DEV-PHASE Sun Nov 6 02:03:27 2011 (r227127) +++ stable/9/contrib/gcc/DEV-PHASE Sun Nov 6 02:10:40 2011 (r227128) @@ -1 +1 @@ -prerelease +patched Modified: stable/9/gnu/usr.bin/cc/Makefile.ver ============================================================================== --- stable/9/gnu/usr.bin/cc/Makefile.ver Sun Nov 6 02:03:27 2011 (r227127) +++ stable/9/gnu/usr.bin/cc/Makefile.ver Sun Nov 6 02:10:40 2011 (r227128) @@ -4,7 +4,7 @@ BASEVER!= cat ${GCCDIR}/BASE-VER DATESTAMP!= cat ${GCCDIR}/DATESTAMP DEVPHASE!= cat ${GCCDIR}/DEV-PHASE -version.o: version.c +version.o: version.c ${GCCDIR}/BASE-VER ${GCCDIR}/DATESTAMP ${GCCDIR}/DEV-PHASE ${CC} ${CFLAGS} -DBASEVER=\"${BASEVER}\" \ -DDATESTAMP=\"\ ${DATESTAMP}\" \ -DDEVPHASE=\"\ ${DEVPHASE}\" -c ${.IMPSRC} From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 05:20:27 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B71D71065670; Sun, 6 Nov 2011 05:20:27 +0000 (UTC) (envelope-from fjoe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A6A7C8FC0A; Sun, 6 Nov 2011 05:20:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA65KRqx000636; Sun, 6 Nov 2011 05:20:27 GMT (envelope-from fjoe@svn.freebsd.org) Received: (from fjoe@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA65KRID000633; Sun, 6 Nov 2011 05:20:27 GMT (envelope-from fjoe@svn.freebsd.org) Message-Id: <201111060520.pA65KRID000633@svn.freebsd.org> From: Max Khon Date: Sun, 6 Nov 2011 05:20:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227130 - head/sys/netgraph X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 05:20:27 -0000 Author: fjoe Date: Sun Nov 6 05:20:27 2011 New Revision: 227130 URL: http://svn.freebsd.org/changeset/base/227130 Log: Constify "address" argument of ng_address_path(). Modified: head/sys/netgraph/netgraph.h head/sys/netgraph/ng_base.c Modified: head/sys/netgraph/netgraph.h ============================================================================== --- head/sys/netgraph/netgraph.h Sun Nov 6 03:18:50 2011 (r227129) +++ head/sys/netgraph/netgraph.h Sun Nov 6 05:20:27 2011 (r227130) @@ -1135,7 +1135,7 @@ SYSCTL_DECL(_net_graph); */ int ng_address_ID(node_p here, item_p item, ng_ID_t ID, ng_ID_t retaddr); int ng_address_hook(node_p here, item_p item, hook_p hook, ng_ID_t retaddr); -int ng_address_path(node_p here, item_p item, char *address, ng_ID_t raddr); +int ng_address_path(node_p here, item_p item, const char *address, ng_ID_t raddr); int ng_bypass(hook_p hook1, hook_p hook2); hook_p ng_findhook(node_p node, const char *name); struct ng_type *ng_findtype(const char *type); Modified: head/sys/netgraph/ng_base.c ============================================================================== --- head/sys/netgraph/ng_base.c Sun Nov 6 03:18:50 2011 (r227129) +++ head/sys/netgraph/ng_base.c Sun Nov 6 05:20:27 2011 (r227130) @@ -3515,7 +3515,7 @@ ng_address_hook(node_p here, item_p item } int -ng_address_path(node_p here, item_p item, char *address, ng_ID_t retaddr) +ng_address_path(node_p here, item_p item, const char *address, ng_ID_t retaddr) { node_p dest = NULL; hook_p hook = NULL; From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 05:23:42 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9DB0106566C; Sun, 6 Nov 2011 05:23:42 +0000 (UTC) (envelope-from fjoe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA02F8FC0A; Sun, 6 Nov 2011 05:23:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA65Ngwn000777; Sun, 6 Nov 2011 05:23:42 GMT (envelope-from fjoe@svn.freebsd.org) Received: (from fjoe@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA65NgdP000775; Sun, 6 Nov 2011 05:23:42 GMT (envelope-from fjoe@svn.freebsd.org) Message-Id: <201111060523.pA65NgdP000775@svn.freebsd.org> From: Max Khon Date: Sun, 6 Nov 2011 05:23:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227131 - head/sys/netgraph X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 05:23:43 -0000 Author: fjoe Date: Sun Nov 6 05:23:42 2011 New Revision: 227131 URL: http://svn.freebsd.org/changeset/base/227131 Log: Fix potential double mbuf free: M_PREPEND may free mbuf chain and return NULL but item will still have the reference ot the mbuf chain and will free it upon destruction. Modified: head/sys/netgraph/ng_cisco.c Modified: head/sys/netgraph/ng_cisco.c ============================================================================== --- head/sys/netgraph/ng_cisco.c Sun Nov 6 05:20:27 2011 (r227130) +++ head/sys/netgraph/ng_cisco.c Sun Nov 6 05:23:42 2011 (r227131) @@ -359,12 +359,13 @@ cisco_rcvdata(hook_p hook, item_p item) /* OK so it came from a protocol, heading out. Prepend general data packet header. For now, IP,IPX only */ - m = NGI_M(item); /* still associated with item */ + NGI_GET_M(item, m); M_PREPEND(m, CISCO_HEADER_LEN, M_DONTWAIT); if (!m) { error = ENOBUFS; goto out; } + NGI_M(item) = m; h = mtod(m, struct cisco_header *); h->address = CISCO_UNICAST; h->control = 0; From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 05:24:54 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E1FEB1065672; Sun, 6 Nov 2011 05:24:54 +0000 (UTC) (envelope-from fjoe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D1EFE8FC15; Sun, 6 Nov 2011 05:24:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA65OsDW000844; Sun, 6 Nov 2011 05:24:54 GMT (envelope-from fjoe@svn.freebsd.org) Received: (from fjoe@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA65OsVj000842; Sun, 6 Nov 2011 05:24:54 GMT (envelope-from fjoe@svn.freebsd.org) Message-Id: <201111060524.pA65OsVj000842@svn.freebsd.org> From: Max Khon Date: Sun, 6 Nov 2011 05:24:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227132 - head/sys/netgraph X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 05:24:55 -0000 Author: fjoe Date: Sun Nov 6 05:24:54 2011 New Revision: 227132 URL: http://svn.freebsd.org/changeset/base/227132 Log: - Fix potential double mbuf free: M_PREPEND may free mbuf chain and return NULL but item will still have the reference ot the mbuf chain and will free it upon destruction. - Fix memory leak (unfree'd item on error path). Modified: head/sys/netgraph/ng_atmllc.c Modified: head/sys/netgraph/ng_atmllc.c ============================================================================== --- head/sys/netgraph/ng_atmllc.c Sun Nov 6 05:23:42 2011 (r227131) +++ head/sys/netgraph/ng_atmllc.c Sun Nov 6 05:24:54 2011 (r227132) @@ -153,7 +153,7 @@ ng_atmllc_rcvdata(hook_p hook, item_p it int error; priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); - m = NGI_M(item); + NGI_GET_M(item, m); outhook = NULL; padding = 0; @@ -170,6 +170,7 @@ ng_atmllc_rcvdata(hook_p hook, item_p it if (m->m_len < sizeof(struct atmllc) + ETHER_HDR_LEN) { m = m_pullup(m, sizeof(struct atmllc) + ETHER_HDR_LEN); if (m == NULL) { + NG_FREE_ITEM(item); return (ENOMEM); } } @@ -236,6 +237,7 @@ ng_atmllc_rcvdata(hook_p hook, item_p it } if (outhook == NULL) { + NG_FREE_M(m); NG_FREE_ITEM(item); return (0); } From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:02:15 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BAD221065672; Sun, 6 Nov 2011 07:02:15 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A88B88FC0A; Sun, 6 Nov 2011 07:02:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA672FFP004238; Sun, 6 Nov 2011 07:02:15 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA672DSY004235; Sun, 6 Nov 2011 07:02:14 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060702.pA672DSY004235@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:02:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227133 - stable/9/games/fortune/datfiles X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:02:15 -0000 Author: dougb Date: Sun Nov 6 07:02:13 2011 New Revision: 227133 URL: http://svn.freebsd.org/changeset/base/227133 Log: MFC r226898: Fix the text and attribution of the poem "Youth" by Samuel Ullman. Our copy was a bastardization of the "older" (probably original?) and shorter version of the poem; and the "newer" version that is better known, and arguably more popular. Standardize on the latter. Cf. http://www.bartleby.com/73/2099.html Approved by: re (kensmith) Modified: stable/9/games/fortune/datfiles/fortunes Directory Properties: stable/9/games/fortune/ (props changed) Modified: stable/9/games/fortune/datfiles/fortunes ============================================================================== --- stable/9/games/fortune/datfiles/fortunes Sun Nov 6 05:24:54 2011 (r227132) +++ stable/9/games/fortune/datfiles/fortunes Sun Nov 6 07:02:13 2011 (r227133) @@ -4942,25 +4942,37 @@ cats on the dinette table, etc. "That stop him?" "No, but it sure slowed him up." % - Youth is not a time of life, it is a state of mind; it is a temper of -the will, a quality of the imagination, a vigor of the emotions, a predominance -of courage over timidity, of the appetite for adventure over love of ease. - Nobody grows old by merely living a number of years; people grow -old only by deserting their ideals. Years wrinkle the skin, but to give up -enthusiasm wrinkles the soul. Worry, doubt, self-distrust, fear, and despair --- these are the long, long years that bow the head and turn the growing spirit -back to dust. - Whether seventy or sixteen, there is in every being's heart the love -of wonder, the sweet amazement at the stars and the starlike things and -thoughts, the undaunted challenge of events, the unfailing childlike appetite -for what next, and the joy and the game of life. - You are as young as your faith, as old as your doubt; as young as your -self-confidence, as old as your fear, as young as your hope, as old as your -despair. - So long as your heart receives messages of beauty, cheer, courage, -grandeur and power from the earth, from man, and from the Infinite, so long -you are young. - -- Samuel Ullman + Youth is not a time of life--it is a state of mind. It is not a +matter of red cheeks, red lips and supple knees. It is a temper of the +will; a quality of the imagination; a vigor of the emotions; it is a +freshness of the deep springs of life. Youth means a tempermental +predominance of courage over timidity, of the appetite for adventure +over a life of ease. This often exists in a man of fifty, more than in +a boy of twenty. Nobody grows old by merely living a number of years; +people grow old by deserting their ideals. + + Years may wrinkle the skin, but to give up enthusiasm wrinkles +the soul. Worry, doubt, self-distrust, fear and despair--these are the +long, long years that bow the head and turn the growing spirit back to +dust. + + Whether seventy or sixteen, there is in every being’s heart a +love of wonder; the sweet amazement at the stars and starlike things and +thoughts; the undaunted challenge of events, the unfailing childlike +appetite for what comes next, and the joy in the game of life. + + You are as young as your faith, as old as your doubt; as young +as your self-confidence, as old as your fear, as young as your hope, as +old as your despair. + + In the central place of your heart there is a wireless station. +So long as it receives messages of beauty, hope, cheer, grandeur, +courage, and power from the earth, from men and from the Infinite--so +long are you young. When the wires are all down and the central places +of your heart are covered with the snows of pessimism and the ice of +cynicism, then are you grown old, indeed! + -- Samuel Ullman, "Youth" (1934), as published in + The Silver Treasury, Prose and Verse for Every Mood % " " -- Charlie Chaplin From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:07:04 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37DB7106566B; Sun, 6 Nov 2011 07:07:04 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1D3788FC13; Sun, 6 Nov 2011 07:07:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA6774e7004464; Sun, 6 Nov 2011 07:07:04 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA6772al004461; Sun, 6 Nov 2011 07:07:02 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060707.pA6772al004461@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:07:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227134 - stable/8/games/fortune/datfiles X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:07:04 -0000 Author: dougb Date: Sun Nov 6 07:07:02 2011 New Revision: 227134 URL: http://svn.freebsd.org/changeset/base/227134 Log: MFC r226898: Fix the text and attribution of the poem "Youth" by Samuel Ullman. Our copy was a bastardization of the "older" (probably original?) and shorter version of the poem; and the "newer" version that is better known, and arguably more popular. Standardize on the latter. Cf. http://www.bartleby.com/73/2099.html Modified: stable/8/games/fortune/datfiles/fortunes Directory Properties: stable/8/games/fortune/ (props changed) Modified: stable/8/games/fortune/datfiles/fortunes ============================================================================== --- stable/8/games/fortune/datfiles/fortunes Sun Nov 6 07:02:13 2011 (r227133) +++ stable/8/games/fortune/datfiles/fortunes Sun Nov 6 07:07:02 2011 (r227134) @@ -4942,25 +4942,37 @@ cats on the dinette table, etc. "That stop him?" "No, but it sure slowed him up." % - Youth is not a time of life, it is a state of mind; it is a temper of -the will, a quality of the imagination, a vigor of the emotions, a predominance -of courage over timidity, of the appetite for adventure over love of ease. - Nobody grows old by merely living a number of years; people grow -old only by deserting their ideals. Years wrinkle the skin, but to give up -enthusiasm wrinkles the soul. Worry, doubt, self-distrust, fear, and despair --- these are the long, long years that bow the head and turn the growing spirit -back to dust. - Whether seventy or sixteen, there is in every being's heart the love -of wonder, the sweet amazement at the stars and the starlike things and -thoughts, the undaunted challenge of events, the unfailing childlike appetite -for what next, and the joy and the game of life. - You are as young as your faith, as old as your doubt; as young as your -self-confidence, as old as your fear, as young as your hope, as old as your -despair. - So long as your heart receives messages of beauty, cheer, courage, -grandeur and power from the earth, from man, and from the Infinite, so long -you are young. - -- Samuel Ullman + Youth is not a time of life--it is a state of mind. It is not a +matter of red cheeks, red lips and supple knees. It is a temper of the +will; a quality of the imagination; a vigor of the emotions; it is a +freshness of the deep springs of life. Youth means a tempermental +predominance of courage over timidity, of the appetite for adventure +over a life of ease. This often exists in a man of fifty, more than in +a boy of twenty. Nobody grows old by merely living a number of years; +people grow old by deserting their ideals. + + Years may wrinkle the skin, but to give up enthusiasm wrinkles +the soul. Worry, doubt, self-distrust, fear and despair--these are the +long, long years that bow the head and turn the growing spirit back to +dust. + + Whether seventy or sixteen, there is in every being’s heart a +love of wonder; the sweet amazement at the stars and starlike things and +thoughts; the undaunted challenge of events, the unfailing childlike +appetite for what comes next, and the joy in the game of life. + + You are as young as your faith, as old as your doubt; as young +as your self-confidence, as old as your fear, as young as your hope, as +old as your despair. + + In the central place of your heart there is a wireless station. +So long as it receives messages of beauty, hope, cheer, grandeur, +courage, and power from the earth, from men and from the Infinite--so +long are you young. When the wires are all down and the central places +of your heart are covered with the snows of pessimism and the ice of +cynicism, then are you grown old, indeed! + -- Samuel Ullman, "Youth" (1934), as published in + The Silver Treasury, Prose and Verse for Every Mood % " " -- Charlie Chaplin From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:11:29 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 03D5A106564A; Sun, 6 Nov 2011 07:11:29 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DC9A28FC12; Sun, 6 Nov 2011 07:11:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67BSRG004675; Sun, 6 Nov 2011 07:11:28 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67BRoE004672; Sun, 6 Nov 2011 07:11:27 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060711.pA67BRoE004672@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:11:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227135 - stable/7/games/fortune/datfiles X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:11:29 -0000 Author: dougb Date: Sun Nov 6 07:11:27 2011 New Revision: 227135 URL: http://svn.freebsd.org/changeset/base/227135 Log: MFC r226898: Fix the text and attribution of the poem "Youth" by Samuel Ullman. Our copy was a bastardization of the "older" (probably original?) and shorter version of the poem; and the "newer" version that is better known, and arguably more popular. Standardize on the latter. Cf. http://www.bartleby.com/73/2099.html Modified: stable/7/games/fortune/datfiles/fortunes Directory Properties: stable/7/games/fortune/ (props changed) Modified: stable/7/games/fortune/datfiles/fortunes ============================================================================== --- stable/7/games/fortune/datfiles/fortunes Sun Nov 6 07:07:02 2011 (r227134) +++ stable/7/games/fortune/datfiles/fortunes Sun Nov 6 07:11:27 2011 (r227135) @@ -4942,25 +4942,37 @@ cats on the dinette table, etc. "That stop him?" "No, but it sure slowed him up." % - Youth is not a time of life, it is a state of mind; it is a temper of -the will, a quality of the imagination, a vigor of the emotions, a predominance -of courage over timidity, of the appetite for adventure over love of ease. - Nobody grows old by merely living a number of years; people grow -old only by deserting their ideals. Years wrinkle the skin, but to give up -enthusiasm wrinkles the soul. Worry, doubt, self-distrust, fear, and despair --- these are the long, long years that bow the head and turn the growing spirit -back to dust. - Whether seventy or sixteen, there is in every being's heart the love -of wonder, the sweet amazement at the stars and the starlike things and -thoughts, the undaunted challenge of events, the unfailing childlike appetite -for what next, and the joy and the game of life. - You are as young as your faith, as old as your doubt; as young as your -self-confidence, as old as your fear, as young as your hope, as old as your -despair. - So long as your heart receives messages of beauty, cheer, courage, -grandeur and power from the earth, from man, and from the Infinite, so long -you are young. - -- Samuel Ullman + Youth is not a time of life--it is a state of mind. It is not a +matter of red cheeks, red lips and supple knees. It is a temper of the +will; a quality of the imagination; a vigor of the emotions; it is a +freshness of the deep springs of life. Youth means a tempermental +predominance of courage over timidity, of the appetite for adventure +over a life of ease. This often exists in a man of fifty, more than in +a boy of twenty. Nobody grows old by merely living a number of years; +people grow old by deserting their ideals. + + Years may wrinkle the skin, but to give up enthusiasm wrinkles +the soul. Worry, doubt, self-distrust, fear and despair--these are the +long, long years that bow the head and turn the growing spirit back to +dust. + + Whether seventy or sixteen, there is in every being’s heart a +love of wonder; the sweet amazement at the stars and starlike things and +thoughts; the undaunted challenge of events, the unfailing childlike +appetite for what comes next, and the joy in the game of life. + + You are as young as your faith, as old as your doubt; as young +as your self-confidence, as old as your fear, as young as your hope, as +old as your despair. + + In the central place of your heart there is a wireless station. +So long as it receives messages of beauty, hope, cheer, grandeur, +courage, and power from the earth, from men and from the Infinite--so +long are you young. When the wires are all down and the central places +of your heart are covered with the snows of pessimism and the ice of +cynicism, then are you grown old, indeed! + -- Samuel Ullman, "Youth" (1934), as published in + The Silver Treasury, Prose and Verse for Every Mood % " " -- Charlie Chaplin From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:18:19 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C48FB106564A; Sun, 6 Nov 2011 07:18:19 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 993FF8FC16; Sun, 6 Nov 2011 07:18:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67IJSP004954; Sun, 6 Nov 2011 07:18:19 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67IJZb004952; Sun, 6 Nov 2011 07:18:19 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060718.pA67IJZb004952@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:18:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227136 - stable/9/usr.bin/calendar/calendars X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:18:19 -0000 Author: dougb Date: Sun Nov 6 07:18:19 2011 New Revision: 227136 URL: http://svn.freebsd.org/changeset/base/227136 Log: MFC r226909: Add a reminder about quarterly status report due dates Approved by: re (kensmith) Modified: stable/9/usr.bin/calendar/calendars/calendar.freebsd Directory Properties: stable/9/usr.bin/calendar/ (props changed) Modified: stable/9/usr.bin/calendar/calendars/calendar.freebsd ============================================================================== --- stable/9/usr.bin/calendar/calendars/calendar.freebsd Sun Nov 6 07:11:27 2011 (r227135) +++ stable/9/usr.bin/calendar/calendars/calendar.freebsd Sun Nov 6 07:18:19 2011 (r227136) @@ -107,6 +107,7 @@ 03/28 Sean C. Farley born in Indianapolis, Indiana, United States, 1970 03/29 Thierry Thomas born in Luxeuil les Bains, France, 1961 03/30 Po-Chuan Hsieh born in Taipei, Taiwan, Republic of China, 1978 +03/31 First quarter status reports are due on 04/15 04/01 Matthew Jacob born in San Francisco, California, United States, 1958 04/01 Bill Fenner born in Bellefonte, Pennsylvania, United States, 1971 04/01 Peter Edwards born in Dublin, Ireland, 1973 @@ -196,6 +197,7 @@ 06/29 Daniel Harris born in Lubbock, Texas, United States, 1985 06/29 Andrew Pantyukhin born in Moscow, Russian Federation, 1985 06/30 Guido van Rooij born in Best, Noord-Brabant, the Netherlands, 1965 +06/30 Second quarter status reports are due on 07/15 07/01 Matthew Dillon born in San Francisco, California, United States, 1966 07/02 Mark Christopher Ovens born in Preston, Lancashire, United Kingdom, 1958 07/02 Vasil Venelinov Dimov born in Shumen, Bulgaria, 1982 @@ -278,6 +280,7 @@ 09/28 Alex Dupre born in Milano, Italy, 1980 09/29 Matthew Hunt born in Johnstown, Pennsylvania, United States, 1976 09/30 Hiten M. Pandya born in Dar-es-Salaam, Tanzania, East Africa, 1986 +09/30 Third quarter status reports are due on 10/15 10/02 Beat Gaetzi born in Zurich, Switzerland, 1980 10/05 Hiroki Sato born in Yamagata, Japan, 1977 10/05 Chris Costello born in Houston, Texas, United States, 1985 @@ -337,5 +340,6 @@ 12/28 Ade Lovett born in London, England, 1969 12/28 Marius Strobl born in Cham, Bavaria, Germany, 1978 12/31 Edwin Groothuis born in Geldrop, the Netherlands, 1970 +12/31 Fourth quarter status reports are due on 01/15 #endif /* !_calendar_freebsd_ */ From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:20:09 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA4EE106566C; Sun, 6 Nov 2011 07:20:09 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AECAB8FC0C; Sun, 6 Nov 2011 07:20:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67K9Rx005075; Sun, 6 Nov 2011 07:20:09 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67K9aZ005073; Sun, 6 Nov 2011 07:20:09 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060720.pA67K9aZ005073@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:20:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227137 - stable/8/usr.bin/calendar/calendars X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:20:10 -0000 Author: dougb Date: Sun Nov 6 07:20:09 2011 New Revision: 227137 URL: http://svn.freebsd.org/changeset/base/227137 Log: MFC r226909: Add a reminder about quarterly status report due dates Modified: stable/8/usr.bin/calendar/calendars/calendar.freebsd Directory Properties: stable/8/usr.bin/calendar/ (props changed) Modified: stable/8/usr.bin/calendar/calendars/calendar.freebsd ============================================================================== --- stable/8/usr.bin/calendar/calendars/calendar.freebsd Sun Nov 6 07:18:19 2011 (r227136) +++ stable/8/usr.bin/calendar/calendars/calendar.freebsd Sun Nov 6 07:20:09 2011 (r227137) @@ -108,6 +108,7 @@ 03/28 Sean C. Farley born in Indianapolis, Indiana, United States, 1970 03/29 Thierry Thomas born in Luxeuil les Bains, France, 1961 03/30 Po-Chuan Hsieh born in Taipei, Taiwan, Republic of China, 1978 +03/31 First quarter status reports are due on 04/15 04/01 Matthew Jacob born in San Francisco, California, United States, 1958 04/01 Bill Fenner born in Bellefonte, Pennsylvania, United States, 1971 04/01 Peter Edwards born in Dublin, Ireland, 1973 @@ -196,6 +197,7 @@ 06/29 Daniel Harris born in Lubbock, Texas, United States, 1985 06/29 Andrew Pantyukhin born in Moscow, Russian Federation, 1985 06/30 Guido van Rooij born in Best, Noord-Brabant, the Netherlands, 1965 +06/30 Second quarter status reports are due on 07/15 07/01 Matthew Dillon born in San Francisco, California, United States, 1966 07/02 Mark Christopher Ovens born in Preston, Lancashire, United Kingdom, 1958 07/02 Vasil Venelinov Dimov born in Shumen, Bulgaria, 1982 @@ -276,6 +278,7 @@ 09/28 Alex Dupre born in Milano, Italy, 1980 09/29 Matthew Hunt born in Johnstown, Pennsylvania, United States, 1976 09/30 Hiten M. Pandya born in Dar-es-Salaam, Tanzania, East Africa, 1986 +09/30 Third quarter status reports are due on 10/15 10/02 Beat Gaetzi born in Zurich, Switzerland, 1980 10/05 Hiroki Sato born in Yamagata, Japan, 1977 10/05 Chris Costello born in Houston, Texas, United States, 1985 @@ -333,5 +336,6 @@ 12/28 Ade Lovett born in London, England, 1969 12/28 Marius Strobl born in Cham, Bavaria, Germany, 1978 12/31 Edwin Groothuis born in Geldrop, the Netherlands, 1970 +12/31 Fourth quarter status reports are due on 01/15 #endif /* !_calendar_freebsd_ */ From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:26:32 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADFB8106566C; Sun, 6 Nov 2011 07:26:32 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 49A648FC0A; Sun, 6 Nov 2011 07:26:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67QWwD005390; Sun, 6 Nov 2011 07:26:32 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67QWHe005388; Sun, 6 Nov 2011 07:26:32 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060726.pA67QWHe005388@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:26:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227138 - stable/7/usr.bin/calendar/calendars X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:26:32 -0000 Author: dougb Date: Sun Nov 6 07:26:31 2011 New Revision: 227138 URL: http://svn.freebsd.org/changeset/base/227138 Log: MFC r226909: Add a reminder about quarterly status report due dates Modified: stable/7/usr.bin/calendar/calendars/calendar.freebsd Directory Properties: stable/7/usr.bin/calendar/ (props changed) Modified: stable/7/usr.bin/calendar/calendars/calendar.freebsd ============================================================================== --- stable/7/usr.bin/calendar/calendars/calendar.freebsd Sun Nov 6 07:20:09 2011 (r227137) +++ stable/7/usr.bin/calendar/calendars/calendar.freebsd Sun Nov 6 07:26:31 2011 (r227138) @@ -88,6 +88,7 @@ 03/27 Josef El-Rayes born in Linz, Austria, 1982 03/28 Sean C. Farley born in Indianapolis, Indiana, United States, 1970 03/29 Thierry Thomas born in Luxeuil les Bains, France, 1961 +03/31 First quarter status reports are due on 04/15 04/01 Matthew Jacob born in San Francisco, California, United States, 1958 04/01 Bill Fenner born in Bellefonte, Pennsylvania, United States, 1971 04/01 Peter Edwards born in Dublin, Ireland, 1973 @@ -159,6 +160,7 @@ 06/29 Daniel Harris born in Lubbock, Texas, United States, 1985 06/29 Andrew Pantyukhin born in Moscow, Russian Federation, 1985 06/30 Guido van Rooij born in Best, Noord-Brabant, the Netherlands, 1965 +06/30 Second quarter status reports are due on 07/15 07/01 Matthew Dillon born in San Francisco, California, United States, 1966 07/02 Mark Christopher Ovens born in Preston, Lancashire, United Kingdom, 1958 07/02 Vasil Venelinov Dimov born in Shumen, Bulgaria, 1982 @@ -228,6 +230,7 @@ 09/28 Alex Dupre born in Milano, Italy, 1980 09/29 Matthew Hunt born in Johnstown, Pennsylvania, United States, 1976 09/30 Hiten M. Pandya born in Dar-es-Salaam, Tanzania, East Africa, 1986 +09/30 Third quarter status reports are due on 10/15 10/05 Hiroki Sato born in Yamagata, Japan, 1977 10/05 Chris Costello born in Houston, Texas, United States, 1985 10/09 Stefan Walter born in Werne, Nordrhein-Westfalen, 1978 @@ -275,5 +278,6 @@ 12/28 Ade Lovett born in London, England, 1969 12/28 Marius Strobl born in Cham, Bavaria, Germany, 1978 12/31 Edwin Groothuis born in Geldrop, the Netherlands, 1970 +12/31 Fourth quarter status reports are due on 01/15 #endif /* !_calendar_freebsd_ */ From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:29:52 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10009106564A; Sun, 6 Nov 2011 07:29:52 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D93BC8FC15; Sun, 6 Nov 2011 07:29:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67TpPw005572; Sun, 6 Nov 2011 07:29:51 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67TpWI005570; Sun, 6 Nov 2011 07:29:51 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060729.pA67TpWI005570@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:29:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227139 - stable/9/usr.bin/calendar/calendars X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:29:52 -0000 Author: dougb Date: Sun Nov 6 07:29:51 2011 New Revision: 227139 URL: http://svn.freebsd.org/changeset/base/227139 Log: Approved by: re (kensmith) Modified: stable/9/usr.bin/calendar/calendars/calendar.birthday Directory Properties: stable/9/usr.bin/calendar/ (props changed) Modified: stable/9/usr.bin/calendar/calendars/calendar.birthday ============================================================================== --- stable/9/usr.bin/calendar/calendars/calendar.birthday Sun Nov 6 07:26:31 2011 (r227138) +++ stable/9/usr.bin/calendar/calendars/calendar.birthday Sun Nov 6 07:29:51 2011 (r227139) @@ -42,6 +42,7 @@ 01/30 Franklin Delano Roosevelt born in Hyde Park, New York, 1882 01/31 Jackie Robinson born, 1919 02/03 Gertrude Stein born, 1874 +02/04 Ken Thompson, creator of unix, born, 1943 02/05 Alex Harvey (SAHB) is born in Glasgow, Scotland, 1935 02/06 King George VI of UK dies; his daughter becomes Elizabeth II, 1952 02/07 Sinclair Lewis born, 1885 @@ -68,6 +69,7 @@ 02/22 Pierre Jules Cesar Janssen born, 1838, found hydrogen in the sun 02/23 W.E.B. DuBois born, 1868 02/24 Winslow Homer born, 1836 +02/24 Steve Jobs born, 1955 02/25 George Harrison born in Liverpool, England, 1943 02/25 Renoir born, 1841 02/26 Dominique Francois Jean Arago born, 1786; @@ -212,7 +214,7 @@ 09/08 Richard ``the Lionheart'', king of England born in Oxford, 1157 09/08 Peter Sellers born in Southsea, England, 1925 09/09 Chinese Communist Party Chairman Mao Tse-Tung dies at age 82, 1976 -09/09 Dennis Ritchie born, 1941 +09/09 Dennis MacAlistair Ritchie, creater of C, born, 1941 09/12 Jesse Owens born, 1913 09/13 Walter Reed born, 1851 09/15 Agatha Christie born in Torquay, England, 1890 @@ -239,6 +241,8 @@ 10/02 Mohandas K. Gandhi born at Porbandar, Kathiawad, India, 1869 10/04 John V. Atanasoff born, 1903 10/05 Ray Kroc (founder of McDonald's) born, 1902 +10/05 Steve Jobs died at the age of 56, 2011 +10/12 Dennis MacAlistair Ritchie died at the age of 70, 2011 10/13 Lenny Bruce is born in New York City, 1925 10/13 Virgil (Publius Vergilius Maro) born near Mantua, Italy, 70 BC 10/14 Dwight David Eisenhower, 34th President of the United States, born in From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:32:27 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 70C75106564A; Sun, 6 Nov 2011 07:32:27 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 458908FC0A; Sun, 6 Nov 2011 07:32:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67WReO005743; Sun, 6 Nov 2011 07:32:27 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67WRdi005741; Sun, 6 Nov 2011 07:32:27 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060732.pA67WRdi005741@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:32:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227140 - stable/8/usr.bin/calendar/calendars X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:32:27 -0000 Author: dougb Date: Sun Nov 6 07:32:26 2011 New Revision: 227140 URL: http://svn.freebsd.org/changeset/base/227140 Log: MFC r226927: Add birth date for Ken Thompson Add birth and death dates for Steve Jobs Update birth and add death date for Dennis Ritchie MFC r226942: Fix typo from r226927 Modified: stable/8/usr.bin/calendar/calendars/calendar.birthday Directory Properties: stable/8/usr.bin/calendar/ (props changed) Modified: stable/8/usr.bin/calendar/calendars/calendar.birthday ============================================================================== --- stable/8/usr.bin/calendar/calendars/calendar.birthday Sun Nov 6 07:29:51 2011 (r227139) +++ stable/8/usr.bin/calendar/calendars/calendar.birthday Sun Nov 6 07:32:26 2011 (r227140) @@ -42,6 +42,7 @@ 01/30 Franklin Delano Roosevelt born in Hyde Park, New York, 1882 01/31 Jackie Robinson born, 1919 02/03 Gertrude Stein born, 1874 +02/04 Ken Thompson, creator of unix, born, 1943 02/05 Alex Harvey (SAHB) is born in Glasgow, Scotland, 1935 02/06 King George VI of UK dies; his daughter becomes Elizabeth II, 1952 02/07 Sinclair Lewis born, 1885 @@ -68,6 +69,7 @@ 02/22 Pierre Jules Cesar Janssen born, 1838, found hydrogen in the sun 02/23 W.E.B. DuBois born, 1868 02/24 Winslow Homer born, 1836 +02/24 Steve Jobs born, 1955 02/25 George Harrison born in Liverpool, England, 1943 02/25 Renoir born, 1841 02/26 Dominique Francois Jean Arago born, 1786; @@ -212,7 +214,7 @@ 09/08 Richard ``the Lionheart'', king of England born in Oxford, 1157 09/08 Peter Sellers born in Southsea, England, 1925 09/09 Chinese Communist Party Chairman Mao Tse-Tung dies at age 82, 1976 -09/09 Dennis Ritchie born, 1941 +09/09 Dennis MacAlistair Ritchie, creator of C, born, 1941 09/12 Jesse Owens born, 1913 09/13 Walter Reed born, 1851 09/15 Agatha Christie born in Torquay, England, 1890 @@ -239,6 +241,8 @@ 10/02 Mohandas K. Gandhi born at Porbandar, Kathiawad, India, 1869 10/04 John V. Atanasoff born, 1903 10/05 Ray Kroc (founder of McDonald's) born, 1902 +10/05 Steve Jobs died at the age of 56, 2011 +10/12 Dennis MacAlistair Ritchie died at the age of 70, 2011 10/13 Lenny Bruce is born in New York City, 1925 10/13 Virgil (Publius Vergilius Maro) born near Mantua, Italy, 70 BC 10/14 Dwight David Eisenhower, 34th President of the United States, born in From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:33:18 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66C201065678; Sun, 6 Nov 2011 07:33:18 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3BBAC8FC14; Sun, 6 Nov 2011 07:33:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67XIf0005843; Sun, 6 Nov 2011 07:33:18 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67XIYX005841; Sun, 6 Nov 2011 07:33:18 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060733.pA67XIYX005841@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:33:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227141 - stable/7/usr.bin/calendar/calendars X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:33:18 -0000 Author: dougb Date: Sun Nov 6 07:33:17 2011 New Revision: 227141 URL: http://svn.freebsd.org/changeset/base/227141 Log: MFC r226927: Add birth date for Ken Thompson Add birth and death dates for Steve Jobs Update birth and add death date for Dennis Ritchie MFC r226942: Fix typo from r226927 Modified: stable/7/usr.bin/calendar/calendars/calendar.birthday Directory Properties: stable/7/usr.bin/calendar/ (props changed) Modified: stable/7/usr.bin/calendar/calendars/calendar.birthday ============================================================================== --- stable/7/usr.bin/calendar/calendars/calendar.birthday Sun Nov 6 07:32:26 2011 (r227140) +++ stable/7/usr.bin/calendar/calendars/calendar.birthday Sun Nov 6 07:33:17 2011 (r227141) @@ -42,6 +42,7 @@ 01/30 Franklin Delano Roosevelt born in Hyde Park, New York, 1882 01/31 Jackie Robinson born, 1919 02/03 Gertrude Stein born, 1874 +02/04 Ken Thompson, creator of unix, born, 1943 02/05 Alex Harvey (SAHB) is born in Glasgow, Scotland, 1935 02/06 King George VI of UK dies; his daughter becomes Elizabeth II, 1952 02/07 Sinclair Lewis born, 1885 @@ -68,6 +69,7 @@ 02/22 Pierre Jules Cesar Janssen born, 1838, found hydrogen in the sun 02/23 W.E.B. DuBois born, 1868 02/24 Winslow Homer born, 1836 +02/24 Steve Jobs born, 1955 02/25 George Harrison born in Liverpool, England, 1943 02/25 Renoir born, 1841 02/26 Dominique Francois Jean Arago born, 1786; @@ -212,7 +214,7 @@ 09/08 Richard ``the Lionheart'', king of England born in Oxford, 1157 09/08 Peter Sellers born in Southsea, England, 1925 09/09 Chinese Communist Party Chairman Mao Tse-Tung dies at age 82, 1976 -09/09 Dennis Ritchie born, 1941 +09/09 Dennis MacAlistair Ritchie, creator of C, born, 1941 09/12 Jesse Owens born, 1913 09/13 Walter Reed born, 1851 09/15 Agatha Christie born in Torquay, England, 1890 @@ -240,6 +242,8 @@ 10/04 John V. Atanasoff born, 1903 10/05 Pablo Picasso born in Malaga, Spain, 1881 10/05 Ray Kroc (founder of McDonald's) born, 1902 +10/05 Steve Jobs died at the age of 56, 2011 +10/12 Dennis MacAlistair Ritchie died at the age of 70, 2011 10/13 Lenny Bruce is born in New York City, 1925 10/13 Virgil (Publius Vergilius Maro) born near Mantua, Italy, 70 BC 10/14 Dwight David Eisenhower, 34th President of the United States, born in From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:35:09 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E8A31065677; Sun, 6 Nov 2011 07:35:09 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0D2E68FC0C; Sun, 6 Nov 2011 07:35:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67Z8bq005949; Sun, 6 Nov 2011 07:35:08 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67Z86r005947; Sun, 6 Nov 2011 07:35:08 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060735.pA67Z86r005947@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:35:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227142 - stable/9/usr.sbin/tzsetup X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:35:09 -0000 Author: dougb Date: Sun Nov 6 07:35:08 2011 New Revision: 227142 URL: http://svn.freebsd.org/changeset/base/227142 Log: MFC r227011: If the user is moving from any other time zone to UTC we need to delete any old /var/db/zoneinfo file that may exist so that tzsetup -r does the right thing. Approved by: re (kensmith) Modified: stable/9/usr.sbin/tzsetup/tzsetup.c Directory Properties: stable/9/usr.sbin/tzsetup/ (props changed) Modified: stable/9/usr.sbin/tzsetup/tzsetup.c ============================================================================== --- stable/9/usr.sbin/tzsetup/tzsetup.c Sun Nov 6 07:33:17 2011 (r227141) +++ stable/9/usr.sbin/tzsetup/tzsetup.c Sun Nov 6 07:35:08 2011 (r227142) @@ -565,6 +565,18 @@ install_zoneinfo_file(const char *zonein return (DITEM_FAILURE | DITEM_RECREATE); } + if (unlink(path_db) < 0 && errno != ENOENT) { + snprintf(title, sizeof(title), "Error"); + snprintf(prompt, sizeof(prompt), + "Could not delete %s: %s", path_db, + strerror(errno)); + if (usedialog) + dialog_mesgbox(title, prompt, 8, 72); + else + fprintf(stderr, "%s\n", prompt); + + return (DITEM_FAILURE | DITEM_RECREATE); + } return (DITEM_LEAVE_MENU); } From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:43:00 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D79D61065672; Sun, 6 Nov 2011 07:43:00 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BC3708FC12; Sun, 6 Nov 2011 07:43:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67h0Ro006313; Sun, 6 Nov 2011 07:43:00 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67h0TG006310; Sun, 6 Nov 2011 07:43:00 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060743.pA67h0TG006310@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:43:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227143 - stable/8/usr.sbin/tzsetup X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:43:01 -0000 Author: dougb Date: Sun Nov 6 07:43:00 2011 New Revision: 227143 URL: http://svn.freebsd.org/changeset/base/227143 Log: MFC r222139: - add missing options and arguments to program's usage() and sync it with manpage's SYNOPSIS - generally clean up a manpage's formatting Modified: stable/8/usr.sbin/tzsetup/tzsetup.8 stable/8/usr.sbin/tzsetup/tzsetup.c Directory Properties: stable/8/usr.sbin/tzsetup/ (props changed) Modified: stable/8/usr.sbin/tzsetup/tzsetup.8 ============================================================================== --- stable/8/usr.sbin/tzsetup/tzsetup.8 Sun Nov 6 07:35:08 2011 (r227142) +++ stable/8/usr.sbin/tzsetup/tzsetup.8 Sun Nov 6 07:43:00 2011 (r227143) @@ -23,7 +23,8 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd July 4, 2009 +.\" +.Dd October 21, 2009 .Dt TZSETUP 8 .Os .Sh NAME @@ -32,8 +33,8 @@ .Sh SYNOPSIS .Nm .Op Fl nrs -.Op Fl C Ar chroot directory -.Op Ar zoneinfo file | zoneinfo name +.Op Fl C Ar chroot_directory +.Op Ar zoneinfo_file | zoneinfo_name .Sh DESCRIPTION The .Nm @@ -50,24 +51,25 @@ the hardware clock does not keep .Pp The following option is available: .Bl -tag -offset indent -width Fl -.It Fl C Ar chroot directory +.It Fl C Ar chroot_directory Open all files and directories relative to -.Ar chroot directory . +.Ar chroot_directory . .It Fl n Do not create or copy files. .It Fl r -Reinstall the zoneinfo file installed last time. The name is obtained from +Reinstall the zoneinfo file installed last time. +The name is obtained from .Pa /var/db/zoneinfo . -.It Fl s +.It Fl s Skip the initial question about adjusting the clock if not set to .Tn UTC . .El .Pp It is possible to short-circuit the menu system by specifying the location of a -.Ar zoneinfo file +.Ar zoneinfo_file or the name of the -.Ar zoneinfo name +.Ar zoneinfo_name on the command line; this is intended mainly for pre-configured installation scripts or people who know which zoneinfo they want to install. .Sh TIMEZONE DATABASE @@ -101,38 +103,41 @@ The source code to the database contains many additional comments and documentation references for the historically minded. .Sh FILES -.Bl -tag -width /usr/share/zoneinfo/zone.tab -compact +.Bl -tag -width ".Pa /usr/share/zoneinfo/zone.tab" -compact .It Pa /etc/localtime -current time zone file. +current time zone file .It Pa /etc/wall_cmos_clock see -.Xr adjkerntz 8 . +.Xr adjkerntz 8 .It Pa /usr/share/misc/iso3166 mapping of .Tn ISO -3166 territory codes to names. +3166 territory codes to names .It Pa /usr/share/zoneinfo -directory for zoneinfo files. +directory for zoneinfo files .It Pa /usr/share/zoneinfo/zone.tab -mapping of timezone file to country and location. +mapping of timezone file to country and location .It Pa /var/db/zoneinfo -saved name of the timezone file installed last. +saved name of the timezone file installed last .El .Sh EXAMPLES Normal usage, to select the right zoneinfo file via the dialog-based user interface: -.Dl # tzsetup +.Dl tzsetup +.Pp Install the file .Pa /usr/share/zoneinfo/Australia/Sydney : -.Dl # tzsetup /usr/share/zoneinfo/Australia/Sydney +.Dl "tzsetup /usr/share/zoneinfo/Australia/Sydney" +.Pp Install the zoneinfo file for Australia/Sydney, assumed to be located in .Pa /usr/share/zoneinfo : -.Dl # tzsetup Australia/Sydney +.Dl "tzsetup Australia/Sydney" +.Pp After a reinstall of the zoneinfo files, you can reinstall the -latest installed zoneinfo file: (as specified in -.Pa /var/db/zoneinfo ) -.Dl # tzsetup -r +latest installed zoneinfo file (as specified in +.Pa /var/db/zoneinfo ) : +.Dl "tzsetup -r" .Sh SEE ALSO .Xr date 1 , .Xr adjtime 2 , Modified: stable/8/usr.sbin/tzsetup/tzsetup.c ============================================================================== --- stable/8/usr.sbin/tzsetup/tzsetup.c Sun Nov 6 07:35:08 2011 (r227142) +++ stable/8/usr.sbin/tzsetup/tzsetup.c Sun Nov 6 07:43:00 2011 (r227143) @@ -731,7 +731,8 @@ static void usage(void) { - fprintf(stderr, "usage: tzsetup [-nrs] [zoneinfo file]\n"); + fprintf(stderr, "usage: tzsetup [-nrs] [-C chroot_directory]" + " [zoneinfo_file | zoneinfo_name]\n"); exit(1); } From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:43:57 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6380106566B; Sun, 6 Nov 2011 07:43:57 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D50D98FC12; Sun, 6 Nov 2011 07:43:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67hv17006394; Sun, 6 Nov 2011 07:43:57 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67hvmF006392; Sun, 6 Nov 2011 07:43:57 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060743.pA67hvmF006392@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:43:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227144 - stable/8/usr.sbin/tzsetup X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:43:58 -0000 Author: dougb Date: Sun Nov 6 07:43:57 2011 New Revision: 227144 URL: http://svn.freebsd.org/changeset/base/227144 Log: MFC 227011: If the user is moving from any other time zone to UTC we need to delete any old /var/db/zoneinfo file that may exist so that tzsetup -r does the right thing. Modified: stable/8/usr.sbin/tzsetup/tzsetup.c Directory Properties: stable/8/usr.sbin/tzsetup/ (props changed) Modified: stable/8/usr.sbin/tzsetup/tzsetup.c ============================================================================== --- stable/8/usr.sbin/tzsetup/tzsetup.c Sun Nov 6 07:43:00 2011 (r227143) +++ stable/8/usr.sbin/tzsetup/tzsetup.c Sun Nov 6 07:43:57 2011 (r227144) @@ -565,6 +565,18 @@ install_zoneinfo_file(const char *zonein return (DITEM_FAILURE | DITEM_RECREATE); } + if (unlink(path_db) < 0 && errno != ENOENT) { + snprintf(title, sizeof(title), "Error"); + snprintf(prompt, sizeof(prompt), + "Could not delete %s: %s", path_db, + strerror(errno)); + if (usedialog) + dialog_mesgbox(title, prompt, 8, 72); + else + fprintf(stderr, "%s\n", prompt); + + return (DITEM_FAILURE | DITEM_RECREATE); + } return (DITEM_LEAVE_MENU); } From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:47:39 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31C62106564A; Sun, 6 Nov 2011 07:47:39 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 16C5E8FC08; Sun, 6 Nov 2011 07:47:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67lcvr006580; Sun, 6 Nov 2011 07:47:38 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67lcvW006577; Sun, 6 Nov 2011 07:47:38 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060747.pA67lcvW006577@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:47:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227145 - stable/9/usr.sbin/mergemaster X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:47:39 -0000 Author: dougb Date: Sun Nov 6 07:47:38 2011 New Revision: 227145 URL: http://svn.freebsd.org/changeset/base/227145 Log: MFC r227013: 1. Add a new option, --run-updates, to always or never run the newalises, pwd_mkdb, etc. updates at the end of the comparison. 2. Add an update to the end to handle /etc/localtime, if it exists. If /var/db/zoneinfo exists, automatically update /etc/localtime, which should (hopefully) be safe to do. If not, prompt the user to run tzsetup. 3. Update run_it_now(), the function that handles input for the updates, to make sure that we got a valid answer, and to handle the --run-updates option if supplied. Approved by: re (kensmith) Modified: stable/9/usr.sbin/mergemaster/mergemaster.8 stable/9/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/9/usr.sbin/mergemaster/ (props changed) Modified: stable/9/usr.sbin/mergemaster/mergemaster.8 ============================================================================== --- stable/9/usr.sbin/mergemaster/mergemaster.8 Sun Nov 6 07:43:57 2011 (r227144) +++ stable/9/usr.sbin/mergemaster/mergemaster.8 Sun Nov 6 07:47:38 2011 (r227145) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 9, 2011 +.Dd November 1, 2011 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -34,6 +34,7 @@ .Nm .Op Fl scrvhpCP .Op Fl a|iFU +.Op Fl -run-updates=[always|never] .Op Fl m Ar /path/to/sources .Op Fl t Ar /path/to/temp/root .Op Fl d @@ -246,6 +247,11 @@ rc file. Attempt to auto upgrade files that have not been user modified. This option can be dangerous when there are critical changes in the new versions that affect your running system. +.It Fl -run-updates=[always|never] +Specify always or never to run newaliases, pwd_mkdb, etc. +at the end of the comparison run. +If this option is omitted the default is to prompt the user +for each update as necessary. .It Fl m Ar /path/to/sources Specify the path to the directory where you want to do the .Xr make 1 . @@ -365,6 +371,9 @@ with all values commented out: # ***DANGEROUS*** #AUTO_UPGRADE= # +# Either always or never run newaliases, pwd_mkdb at the end (--run-updates) +#RUN_UPDATES= +# # Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf (-C) #COMP_CONFS= # Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/9/usr.sbin/mergemaster/mergemaster.sh Sun Nov 6 07:43:57 2011 (r227144) +++ stable/9/usr.sbin/mergemaster/mergemaster.sh Sun Nov 6 07:47:38 2011 (r227145) @@ -15,7 +15,7 @@ PATH=/bin:/usr/bin:/usr/sbin display_usage () { VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` echo "mergemaster version ${VERSION_NUMBER}" - echo 'Usage: mergemaster [-scrvhpCP] [-a|[-iFU]]' + echo 'Usage: mergemaster [-scrvhpCP] [-a|[-iFU]] [--run-updates=always|never]' echo ' [-m /path] [-t /path] [-d] [-u N] [-w N] [-A arch] [-D /path]' echo "Options:" echo " -s Strict comparison (diff every pair of files)" @@ -31,6 +31,7 @@ display_usage () { echo ' -P Preserve files that are overwritten' echo " -U Attempt to auto upgrade files that have not been user modified" echo ' ***DANGEROUS***' + echo ' --run-updates= Specify always or never to run newalises, pwd_mkdb, etc.' echo '' echo " -m /path/directory Specify location of source to do the make in" echo " -t /path/directory Specify temp root directory" @@ -262,6 +263,20 @@ if [ -r "$HOME/.mergemasterrc" ]; then . "$HOME/.mergemasterrc" fi +for var in "$@" ; do + case "$var" in + --run-updates*) + RUN_UPDATES=`echo ${var#--run-updates=} | tr [:upper:] [:lower:]` + ;; + *) + newopts="$newopts $var" + ;; + esac +done + +set -- $newopts +unset var newopts + # Check the command line options # while getopts ":ascrvhipCPm:t:du:w:D:A:FU" COMMAND_LINE_ARGUMENT ; do @@ -1224,34 +1239,43 @@ case "${AUTO_UPGRADED_FILES}" in esac run_it_now () { - case "${AUTO_RUN}" in - '') - unset YES_OR_NO - echo '' - echo -n ' Would you like to run it now? y or n [n] ' - read YES_OR_NO + [ -n "$AUTO_RUN" ] && return + + local answer + + echo '' + while : ; do + if [ "$RUN_UPDATES" = always ]; then + answer=y + elif [ "$RUN_UPDATES" = never ]; then + answer=n + else + echo -n ' Would you like to run it now? y or n [n] ' + read answer + fi - case "${YES_OR_NO}" in + case "$answer" in y) echo " Running ${1}" echo '' eval "${1}" + return ;; ''|n) - echo '' - echo " *** Cancelled" - echo '' + if [ ! "$RUN_UPDATES" = never ]; then + echo '' + echo " *** Cancelled" + echo '' + fi echo " Make sure to run ${1} yourself" + return ;; *) echo '' - echo " *** Sorry, I do not understand your answer (${YES_OR_NO})" + echo " *** Sorry, I do not understand your answer (${answer})" echo '' - echo " Make sure to run ${1} yourself" esac - ;; - *) ;; - esac + done } case "${NEED_NEWALIASES}" in @@ -1310,6 +1334,19 @@ case "${NEED_PWD_MKDB}" in ;; esac +if [ -e "${DESTDIR}/etc/localtime" ]; then # Ignore if TZ == UTC + echo '' + if [ -f "${DESTDIR}/var/db/zoneinfo" ]; then + echo "*** Reinstalling `cat ${DESTDIR}/var/db/zoneinfo` as ${DESTDIR}/etc/localtime" + [ -n "${DESTDIR}" ] && tzs_args="-C ${DESTDIR}" + tzsetup $tzs_args -r + else + echo "*** There is no ${DESTDIR}/var/db/zoneinfo file to update ${DESTDIR}/etc/localtime." + echo ' You should run tzsetup' + run_it_now tzsetup + fi +fi + echo '' if [ -r "${MM_EXIT_SCRIPT}" ]; then From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:50:25 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BFDA1065672; Sun, 6 Nov 2011 07:50:25 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7AAEA8FC1C; Sun, 6 Nov 2011 07:50:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67oPtX006709; Sun, 6 Nov 2011 07:50:25 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67oPdi006706; Sun, 6 Nov 2011 07:50:25 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060750.pA67oPdi006706@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:50:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227146 - stable/9/usr.bin/calendar/calendars X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:50:25 -0000 Author: dougb Date: Sun Nov 6 07:50:25 2011 New Revision: 227146 URL: http://svn.freebsd.org/changeset/base/227146 Log: Last revision should have said: MFC r226927: Add birth date for Ken Thompson Add birth and death dates for Steve Jobs Update birth and add death date for Dennis Ritchie MFC r226942: Fix typo from r226927 Approved by: re (kensmith) Modified: stable/9/usr.bin/calendar/calendars/calendar.birthday Modified: stable/9/usr.bin/calendar/calendars/calendar.birthday ============================================================================== --- stable/9/usr.bin/calendar/calendars/calendar.birthday Sun Nov 6 07:47:38 2011 (r227145) +++ stable/9/usr.bin/calendar/calendars/calendar.birthday Sun Nov 6 07:50:25 2011 (r227146) @@ -3,7 +3,7 @@ * * $FreeBSD$ */ - + #ifndef _calendar_birthday_ #define _calendar_birthday_ From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:54:43 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B6D41065672; Sun, 6 Nov 2011 07:54:43 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 49F998FC12; Sun, 6 Nov 2011 07:54:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67sh7v006927; Sun, 6 Nov 2011 07:54:43 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67shEK006925; Sun, 6 Nov 2011 07:54:43 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060754.pA67shEK006925@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:54:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227147 - stable/8/usr.sbin/mergemaster X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:54:43 -0000 Author: dougb Date: Sun Nov 6 07:54:42 2011 New Revision: 227147 URL: http://svn.freebsd.org/changeset/base/227147 Log: MFC r213573: mdoc: drop redundant .Pp and .LP calls They have no effect when coming in pairs, or before .Bl/.Bd Modified: stable/8/usr.sbin/mergemaster/mergemaster.8 Directory Properties: stable/8/usr.sbin/mergemaster/ (props changed) Modified: stable/8/usr.sbin/mergemaster/mergemaster.8 ============================================================================== --- stable/8/usr.sbin/mergemaster/mergemaster.8 Sun Nov 6 07:50:25 2011 (r227146) +++ stable/8/usr.sbin/mergemaster/mergemaster.8 Sun Nov 6 07:54:42 2011 (r227147) @@ -330,7 +330,6 @@ overrides .Pa /etc/mergemaster.rc . Here is an example with all values commented out: -.Pp .Bd -literal # These are options for mergemaster, with their default values listed # The following options have command line overrides From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 07:59:34 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4780106564A; Sun, 6 Nov 2011 07:59:34 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C9ADC8FC0A; Sun, 6 Nov 2011 07:59:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA67xYj8007143; Sun, 6 Nov 2011 07:59:34 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA67xYRc007140; Sun, 6 Nov 2011 07:59:34 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060759.pA67xYRc007140@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 07:59:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227148 - stable/8/usr.sbin/mergemaster X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 07:59:35 -0000 Author: dougb Date: Sun Nov 6 07:59:34 2011 New Revision: 227148 URL: http://svn.freebsd.org/changeset/base/227148 Log: MFC r227013: 1. Add a new option, --run-updates, to always or never run the newalises, pwd_mkdb, etc. updates at the end of the comparison. 2. Add an update to the end to handle /etc/localtime, if it exists. If /var/db/zoneinfo exists, automatically update /etc/localtime, which should (hopefully) be safe to do. If not, prompt the user to run tzsetup. 3. Update run_it_now(), the function that handles input for the updates, to make sure that we got a valid answer, and to handle the --run-updates option if supplied. Modified: stable/8/usr.sbin/mergemaster/mergemaster.8 stable/8/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/8/usr.sbin/mergemaster/ (props changed) Modified: stable/8/usr.sbin/mergemaster/mergemaster.8 ============================================================================== --- stable/8/usr.sbin/mergemaster/mergemaster.8 Sun Nov 6 07:54:42 2011 (r227147) +++ stable/8/usr.sbin/mergemaster/mergemaster.8 Sun Nov 6 07:59:34 2011 (r227148) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 9, 2011 +.Dd November 1, 2011 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -34,6 +34,7 @@ .Nm .Op Fl scrvhpCP .Op Fl a|iFU +.Op Fl -run-updates=[always|never] .Op Fl m Ar /path/to/sources .Op Fl t Ar /path/to/temp/root .Op Fl d @@ -246,6 +247,11 @@ rc file. Attempt to auto upgrade files that have not been user modified. This option can be dangerous when there are critical changes in the new versions that affect your running system. +.It Fl -run-updates=[always|never] +Specify always or never to run newaliases, pwd_mkdb, etc. +at the end of the comparison run. +If this option is omitted the default is to prompt the user +for each update as necessary. .It Fl m Ar /path/to/sources Specify the path to the directory where you want to do the .Xr make 1 . @@ -365,6 +371,9 @@ with all values commented out: # ***DANGEROUS*** #AUTO_UPGRADE= # +# Either always or never run newaliases, pwd_mkdb at the end (--run-updates) +#RUN_UPDATES= +# # Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf (-C) #COMP_CONFS= # Modified: stable/8/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/8/usr.sbin/mergemaster/mergemaster.sh Sun Nov 6 07:54:42 2011 (r227147) +++ stable/8/usr.sbin/mergemaster/mergemaster.sh Sun Nov 6 07:59:34 2011 (r227148) @@ -15,7 +15,7 @@ PATH=/bin:/usr/bin:/usr/sbin display_usage () { VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` echo "mergemaster version ${VERSION_NUMBER}" - echo 'Usage: mergemaster [-scrvhpCP] [-a|[-iFU]]' + echo 'Usage: mergemaster [-scrvhpCP] [-a|[-iFU]] [--run-updates=always|never]' echo ' [-m /path] [-t /path] [-d] [-u N] [-w N] [-A arch] [-D /path]' echo "Options:" echo " -s Strict comparison (diff every pair of files)" @@ -31,6 +31,7 @@ display_usage () { echo ' -P Preserve files that are overwritten' echo " -U Attempt to auto upgrade files that have not been user modified" echo ' ***DANGEROUS***' + echo ' --run-updates= Specify always or never to run newalises, pwd_mkdb, etc.' echo '' echo " -m /path/directory Specify location of source to do the make in" echo " -t /path/directory Specify temp root directory" @@ -262,6 +263,20 @@ if [ -r "$HOME/.mergemasterrc" ]; then . "$HOME/.mergemasterrc" fi +for var in "$@" ; do + case "$var" in + --run-updates*) + RUN_UPDATES=`echo ${var#--run-updates=} | tr [:upper:] [:lower:]` + ;; + *) + newopts="$newopts $var" + ;; + esac +done + +set -- $newopts +unset var newopts + # Check the command line options # while getopts ":ascrvhipCPm:t:du:w:D:A:FU" COMMAND_LINE_ARGUMENT ; do @@ -1226,34 +1241,43 @@ case "${AUTO_UPGRADED_FILES}" in esac run_it_now () { - case "${AUTO_RUN}" in - '') - unset YES_OR_NO - echo '' - echo -n ' Would you like to run it now? y or n [n] ' - read YES_OR_NO + [ -n "$AUTO_RUN" ] && return + + local answer + + echo '' + while : ; do + if [ "$RUN_UPDATES" = always ]; then + answer=y + elif [ "$RUN_UPDATES" = never ]; then + answer=n + else + echo -n ' Would you like to run it now? y or n [n] ' + read answer + fi - case "${YES_OR_NO}" in + case "$answer" in y) echo " Running ${1}" echo '' eval "${1}" + return ;; ''|n) - echo '' - echo " *** Cancelled" - echo '' + if [ ! "$RUN_UPDATES" = never ]; then + echo '' + echo " *** Cancelled" + echo '' + fi echo " Make sure to run ${1} yourself" + return ;; *) echo '' - echo " *** Sorry, I do not understand your answer (${YES_OR_NO})" + echo " *** Sorry, I do not understand your answer (${answer})" echo '' - echo " Make sure to run ${1} yourself" esac - ;; - *) ;; - esac + done } case "${NEED_NEWALIASES}" in @@ -1312,6 +1336,19 @@ case "${NEED_PWD_MKDB}" in ;; esac +if [ -e "${DESTDIR}/etc/localtime" ]; then # Ignore if TZ == UTC + echo '' + if [ -f "${DESTDIR}/var/db/zoneinfo" ]; then + echo "*** Reinstalling `cat ${DESTDIR}/var/db/zoneinfo` as ${DESTDIR}/etc/localtime" + [ -n "${DESTDIR}" ] && tzs_args="-C ${DESTDIR}" + tzsetup $tzs_args -r + else + echo "*** There is no ${DESTDIR}/var/db/zoneinfo file to update ${DESTDIR}/etc/localtime." + echo ' You should run tzsetup' + run_it_now tzsetup + fi +fi + echo '' if [ -r "${MM_EXIT_SCRIPT}" ]; then From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:01:17 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A513F106564A; Sun, 6 Nov 2011 08:01:17 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 93A048FC13; Sun, 6 Nov 2011 08:01:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA681HkQ007282; Sun, 6 Nov 2011 08:01:17 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA681HG4007280; Sun, 6 Nov 2011 08:01:17 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060801.pA681HG4007280@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 08:01:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227149 - stable/7/usr.sbin/mergemaster X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:01:17 -0000 Author: dougb Date: Sun Nov 6 08:01:17 2011 New Revision: 227149 URL: http://svn.freebsd.org/changeset/base/227149 Log: MFC r213573: mdoc: drop redundant .Pp and .LP calls They have no effect when coming in pairs, or before .Bl/.Bd Modified: stable/7/usr.sbin/mergemaster/mergemaster.8 Directory Properties: stable/7/usr.sbin/mergemaster/ (props changed) Modified: stable/7/usr.sbin/mergemaster/mergemaster.8 ============================================================================== --- stable/7/usr.sbin/mergemaster/mergemaster.8 Sun Nov 6 07:59:34 2011 (r227148) +++ stable/7/usr.sbin/mergemaster/mergemaster.8 Sun Nov 6 08:01:17 2011 (r227149) @@ -330,7 +330,6 @@ overrides .Pa /etc/mergemaster.rc . Here is an example with all values commented out: -.Pp .Bd -literal # These are options for mergemaster, with their default values listed # The following options have command line overrides From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:03:33 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0EF3106566C; Sun, 6 Nov 2011 08:03:33 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 961FF8FC0C; Sun, 6 Nov 2011 08:03:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA683Xpb007412; Sun, 6 Nov 2011 08:03:33 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA683Xqu007409; Sun, 6 Nov 2011 08:03:33 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201111060803.pA683Xqu007409@svn.freebsd.org> From: Doug Barton Date: Sun, 6 Nov 2011 08:03:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227150 - stable/7/usr.sbin/mergemaster X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:03:33 -0000 Author: dougb Date: Sun Nov 6 08:03:33 2011 New Revision: 227150 URL: http://svn.freebsd.org/changeset/base/227150 Log: MFC r227013: 1. Add a new option, --run-updates, to always or never run the newalises, pwd_mkdb, etc. updates at the end of the comparison. 2. Add an update to the end to handle /etc/localtime, if it exists. If /var/db/zoneinfo exists, automatically update /etc/localtime, which should (hopefully) be safe to do. If not, prompt the user to run tzsetup. 3. Update run_it_now(), the function that handles input for the updates, to make sure that we got a valid answer, and to handle the --run-updates option if supplied. Modified: stable/7/usr.sbin/mergemaster/mergemaster.8 stable/7/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/7/usr.sbin/mergemaster/ (props changed) Modified: stable/7/usr.sbin/mergemaster/mergemaster.8 ============================================================================== --- stable/7/usr.sbin/mergemaster/mergemaster.8 Sun Nov 6 08:01:17 2011 (r227149) +++ stable/7/usr.sbin/mergemaster/mergemaster.8 Sun Nov 6 08:03:33 2011 (r227150) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 9, 2011 +.Dd November 1, 2011 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -34,6 +34,7 @@ .Nm .Op Fl scrvhpCP .Op Fl a|iFU +.Op Fl -run-updates=[always|never] .Op Fl m Ar /path/to/sources .Op Fl t Ar /path/to/temp/root .Op Fl d @@ -246,6 +247,11 @@ rc file. Attempt to auto upgrade files that have not been user modified. This option can be dangerous when there are critical changes in the new versions that affect your running system. +.It Fl -run-updates=[always|never] +Specify always or never to run newaliases, pwd_mkdb, etc. +at the end of the comparison run. +If this option is omitted the default is to prompt the user +for each update as necessary. .It Fl m Ar /path/to/sources Specify the path to the directory where you want to do the .Xr make 1 . @@ -365,6 +371,9 @@ with all values commented out: # ***DANGEROUS*** #AUTO_UPGRADE= # +# Either always or never run newaliases, pwd_mkdb at the end (--run-updates) +#RUN_UPDATES= +# # Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf (-C) #COMP_CONFS= # Modified: stable/7/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/7/usr.sbin/mergemaster/mergemaster.sh Sun Nov 6 08:01:17 2011 (r227149) +++ stable/7/usr.sbin/mergemaster/mergemaster.sh Sun Nov 6 08:03:33 2011 (r227150) @@ -15,7 +15,7 @@ PATH=/bin:/usr/bin:/usr/sbin display_usage () { VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` echo "mergemaster version ${VERSION_NUMBER}" - echo 'Usage: mergemaster [-scrvhpCP] [-a|[-iFU]]' + echo 'Usage: mergemaster [-scrvhpCP] [-a|[-iFU]] [--run-updates=always|never]' echo ' [-m /path] [-t /path] [-d] [-u N] [-w N] [-A arch] [-D /path]' echo "Options:" echo " -s Strict comparison (diff every pair of files)" @@ -31,6 +31,7 @@ display_usage () { echo ' -P Preserve files that are overwritten' echo " -U Attempt to auto upgrade files that have not been user modified" echo ' ***DANGEROUS***' + echo ' --run-updates= Specify always or never to run newalises, pwd_mkdb, etc.' echo '' echo " -m /path/directory Specify location of source to do the make in" echo " -t /path/directory Specify temp root directory" @@ -262,6 +263,20 @@ if [ -r "$HOME/.mergemasterrc" ]; then . "$HOME/.mergemasterrc" fi +for var in "$@" ; do + case "$var" in + --run-updates*) + RUN_UPDATES=`echo ${var#--run-updates=} | tr [:upper:] [:lower:]` + ;; + *) + newopts="$newopts $var" + ;; + esac +done + +set -- $newopts +unset var newopts + # Check the command line options # while getopts ":ascrvhipCPm:t:du:w:D:A:FU" COMMAND_LINE_ARGUMENT ; do @@ -1223,34 +1238,43 @@ case "${AUTO_UPGRADED_FILES}" in esac run_it_now () { - case "${AUTO_RUN}" in - '') - unset YES_OR_NO - echo '' - echo -n ' Would you like to run it now? y or n [n] ' - read YES_OR_NO + [ -n "$AUTO_RUN" ] && return + + local answer + + echo '' + while : ; do + if [ "$RUN_UPDATES" = always ]; then + answer=y + elif [ "$RUN_UPDATES" = never ]; then + answer=n + else + echo -n ' Would you like to run it now? y or n [n] ' + read answer + fi - case "${YES_OR_NO}" in + case "$answer" in y) echo " Running ${1}" echo '' eval "${1}" + return ;; ''|n) - echo '' - echo " *** Cancelled" - echo '' + if [ ! "$RUN_UPDATES" = never ]; then + echo '' + echo " *** Cancelled" + echo '' + fi echo " Make sure to run ${1} yourself" + return ;; *) echo '' - echo " *** Sorry, I do not understand your answer (${YES_OR_NO})" + echo " *** Sorry, I do not understand your answer (${answer})" echo '' - echo " Make sure to run ${1} yourself" esac - ;; - *) ;; - esac + done } case "${NEED_NEWALIASES}" in @@ -1298,6 +1322,19 @@ case "${NEED_PWD_MKDB}" in ;; esac +if [ -e "${DESTDIR}/etc/localtime" ]; then # Ignore if TZ == UTC + echo '' + if [ -f "${DESTDIR}/var/db/zoneinfo" ]; then + echo "*** Reinstalling `cat ${DESTDIR}/var/db/zoneinfo` as ${DESTDIR}/etc/localtime" + [ -n "${DESTDIR}" ] && tzs_args="-C ${DESTDIR}" + tzsetup $tzs_args -r + else + echo "*** There is no ${DESTDIR}/var/db/zoneinfo file to update ${DESTDIR}/etc/localtime." + echo ' You should run tzsetup' + run_it_now tzsetup + fi +fi + echo '' if [ -r "${MM_EXIT_SCRIPT}" ]; then From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:10:41 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E652C106566C; Sun, 6 Nov 2011 08:10:41 +0000 (UTC) (envelope-from fjoe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D5BB98FC0C; Sun, 6 Nov 2011 08:10:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68AffX007696; Sun, 6 Nov 2011 08:10:41 GMT (envelope-from fjoe@svn.freebsd.org) Received: (from fjoe@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68Afxr007693; Sun, 6 Nov 2011 08:10:41 GMT (envelope-from fjoe@svn.freebsd.org) Message-Id: <201111060810.pA68Afxr007693@svn.freebsd.org> From: Max Khon Date: Sun, 6 Nov 2011 08:10:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227151 - in head/sys: conf kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:10:42 -0000 Author: fjoe Date: Sun Nov 6 08:10:41 2011 New Revision: 227151 URL: http://svn.freebsd.org/changeset/base/227151 Log: Add KLD_DEBUG option. Modified: head/sys/conf/options head/sys/kern/kern_linker.c Modified: head/sys/conf/options ============================================================================== --- head/sys/conf/options Sun Nov 6 08:03:33 2011 (r227150) +++ head/sys/conf/options Sun Nov 6 08:10:41 2011 (r227151) @@ -59,6 +59,7 @@ GDB KDB opt_global.h KDB_TRACE opt_kdb.h KDB_UNATTENDED opt_kdb.h +KLD_DEBUG opt_kld.h SYSCTL_DEBUG opt_sysctl.h # Miscellaneous options. Modified: head/sys/kern/kern_linker.c ============================================================================== --- head/sys/kern/kern_linker.c Sun Nov 6 08:03:33 2011 (r227150) +++ head/sys/kern/kern_linker.c Sun Nov 6 08:10:41 2011 (r227151) @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" +#include "opt_kld.h" #include "opt_hwpmc_hooks.h" #include From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:13:52 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D751106564A; Sun, 6 Nov 2011 08:13:52 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0D10F8FC0A; Sun, 6 Nov 2011 08:13:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68Dpbq007849; Sun, 6 Nov 2011 08:13:51 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68Dp01007847; Sun, 6 Nov 2011 08:13:51 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060813.pA68Dp01007847@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:13:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227152 - head/usr.bin/banner X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:13:52 -0000 Author: ed Date: Sun Nov 6 08:13:51 2011 New Revision: 227152 URL: http://svn.freebsd.org/changeset/base/227152 Log: Add missing static keywords to banner(1) Modified: head/usr.bin/banner/banner.c Modified: head/usr.bin/banner/banner.c ============================================================================== --- head/usr.bin/banner/banner.c Sun Nov 6 08:10:41 2011 (r227151) +++ head/usr.bin/banner/banner.c Sun Nov 6 08:13:51 2011 (r227152) @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #define NBYTES 9271 /* Pointers into data_table for each ASCII char */ -const int asc_ptr[NCHARS] = { +static const int asc_ptr[NCHARS] = { /* ^@ */ 0, 0, 0, 0, 0, 0, 0, 0, /* ^H */ 0, 0, 0, 0, 0, 0, 0, 0, /* ^P */ 0, 0, 0, 0, 0, 0, 0, 0, @@ -86,7 +86,7 @@ const int asc_ptr[NCHARS] = { * is the next elt in array) and goto second * next element in array. */ -const unsigned char data_table[NBYTES] = { +static const unsigned char data_table[NBYTES] = { /* 0 1 2 3 4 5 6 7 8 9 */ /* 0 */ 129, 227, 130, 34, 6, 90, 19, 129, 32, 10, /* 10 */ 74, 40, 129, 31, 12, 64, 53, 129, 30, 14, @@ -1018,11 +1018,11 @@ const unsigned char data_table[NBYTES] = /* 9270 */ 193 }; -char line[DWIDTH]; -char *message; -char print[DWIDTH]; -int debug, i, j, linen, max, nchars, pc, term, trace, x, y; -int width = DWIDTH; /* -w option: scrunch letters to 80 columns */ +static char line[DWIDTH]; +static char *message; +static char print[DWIDTH]; +static int debug, i, j, linen, max, nchars, pc, term, trace, x, y; +static int width = DWIDTH; /* -w option: scrunch letters to 80 columns */ static void usage(void); From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:13:59 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0597B1065772; Sun, 6 Nov 2011 08:13:58 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 79E488FC0C; Sun, 6 Nov 2011 08:13:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68DwpE007889; Sun, 6 Nov 2011 08:13:58 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68DwhZ007887; Sun, 6 Nov 2011 08:13:58 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060813.pA68DwhZ007887@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:13:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227153 - head/usr.bin/c99 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:13:59 -0000 Author: ed Date: Sun Nov 6 08:13:58 2011 New Revision: 227153 URL: http://svn.freebsd.org/changeset/base/227153 Log: Add missing static keywords to c99(1) Modified: head/usr.bin/c99/c99.c Modified: head/usr.bin/c99/c99.c ============================================================================== --- head/usr.bin/c99/c99.c Sun Nov 6 08:13:51 2011 (r227152) +++ head/usr.bin/c99/c99.c Sun Nov 6 08:13:58 2011 (r227153) @@ -43,12 +43,12 @@ __FBSDID("$FreeBSD$"); #include #include -char **args; -u_int cargs, nargs; +static char **args; +static u_int cargs, nargs; -void addarg(const char *); -void addlib(const char *); -void usage(void); +static void addarg(const char *); +static void addlib(const char *); +static void usage(void); int main(int argc, char *argv[]) @@ -91,7 +91,7 @@ main(int argc, char *argv[]) err(1, "/usr/bin/cc"); } -void +static void addarg(const char *item) { if (nargs + 1 >= cargs) { @@ -104,7 +104,7 @@ addarg(const char *item) args[nargs] = NULL; } -void +static void addlib(const char *lib) { @@ -123,7 +123,7 @@ addlib(const char *lib) } } -void +static void usage(void) { (void)fprintf(stderr, "%s\n%s\n", From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:14:04 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A3AD1065692; Sun, 6 Nov 2011 08:14:04 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 19BA88FC14; Sun, 6 Nov 2011 08:14:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68E341007930; Sun, 6 Nov 2011 08:14:03 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68E3TA007928; Sun, 6 Nov 2011 08:14:03 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060814.pA68E3TA007928@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:14:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227154 - head/usr.bin/cap_mkdb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:14:04 -0000 Author: ed Date: Sun Nov 6 08:14:03 2011 New Revision: 227154 URL: http://svn.freebsd.org/changeset/base/227154 Log: Add missing static keywords to cap_mkdb(1) Modified: head/usr.bin/cap_mkdb/cap_mkdb.c Modified: head/usr.bin/cap_mkdb/cap_mkdb.c ============================================================================== --- head/usr.bin/cap_mkdb/cap_mkdb.c Sun Nov 6 08:13:58 2011 (r227153) +++ head/usr.bin/cap_mkdb/cap_mkdb.c Sun Nov 6 08:14:03 2011 (r227154) @@ -53,15 +53,15 @@ __FBSDID("$FreeBSD$"); #include #include -void db_build(char **); -void dounlink(void); -void usage(void); - -DB *capdbp; -int verbose; -char *capdb, *capname, buf[8 * 1024]; +static void db_build(char **); +static void dounlink(void); +static void usage(void); + +static DB *capdbp; +static int verbose; +static char *capname, buf[8 * 1024]; -HASHINFO openinfo = { +static HASHINFO openinfo = { 4096, /* bsize */ 0, /* ffactor */ 0, /* nelem */ @@ -134,7 +134,7 @@ main(int argc, char *argv[]) exit(0); } -void +static void dounlink(void) { if (capname != NULL) @@ -153,7 +153,7 @@ dounlink(void) * Db_build() builds the name and capability databases according to the * details above. */ -void +static void db_build(char **ifiles) { DBT key, data; @@ -259,7 +259,7 @@ db_build(char **ifiles) (void)printf("cap_mkdb: %d capability records\n", reccnt); } -void +static void usage(void) { (void)fprintf(stderr, From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:14:13 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A48A10656EB; Sun, 6 Nov 2011 08:14:10 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1EE388FC15; Sun, 6 Nov 2011 08:14:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68EAJr007969; Sun, 6 Nov 2011 08:14:10 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68E9Ex007968; Sun, 6 Nov 2011 08:14:10 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060814.pA68E9Ex007968@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:14:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227155 - head/usr.bin/catman X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:14:13 -0000 Author: ed Date: Sun Nov 6 08:14:09 2011 New Revision: 227155 URL: http://svn.freebsd.org/changeset/base/227155 Log: Add missing static keywords to catman(1) Modified: head/usr.bin/catman/catman.c Modified: head/usr.bin/catman/catman.c ============================================================================== --- head/usr.bin/catman/catman.c Sun Nov 6 08:14:03 2011 (r227154) +++ head/usr.bin/catman/catman.c Sun Nov 6 08:14:09 2011 (r227155) @@ -94,7 +94,7 @@ enum Ziptype {NONE, BZIP, GZIP}; static uid_t uid; static int starting_dir; static char tmp_file[MAXPATHLEN]; -struct stat test_st; +static struct stat test_st; /* * A hashtable is an array of chains composed of this entry structure. From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:14:16 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7298E1065843; Sun, 6 Nov 2011 08:14:16 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 624558FC19; Sun, 6 Nov 2011 08:14:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68EGfC008007; Sun, 6 Nov 2011 08:14:16 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68EGLf008005; Sun, 6 Nov 2011 08:14:16 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060814.pA68EGLf008005@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:14:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227156 - head/usr.bin/cmp X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:14:16 -0000 Author: ed Date: Sun Nov 6 08:14:16 2011 New Revision: 227156 URL: http://svn.freebsd.org/changeset/base/227156 Log: Add missing static keywords to cmp(1) Modified: head/usr.bin/cmp/extern.h Modified: head/usr.bin/cmp/extern.h ============================================================================== --- head/usr.bin/cmp/extern.h Sun Nov 6 08:14:09 2011 (r227155) +++ head/usr.bin/cmp/extern.h Sun Nov 6 08:14:16 2011 (r227156) @@ -42,4 +42,4 @@ void c_special(int, const char *, off_t, void diffmsg(const char *, const char *, off_t, off_t); void eofmsg(const char *); -extern int lflag, sflag, xflag; +extern int lflag, sflag, xflag, zflag; From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:14:22 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A449410657CB; Sun, 6 Nov 2011 08:14:22 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A9EE8FC08; Sun, 6 Nov 2011 08:14:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68EMJm008047; Sun, 6 Nov 2011 08:14:22 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68EMlj008045; Sun, 6 Nov 2011 08:14:22 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060814.pA68EMlj008045@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:14:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227157 - head/usr.bin/col X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:14:22 -0000 Author: ed Date: Sun Nov 6 08:14:22 2011 New Revision: 227157 URL: http://svn.freebsd.org/changeset/base/227157 Log: Add missing static keywords to col(1) Modified: head/usr.bin/col/col.c Modified: head/usr.bin/col/col.c ============================================================================== --- head/usr.bin/col/col.c Sun Nov 6 08:14:16 2011 (r227156) +++ head/usr.bin/col/col.c Sun Nov 6 08:14:22 2011 (r227157) @@ -92,22 +92,22 @@ struct line_str { int l_max_col; /* max column in the line */ }; -LINE *alloc_line(void); -void dowarn(int); -void flush_line(LINE *); -void flush_lines(int); -void flush_blanks(void); -void free_line(LINE *); -void usage(void); - -CSET last_set; /* char_set of last char printed */ -LINE *lines; -int compress_spaces; /* if doing space -> tab conversion */ -int fine; /* if `fine' resolution (half lines) */ -int max_bufd_lines; /* max # lines to keep in memory */ -int nblank_lines; /* # blanks after last flushed line */ -int no_backspaces; /* if not to output any backspaces */ -int pass_unknown_seqs; /* pass unknown control sequences */ +static LINE *alloc_line(void); +static void dowarn(int); +static void flush_line(LINE *); +static void flush_lines(int); +static void flush_blanks(void); +static void free_line(LINE *); +static void usage(void); + +static CSET last_set; /* char_set of last char printed */ +static LINE *lines; +static int compress_spaces; /* if doing space -> tab conversion */ +static int fine; /* if `fine' resolution (half lines) */ +static int max_bufd_lines; /* max # lines to keep in memory */ +static int nblank_lines; /* # blanks after last flushed line */ +static int no_backspaces; /* if not to output any backspaces */ +static int pass_unknown_seqs; /* pass unknown control sequences */ #define PUTC(ch) \ do { \ @@ -334,7 +334,7 @@ main(int argc, char **argv) exit(0); } -void +static void flush_lines(int nflush) { LINE *l; @@ -360,7 +360,7 @@ flush_lines(int nflush) * is the number of half line feeds, otherwise it is the number of whole line * feeds. */ -void +static void flush_blanks(void) { int half, i, nb; @@ -389,7 +389,7 @@ flush_blanks(void) * Write a line to stdout taking care of space to tab conversion (-h flag) * and character set shifts. */ -void +static void flush_line(LINE *l) { CHAR *c, *endc; @@ -502,7 +502,7 @@ flush_line(LINE *l) static LINE *line_freelist; -LINE * +static LINE * alloc_line(void) { LINE *l; @@ -523,7 +523,7 @@ alloc_line(void) return (l); } -void +static void free_line(LINE *l) { @@ -531,7 +531,7 @@ free_line(LINE *l) line_freelist = l; } -void +static void usage(void) { @@ -539,7 +539,7 @@ usage(void) exit(1); } -void +static void dowarn(int line) { From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:14:28 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C496410659D7; Sun, 6 Nov 2011 08:14:28 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B45FF8FC15; Sun, 6 Nov 2011 08:14:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68ESRW008087; Sun, 6 Nov 2011 08:14:28 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68ESKs008085; Sun, 6 Nov 2011 08:14:28 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060814.pA68ESKs008085@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:14:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227158 - head/usr.bin/colcrt X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:14:28 -0000 Author: ed Date: Sun Nov 6 08:14:28 2011 New Revision: 227158 URL: http://svn.freebsd.org/changeset/base/227158 Log: Add missing static keywords to colcrt(1) Modified: head/usr.bin/colcrt/colcrt.c Modified: head/usr.bin/colcrt/colcrt.c ============================================================================== --- head/usr.bin/colcrt/colcrt.c Sun Nov 6 08:14:22 2011 (r227157) +++ head/usr.bin/colcrt/colcrt.c Sun Nov 6 08:14:28 2011 (r227158) @@ -64,13 +64,13 @@ __FBSDID("$FreeBSD$"); * Option -2 forces printing of all half lines. */ -wchar_t page[267][132]; +static wchar_t page[267][132]; -int outline = 1; -int outcol; +static int outline = 1; +static int outcol; -char suppresul; -char printall; +static char suppresul; +static char printall; static void move(int, int); static void pflush(int); From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:14:35 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57AA71065759; Sun, 6 Nov 2011 08:14:34 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 578388FC19; Sun, 6 Nov 2011 08:14:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68EYNB008127; Sun, 6 Nov 2011 08:14:34 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68EYS9008125; Sun, 6 Nov 2011 08:14:34 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060814.pA68EYS9008125@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:14:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227159 - head/usr.bin/column X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:14:35 -0000 Author: ed Date: Sun Nov 6 08:14:34 2011 New Revision: 227159 URL: http://svn.freebsd.org/changeset/base/227159 Log: Add missing static keywords to column(1) Modified: head/usr.bin/column/column.c Modified: head/usr.bin/column/column.c ============================================================================== --- head/usr.bin/column/column.c Sun Nov 6 08:14:28 2011 (r227158) +++ head/usr.bin/column/column.c Sun Nov 6 08:14:34 2011 (r227159) @@ -58,21 +58,21 @@ __FBSDID("$FreeBSD$"); #define TAB 8 -void c_columnate(void); -void input(FILE *); -void maketbl(void); -void print(void); -void r_columnate(void); -void usage(void); -int width(const wchar_t *); - -int termwidth = 80; /* default terminal width */ - -int entries; /* number of records */ -int eval; /* exit value */ -int maxlength; /* longest record */ -wchar_t **list; /* array of pointers to records */ -const wchar_t *separator = L"\t "; /* field separator for table option */ +static void c_columnate(void); +static void input(FILE *); +static void maketbl(void); +static void print(void); +static void r_columnate(void); +static void usage(void); +static int width(const wchar_t *); + +static int termwidth = 80; /* default terminal width */ + +static int entries; /* number of records */ +static int eval; /* exit value */ +static int maxlength; /* longest record */ +static wchar_t **list; /* array of pointers to records */ +static const wchar_t *separator = L"\t "; /* field separator for table option */ int main(int argc, char **argv) @@ -149,7 +149,7 @@ main(int argc, char **argv) exit(eval); } -void +static void c_columnate(void) { int chcnt, col, cnt, endcol, numcols; @@ -178,7 +178,7 @@ c_columnate(void) putwchar('\n'); } -void +static void r_columnate(void) { int base, chcnt, cnt, col, endcol, numcols, numrows, row; @@ -205,7 +205,7 @@ r_columnate(void) } } -void +static void print(void) { int cnt; @@ -221,7 +221,7 @@ typedef struct _tbl { } TBL; #define DEFCOLS 25 -void +static void maketbl(void) { TBL *t; @@ -274,7 +274,7 @@ maketbl(void) #define DEFNUM 1000 #define MAXLINELEN (LINE_MAX + 1) -void +static void input(FILE *fp) { static int maxentry; @@ -313,7 +313,7 @@ input(FILE *fp) } /* Like wcswidth(), but ignores non-printing characters. */ -int +static int width(const wchar_t *wcs) { int w, cw; @@ -324,7 +324,7 @@ width(const wchar_t *wcs) return (w); } -void +static void usage(void) { From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:14:40 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D2B41065782; Sun, 6 Nov 2011 08:14:40 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6CDC68FC1C; Sun, 6 Nov 2011 08:14:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68Eesk008167; Sun, 6 Nov 2011 08:14:40 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68Een3008165; Sun, 6 Nov 2011 08:14:40 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060814.pA68Een3008165@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:14:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227160 - head/usr.bin/cpuset X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:14:40 -0000 Author: ed Date: Sun Nov 6 08:14:40 2011 New Revision: 227160 URL: http://svn.freebsd.org/changeset/base/227160 Log: Add missing static keywords to cpuset(1) Modified: head/usr.bin/cpuset/cpuset.c Modified: head/usr.bin/cpuset/cpuset.c ============================================================================== --- head/usr.bin/cpuset/cpuset.c Sun Nov 6 08:14:34 2011 (r227159) +++ head/usr.bin/cpuset/cpuset.c Sun Nov 6 08:14:40 2011 (r227160) @@ -46,22 +46,22 @@ __FBSDID("$FreeBSD$"); #include #include -int Cflag; -int cflag; -int gflag; -int iflag; -int jflag; -int lflag; -int pflag; -int rflag; -int sflag; -int tflag; -int xflag; -id_t id; -cpulevel_t level; -cpuwhich_t which; +static int Cflag; +static int cflag; +static int gflag; +static int iflag; +static int jflag; +static int lflag; +static int pflag; +static int rflag; +static int sflag; +static int tflag; +static int xflag; +static id_t id; +static cpulevel_t level; +static cpuwhich_t which; -void usage(void); +static void usage(void); static void printset(cpuset_t *mask); @@ -161,8 +161,8 @@ printset(cpuset_t *mask) printf("\n"); } -const char *whichnames[] = { NULL, "tid", "pid", "cpuset", "irq", "jail" }; -const char *levelnames[] = { NULL, " root", " cpuset", "" }; +static const char *whichnames[] = { NULL, "tid", "pid", "cpuset", "irq", "jail" }; +static const char *levelnames[] = { NULL, " root", " cpuset", "" }; static void printaffinity(void) @@ -343,7 +343,7 @@ main(int argc, char *argv[]) exit(EXIT_SUCCESS); } -void +static void usage(void) { From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:14:46 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A56601065C14; Sun, 6 Nov 2011 08:14:46 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0ED028FC14; Sun, 6 Nov 2011 08:14:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68EjKW008206; Sun, 6 Nov 2011 08:14:45 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68EjZs008204; Sun, 6 Nov 2011 08:14:45 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060814.pA68EjZs008204@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:14:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227161 - head/usr.bin/csplit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:14:46 -0000 Author: ed Date: Sun Nov 6 08:14:45 2011 New Revision: 227161 URL: http://svn.freebsd.org/changeset/base/227161 Log: Add missing static keywords to csplit(1) Modified: head/usr.bin/csplit/csplit.c Modified: head/usr.bin/csplit/csplit.c ============================================================================== --- head/usr.bin/csplit/csplit.c Sun Nov 6 08:14:40 2011 (r227160) +++ head/usr.bin/csplit/csplit.c Sun Nov 6 08:14:45 2011 (r227161) @@ -60,36 +60,36 @@ __FBSDID("$FreeBSD$"); #include #include -void cleanup(void); -void do_lineno(const char *); -void do_rexp(const char *); -char *getline(void); -void handlesig(int); -FILE *newfile(void); -void toomuch(FILE *, long); -void usage(void); +static void cleanup(void); +static void do_lineno(const char *); +static void do_rexp(const char *); +static char *getline(void); +static void handlesig(int); +static FILE *newfile(void); +static void toomuch(FILE *, long); +static void usage(void); /* * Command line options */ -const char *prefix; /* File name prefix */ -long sufflen; /* Number of decimal digits for suffix */ -int sflag; /* Suppress output of file names */ -int kflag; /* Keep output if error occurs */ +static const char *prefix; /* File name prefix */ +static long sufflen; /* Number of decimal digits for suffix */ +static int sflag; /* Suppress output of file names */ +static int kflag; /* Keep output if error occurs */ /* * Other miscellaneous globals (XXX too many) */ -long lineno; /* Current line number in input file */ -long reps; /* Number of repetitions for this pattern */ -long nfiles; /* Number of files output so far */ -long maxfiles; /* Maximum number of files we can create */ -char currfile[PATH_MAX]; /* Current output file */ -const char *infn; /* Name of the input file */ -FILE *infile; /* Input file handle */ -FILE *overfile; /* Overflow file for toomuch() */ -off_t truncofs; /* Offset this file should be truncated at */ -int doclean; /* Should cleanup() remove output? */ +static long lineno; /* Current line number in input file */ +static long reps; /* Number of repetitions for this pattern */ +static long nfiles; /* Number of files output so far */ +static long maxfiles; /* Maximum number of files we can create */ +static char currfile[PATH_MAX]; /* Current output file */ +static const char *infn; /* Name of the input file */ +static FILE *infile; /* Input file handle */ +static FILE *overfile; /* Overflow file for toomuch() */ +static off_t truncofs; /* Offset this file should be truncated at */ +static int doclean; /* Should cleanup() remove output? */ int main(int argc, char *argv[]) @@ -209,7 +209,7 @@ main(int argc, char *argv[]) return (0); } -void +static void usage(void) { @@ -218,7 +218,7 @@ usage(void) exit(1); } -void +static void handlesig(int sig __unused) { const char msg[] = "csplit: caught signal, cleaning up\n"; @@ -229,7 +229,7 @@ handlesig(int sig __unused) } /* Create a new output file. */ -FILE * +static FILE * newfile(void) { FILE *fp; @@ -245,7 +245,7 @@ newfile(void) } /* Remove partial output, called before exiting. */ -void +static void cleanup(void) { char fnbuf[PATH_MAX]; @@ -269,7 +269,7 @@ cleanup(void) } /* Read a line from the input into a static buffer. */ -char * +static char * getline(void) { static char lbuf[LINE_MAX]; @@ -292,7 +292,7 @@ again: if (fgets(lbuf, sizeof(lbuf), src } /* Conceptually rewind the input (as obtained by getline()) back `n' lines. */ -void +static void toomuch(FILE *ofp, long n) { char buf[BUFSIZ]; @@ -351,7 +351,7 @@ toomuch(FILE *ofp, long n) } /* Handle splits for /regexp/ and %regexp% patterns. */ -void +static void do_rexp(const char *expr) { regex_t cre; @@ -433,7 +433,7 @@ do_rexp(const char *expr) } /* Handle splits based on line number. */ -void +static void do_lineno(const char *expr) { long lastline, tgtline; From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:14:52 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85C951065D60; Sun, 6 Nov 2011 08:14:52 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 447D78FC08; Sun, 6 Nov 2011 08:14:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68EqM0008249; Sun, 6 Nov 2011 08:14:52 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68Eqwu008247; Sun, 6 Nov 2011 08:14:52 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060814.pA68Eqwu008247@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:14:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227162 - head/usr.bin/cut X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:14:52 -0000 Author: ed Date: Sun Nov 6 08:14:51 2011 New Revision: 227162 URL: http://svn.freebsd.org/changeset/base/227162 Log: Add missing static keywords to cut(1) Modified: head/usr.bin/cut/cut.c Modified: head/usr.bin/cut/cut.c ============================================================================== --- head/usr.bin/cut/cut.c Sun Nov 6 08:14:45 2011 (r227161) +++ head/usr.bin/cut/cut.c Sun Nov 6 08:14:51 2011 (r227162) @@ -50,25 +50,25 @@ __FBSDID("$FreeBSD$"); #include #include -int bflag; -int cflag; -wchar_t dchar; -char dcharmb[MB_LEN_MAX + 1]; -int dflag; -int fflag; -int nflag; -int sflag; - -size_t autostart, autostop, maxval; -char * positions; - -int b_cut(FILE *, const char *); -int b_n_cut(FILE *, const char *); -int c_cut(FILE *, const char *); -int f_cut(FILE *, const char *); -void get_list(char *); -void needpos(size_t); -static void usage(void); +static int bflag; +static int cflag; +static wchar_t dchar; +static char dcharmb[MB_LEN_MAX + 1]; +static int dflag; +static int fflag; +static int nflag; +static int sflag; + +static size_t autostart, autostop, maxval; +static char * positions; + +static int b_cut(FILE *, const char *); +static int b_n_cut(FILE *, const char *); +static int c_cut(FILE *, const char *); +static int f_cut(FILE *, const char *); +static void get_list(char *); +static void needpos(size_t); +static void usage(void); int main(int argc, char *argv[]) @@ -153,7 +153,7 @@ main(int argc, char *argv[]) exit(rval); } -void +static void get_list(char *list) { size_t setautostart, start, stop; @@ -208,7 +208,7 @@ get_list(char *list) memset(positions + 1, '1', autostart); } -void +static void needpos(size_t n) { static size_t npos; @@ -227,7 +227,7 @@ needpos(size_t n) } } -int +static int b_cut(FILE *fp, const char *fname __unused) { int ch, col; @@ -261,7 +261,7 @@ b_cut(FILE *fp, const char *fname __unus * Although this function also handles the case where -n is not specified, * b_cut() ought to be much faster. */ -int +static int b_n_cut(FILE *fp, const char *fname) { size_t col, i, lbuflen; @@ -323,7 +323,7 @@ b_n_cut(FILE *fp, const char *fname) return (warned); } -int +static int c_cut(FILE *fp, const char *fname) { wint_t ch; @@ -358,7 +358,7 @@ out: return (0); } -int +static int f_cut(FILE *fp, const char *fname) { wchar_t ch; From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:14:58 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1441F1065E32; Sun, 6 Nov 2011 08:14:58 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 02ABE8FC14; Sun, 6 Nov 2011 08:14:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68EvsA008289; Sun, 6 Nov 2011 08:14:57 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68Evj9008287; Sun, 6 Nov 2011 08:14:57 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060814.pA68Evj9008287@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:14:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227163 - head/usr.bin/dc X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:14:58 -0000 Author: ed Date: Sun Nov 6 08:14:57 2011 New Revision: 227163 URL: http://svn.freebsd.org/changeset/base/227163 Log: Add missing static keywords to dc(1) Modified: head/usr.bin/dc/dc.c Modified: head/usr.bin/dc/dc.c ============================================================================== --- head/usr.bin/dc/dc.c Sun Nov 6 08:14:51 2011 (r227162) +++ head/usr.bin/dc/dc.c Sun Nov 6 08:14:57 2011 (r227163) @@ -39,9 +39,9 @@ static void usage(void); extern char *__progname; -struct source src; +static struct source src; -struct option long_options[] = +static const struct option long_options[] = { {"expression", required_argument, NULL, 'e'}, {"file", required_argument, NULL, 'f'}, From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:15:18 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B25B1065961; Sun, 6 Nov 2011 08:15:18 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3AB328FC13; Sun, 6 Nov 2011 08:15:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68FILn008343; Sun, 6 Nov 2011 08:15:18 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68FIvC008341; Sun, 6 Nov 2011 08:15:18 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060815.pA68FIvC008341@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:15:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227164 - head/usr.bin/du X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:15:18 -0000 Author: ed Date: Sun Nov 6 08:15:17 2011 New Revision: 227164 URL: http://svn.freebsd.org/changeset/base/227164 Log: Add missing static keywords to du(1) Modified: head/usr.bin/du/du.c Modified: head/usr.bin/du/du.c ============================================================================== --- head/usr.bin/du/du.c Sun Nov 6 08:14:57 2011 (r227163) +++ head/usr.bin/du/du.c Sun Nov 6 08:15:17 2011 (r227164) @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); #include #include -SLIST_HEAD(ignhead, ignentry) ignores; +static SLIST_HEAD(ignhead, ignentry) ignores; struct ignentry { char *mask; SLIST_ENTRY(ignentry) next; From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:15:24 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 606D01065AA2; Sun, 6 Nov 2011 08:15:24 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4F8F38FC20; Sun, 6 Nov 2011 08:15:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68FOlx008383; Sun, 6 Nov 2011 08:15:24 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68FOb5008381; Sun, 6 Nov 2011 08:15:24 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060815.pA68FOb5008381@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:15:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227165 - head/usr.bin/fold X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:15:24 -0000 Author: ed Date: Sun Nov 6 08:15:23 2011 New Revision: 227165 URL: http://svn.freebsd.org/changeset/base/227165 Log: Add missing static keywords to fold(1) Modified: head/usr.bin/fold/fold.c Modified: head/usr.bin/fold/fold.c ============================================================================== --- head/usr.bin/fold/fold.c Sun Nov 6 08:15:17 2011 (r227164) +++ head/usr.bin/fold/fold.c Sun Nov 6 08:15:23 2011 (r227165) @@ -61,8 +61,8 @@ void fold(int); static int newpos(int, wint_t); static void usage(void); -int bflag; /* Count bytes, not columns */ -int sflag; /* Split on word boundaries */ +static int bflag; /* Count bytes, not columns */ +static int sflag; /* Split on word boundaries */ int main(int argc, char **argv) From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:15:30 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81DD11065EC4; Sun, 6 Nov 2011 08:15:30 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 572178FC0C; Sun, 6 Nov 2011 08:15:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68FULR008424; Sun, 6 Nov 2011 08:15:30 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68FUU2008422; Sun, 6 Nov 2011 08:15:30 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060815.pA68FUU2008422@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:15:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227166 - head/usr.bin/id X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:15:30 -0000 Author: ed Date: Sun Nov 6 08:15:30 2011 New Revision: 227166 URL: http://svn.freebsd.org/changeset/base/227166 Log: Add missing static keywords to id(1) Modified: head/usr.bin/id/id.c Modified: head/usr.bin/id/id.c ============================================================================== --- head/usr.bin/id/id.c Sun Nov 6 08:15:23 2011 (r227165) +++ head/usr.bin/id/id.c Sun Nov 6 08:15:30 2011 (r227166) @@ -57,16 +57,16 @@ __FBSDID("$FreeBSD$"); #include #include -void id_print(struct passwd *, int, int, int); -void pline(struct passwd *); -void pretty(struct passwd *); -void auditid(void); -void group(struct passwd *, int); -void maclabel(void); -void usage(void); -struct passwd *who(char *); +static void id_print(struct passwd *, int, int, int); +static void pline(struct passwd *); +static void pretty(struct passwd *); +static void auditid(void); +static void group(struct passwd *, int); +static void maclabel(void); +static void usage(void); +static struct passwd *who(char *); -int isgroups, iswhoami; +static int isgroups, iswhoami; int main(int argc, char *argv[]) @@ -220,7 +220,7 @@ main(int argc, char *argv[]) exit(0); } -void +static void pretty(struct passwd *pw) { struct group *gr; @@ -260,7 +260,7 @@ pretty(struct passwd *pw) } } -void +static void id_print(struct passwd *pw, int use_ggl, int p_euid, int p_egid) { struct group *gr; @@ -324,7 +324,7 @@ id_print(struct passwd *pw, int use_ggl, } #ifdef USE_BSM_AUDIT -void +static void auditid(void) { auditinfo_t auditinfo; @@ -371,7 +371,7 @@ auditid(void) } #endif -void +static void group(struct passwd *pw, int nflag) { struct group *gr; @@ -411,7 +411,7 @@ group(struct passwd *pw, int nflag) free(groups); } -void +static void maclabel(void) { char *string; @@ -435,7 +435,7 @@ maclabel(void) free(string); } -struct passwd * +static struct passwd * who(char *u) { struct passwd *pw; @@ -455,7 +455,7 @@ who(char *u) /* NOTREACHED */ } -void +static void pline(struct passwd *pw) { @@ -471,7 +471,7 @@ pline(struct passwd *pw) } -void +static void usage(void) { From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:15:36 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 846891065BC6; Sun, 6 Nov 2011 08:15:36 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2947E8FC16; Sun, 6 Nov 2011 08:15:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68FaoF008463; Sun, 6 Nov 2011 08:15:36 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68Faov008461; Sun, 6 Nov 2011 08:15:36 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060815.pA68Faov008461@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:15:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227167 - head/usr.bin/join X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:15:36 -0000 Author: ed Date: Sun Nov 6 08:15:35 2011 New Revision: 227167 URL: http://svn.freebsd.org/changeset/base/227167 Log: Add missing static keywords to join(1) Modified: head/usr.bin/join/join.c Modified: head/usr.bin/join/join.c ============================================================================== --- head/usr.bin/join/join.c Sun Nov 6 08:15:30 2011 (r227166) +++ head/usr.bin/join/join.c Sun Nov 6 08:15:35 2011 (r227167) @@ -83,36 +83,36 @@ typedef struct { u_long setcnt; /* set count */ u_long setalloc; /* set allocated count */ } INPUT; -INPUT input1 = { NULL, 0, 0, 1, NULL, 0, 0, 0, 0 }, - input2 = { NULL, 0, 0, 2, NULL, 0, 0, 0, 0 }; +static INPUT input1 = { NULL, 0, 0, 1, NULL, 0, 0, 0, 0 }, + input2 = { NULL, 0, 0, 2, NULL, 0, 0, 0, 0 }; typedef struct { u_long filenum; /* file number */ u_long fieldno; /* field number */ } OLIST; -OLIST *olist; /* output field list */ -u_long olistcnt; /* output field list count */ -u_long olistalloc; /* output field allocated count */ - -int joinout = 1; /* show lines with matched join fields (-v) */ -int needsep; /* need separator character */ -int spans = 1; /* span multiple delimiters (-t) */ -char *empty; /* empty field replacement string (-e) */ +static OLIST *olist; /* output field list */ +static u_long olistcnt; /* output field list count */ +static u_long olistalloc; /* output field allocated count */ + +static int joinout = 1; /* show lines with matched join fields (-v) */ +static int needsep; /* need separator character */ +static int spans = 1; /* span multiple delimiters (-t) */ +static char *empty; /* empty field replacement string (-e) */ static wchar_t default_tabchar[] = L" \t"; -wchar_t *tabchar = default_tabchar;/* delimiter characters (-t) */ +static wchar_t *tabchar = default_tabchar; /* delimiter characters (-t) */ -int cmp(LINE *, u_long, LINE *, u_long); -void fieldarg(char *); -void joinlines(INPUT *, INPUT *); -int mbscoll(const char *, const char *); -char *mbssep(char **, const wchar_t *); -void obsolete(char **); -void outfield(LINE *, u_long, int); -void outoneline(INPUT *, LINE *); -void outtwoline(INPUT *, LINE *, INPUT *, LINE *); -void slurp(INPUT *); -wchar_t *towcs(const char *); -void usage(void); +static int cmp(LINE *, u_long, LINE *, u_long); +static void fieldarg(char *); +static void joinlines(INPUT *, INPUT *); +static int mbscoll(const char *, const char *); +static char *mbssep(char **, const wchar_t *); +static void obsolete(char **); +static void outfield(LINE *, u_long, int); +static void outoneline(INPUT *, LINE *); +static void outtwoline(INPUT *, LINE *, INPUT *, LINE *); +static void slurp(INPUT *); +static wchar_t *towcs(const char *); +static void usage(void); int main(int argc, char *argv[]) @@ -270,7 +270,7 @@ main(int argc, char *argv[]) exit(0); } -void +static void slurp(INPUT *F) { LINE *lp, *lastlp, tmp; @@ -359,7 +359,7 @@ slurp(INPUT *F) } } -char * +static char * mbssep(char **stringp, const wchar_t *delim) { char *s, *tok; @@ -388,7 +388,7 @@ mbssep(char **stringp, const wchar_t *de } } -int +static int cmp(LINE *lp1, u_long fieldno1, LINE *lp2, u_long fieldno2) { if (lp1->fieldcnt <= fieldno1) @@ -398,7 +398,7 @@ cmp(LINE *lp1, u_long fieldno1, LINE *lp return (mbscoll(lp1->fields[fieldno1], lp2->fields[fieldno2])); } -int +static int mbscoll(const char *s1, const char *s2) { wchar_t *w1, *w2; @@ -414,7 +414,7 @@ mbscoll(const char *s1, const char *s2) return (ret); } -wchar_t * +static wchar_t * towcs(const char *s) { wchar_t *wcs; @@ -428,7 +428,7 @@ towcs(const char *s) return (wcs); } -void +static void joinlines(INPUT *F1, INPUT *F2) { u_long cnt1, cnt2; @@ -448,7 +448,7 @@ joinlines(INPUT *F1, INPUT *F2) outtwoline(F1, &F1->set[cnt1], F2, &F2->set[cnt2]); } -void +static void outoneline(INPUT *F, LINE *lp) { u_long cnt; @@ -476,7 +476,7 @@ outoneline(INPUT *F, LINE *lp) needsep = 0; } -void +static void outtwoline(INPUT *F1, LINE *lp1, INPUT *F2, LINE *lp2) { u_long cnt; @@ -512,7 +512,7 @@ outtwoline(INPUT *F1, LINE *lp1, INPUT * needsep = 0; } -void +static void outfield(LINE *lp, u_long fieldno, int out_empty) { if (needsep++) @@ -535,7 +535,7 @@ outfield(LINE *lp, u_long fieldno, int o * Convert an output list argument "2.1, 1.3, 2.4" into an array of output * fields. */ -void +static void fieldarg(char *option) { u_long fieldno, filenum; @@ -569,7 +569,7 @@ fieldarg(char *option) } } -void +static void obsolete(char **argv) { size_t len; @@ -654,7 +654,7 @@ jbad: errx(1, "illegal option -- %s", } } -void +static void usage(void) { (void)fprintf(stderr, "%s %s\n%s\n", From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:15:42 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A494B1065F61; Sun, 6 Nov 2011 08:15:42 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4289B8FC18; Sun, 6 Nov 2011 08:15:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68FgFw008503; Sun, 6 Nov 2011 08:15:42 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68Fgxt008501; Sun, 6 Nov 2011 08:15:42 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060815.pA68Fgxt008501@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:15:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227168 - head/usr.bin/last X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:15:42 -0000 Author: ed Date: Sun Nov 6 08:15:41 2011 New Revision: 227168 URL: http://svn.freebsd.org/changeset/base/227168 Log: Add missing static keywords to last(1) Modified: head/usr.bin/last/last.c Modified: head/usr.bin/last/last.c ============================================================================== --- head/usr.bin/last/last.c Sun Nov 6 08:15:35 2011 (r227167) +++ head/usr.bin/last/last.c Sun Nov 6 08:15:41 2011 (r227168) @@ -70,9 +70,9 @@ typedef struct arg { int type; /* type of arg */ struct arg *next; /* linked list pointer */ } ARG; -ARG *arglist; /* head of linked list */ +static ARG *arglist; /* head of linked list */ -LIST_HEAD(idlisthead, idtab) idlist; +static LIST_HEAD(idlisthead, idtab) idlist; struct idtab { time_t logout; /* log out time */ @@ -94,17 +94,17 @@ static time_t snaptime; /* if != 0, we * at this snapshot time */ -void addarg(int, char *); -time_t dateconv(char *); -void doentry(struct utmpx *); -void hostconv(char *); -void printentry(struct utmpx *, struct idtab *); -char *ttyconv(char *); -int want(struct utmpx *); -void usage(void); -void wtmp(void); +static void addarg(int, char *); +static time_t dateconv(char *); +static void doentry(struct utmpx *); +static void hostconv(char *); +static void printentry(struct utmpx *, struct idtab *); +static char *ttyconv(char *); +static int want(struct utmpx *); +static void usage(void); +static void wtmp(void); -void +static void usage(void) { (void)fprintf(stderr, @@ -196,7 +196,7 @@ main(int argc, char *argv[]) * wtmp -- * read through the wtmp file */ -void +static void wtmp(void) { struct utmpx *buf = NULL; @@ -237,7 +237,7 @@ wtmp(void) * doentry -- * process a single wtmp entry */ -void +static void doentry(struct utmpx *bp) { struct idtab *tt, *ttx; /* idlist entry */ @@ -313,7 +313,7 @@ doentry(struct utmpx *bp) * If `tt' is non-NULL, use it and `crmsg' to print the logout time or * logout type (crash/shutdown) as appropriate. */ -void +static void printentry(struct utmpx *bp, struct idtab *tt) { char ct[80]; @@ -378,7 +378,7 @@ printentry(struct utmpx *bp, struct idta * want -- * see if want this entry */ -int +static int want(struct utmpx *bp) { ARG *step; @@ -411,7 +411,7 @@ want(struct utmpx *bp) * addarg -- * add an entry to a linked list of arguments */ -void +static void addarg(int type, char *arg) { ARG *cur; @@ -430,7 +430,7 @@ addarg(int type, char *arg) * has a domain attached that is the same as the current domain, rip * off the domain suffix since that's what login(1) does. */ -void +static void hostconv(char *arg) { static int first = 1; @@ -453,7 +453,7 @@ hostconv(char *arg) * ttyconv -- * convert tty to correct name. */ -char * +static char * ttyconv(char *arg) { char *mval; @@ -485,7 +485,7 @@ ttyconv(char *arg) * [[CC]YY]MMDDhhmm[.SS]] to a time_t. * Derived from atime_arg1() in usr.bin/touch/touch.c */ -time_t +static time_t dateconv(char *arg) { time_t timet; From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:15:49 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28D391066035; Sun, 6 Nov 2011 08:15:48 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 796508FC20; Sun, 6 Nov 2011 08:15:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68Fm5W008542; Sun, 6 Nov 2011 08:15:48 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68Fm4s008540; Sun, 6 Nov 2011 08:15:48 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060815.pA68Fm4s008540@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:15:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227169 - head/usr.bin/lock X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:15:49 -0000 Author: ed Date: Sun Nov 6 08:15:48 2011 New Revision: 227169 URL: http://svn.freebsd.org/changeset/base/227169 Log: Add missing static keywords to lock(1) Modified: head/usr.bin/lock/lock.c Modified: head/usr.bin/lock/lock.c ============================================================================== --- head/usr.bin/lock/lock.c Sun Nov 6 08:15:41 2011 (r227168) +++ head/usr.bin/lock/lock.c Sun Nov 6 08:15:48 2011 (r227169) @@ -72,17 +72,17 @@ __FBSDID("$FreeBSD$"); #define TIMEOUT 15 -void quit(int); -void bye(int); -void hi(int); +static void quit(int); +static void bye(int); +static void hi(int); static void usage(void); -struct timeval timeout; -struct timeval zerotime; -struct termios tty, ntty; -long nexttime; /* keep the timeout time */ -int no_timeout; /* lock terminal forever */ -int vtyunlock; /* Unlock flag and code. */ +static struct timeval timeout; +static struct timeval zerotime; +static struct termios tty, ntty; +static long nexttime; /* keep the timeout time */ +static int no_timeout; /* lock terminal forever */ +static int vtyunlock; /* Unlock flag and code. */ /*ARGSUSED*/ int @@ -252,7 +252,7 @@ usage(void) exit(1); } -void +static void hi(int signo __unused) { struct timeval timval; @@ -269,7 +269,7 @@ hi(int signo __unused) } } -void +static void quit(int signo __unused) { (void)putchar('\n'); @@ -279,7 +279,7 @@ quit(int signo __unused) exit(0); } -void +static void bye(int signo __unused) { if (!no_timeout) { From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:15:54 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A6251066053; Sun, 6 Nov 2011 08:15:54 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 09EA48FC15; Sun, 6 Nov 2011 08:15:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68FrGD008585; Sun, 6 Nov 2011 08:15:53 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68Fr2g008583; Sun, 6 Nov 2011 08:15:53 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060815.pA68Fr2g008583@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:15:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227170 - head/usr.bin/logger X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:15:54 -0000 Author: ed Date: Sun Nov 6 08:15:53 2011 New Revision: 227170 URL: http://svn.freebsd.org/changeset/base/227170 Log: Add missing static keywords to logger(1) Modified: head/usr.bin/logger/logger.c Modified: head/usr.bin/logger/logger.c ============================================================================== --- head/usr.bin/logger/logger.c Sun Nov 6 08:15:48 2011 (r227169) +++ head/usr.bin/logger/logger.c Sun Nov 6 08:15:53 2011 (r227170) @@ -57,8 +57,8 @@ __FBSDID("$FreeBSD$"); #define SYSLOG_NAMES #include -int decode(char *, CODE *); -int pencode(char *); +static int decode(char *, CODE *); +static int pencode(char *); static void logmessage(int, const char *, const char *, const char *, const char *); static void usage(void); @@ -70,11 +70,11 @@ struct socks { }; #ifdef INET6 -int family = PF_UNSPEC; /* protocol family (IPv4, IPv6 or both) */ +static int family = PF_UNSPEC; /* protocol family (IPv4, IPv6 or both) */ #else -int family = PF_INET; /* protocol family (IPv4 only) */ +static int family = PF_INET; /* protocol family (IPv4 only) */ #endif -int send_to_all = 0; /* send message to all IPv4/IPv6 addresses */ +static int send_to_all = 0; /* send message to all IPv4/IPv6 addresses */ /* * logger -- read and log utility @@ -176,7 +176,7 @@ main(int argc, char *argv[]) /* * Send the message to syslog, either on the local host, or on a remote host */ -void +static void logmessage(int pri, const char *tag, const char *host, const char *svcname, const char *buf) { @@ -246,7 +246,7 @@ logmessage(int pri, const char *tag, con /* * Decode a symbolic name to a numeric value */ -int +static int pencode(char *s) { char *save; @@ -270,7 +270,7 @@ pencode(char *s) return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); } -int +static int decode(char *name, CODE *codetab) { CODE *c; From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:16:00 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA89E106625B; Sun, 6 Nov 2011 08:16:00 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2E3998FC15; Sun, 6 Nov 2011 08:16:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68G0gE008626; Sun, 6 Nov 2011 08:16:00 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68G0lE008624; Sun, 6 Nov 2011 08:16:00 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060816.pA68G0lE008624@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:16:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227171 - head/usr.bin/look X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:16:00 -0000 Author: ed Date: Sun Nov 6 08:15:59 2011 New Revision: 227171 URL: http://svn.freebsd.org/changeset/base/227171 Log: Add missing static keywords to look(1) Modified: head/usr.bin/look/look.c Modified: head/usr.bin/look/look.c ============================================================================== --- head/usr.bin/look/look.c Sun Nov 6 08:15:53 2011 (r227170) +++ head/usr.bin/look/look.c Sun Nov 6 08:15:59 2011 (r227171) @@ -77,14 +77,14 @@ static char _path_words[] = _PATH_WORDS; #define GREATER 1 #define LESS (-1) -int dflag, fflag; +static int dflag, fflag; -char *binary_search(wchar_t *, unsigned char *, unsigned char *); -int compare(wchar_t *, unsigned char *, unsigned char *); -char *linear_search(wchar_t *, unsigned char *, unsigned char *); -int look(wchar_t *, unsigned char *, unsigned char *); -wchar_t *prepkey(const char *, wchar_t); -void print_from(wchar_t *, unsigned char *, unsigned char *); +static char *binary_search(wchar_t *, unsigned char *, unsigned char *); +static int compare(wchar_t *, unsigned char *, unsigned char *); +static char *linear_search(wchar_t *, unsigned char *, unsigned char *); +static int look(wchar_t *, unsigned char *, unsigned char *); +static wchar_t *prepkey(const char *, wchar_t); +static void print_from(wchar_t *, unsigned char *, unsigned char *); static void usage(void); @@ -151,7 +151,7 @@ main(int argc, char *argv[]) exit(match); } -wchar_t * +static wchar_t * prepkey(const char *string, wchar_t termchar) { const char *readp; @@ -182,7 +182,7 @@ prepkey(const char *string, wchar_t term return (key); } -int +static int look(wchar_t *string, unsigned char *front, unsigned char *back) { @@ -236,7 +236,7 @@ look(wchar_t *string, unsigned char *fro #define SKIP_PAST_NEWLINE(p, back) \ while (p < back && *p++ != '\n'); -char * +static char * binary_search(wchar_t *string, unsigned char *front, unsigned char *back) { unsigned char *p; @@ -270,7 +270,7 @@ binary_search(wchar_t *string, unsigned * o front points at the first character in a line. * o front is before or at the first line to be printed. */ -char * +static char * linear_search(wchar_t *string, unsigned char *front, unsigned char *back) { while (front < back) { @@ -290,7 +290,7 @@ linear_search(wchar_t *string, unsigned /* * Print as many lines as match string, starting at front. */ -void +static void print_from(wchar_t *string, unsigned char *front, unsigned char *back) { for (; front < back && compare(string, front, back) == EQUAL; ++front) { @@ -315,7 +315,7 @@ print_from(wchar_t *string, unsigned cha * The string "s1" is null terminated. The string s2 is '\n' terminated (or * "back" terminated). */ -int +static int compare(wchar_t *s1, unsigned char *s2, unsigned char *back) { wchar_t ch1, ch2; From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:16:06 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CFF1F1065834; Sun, 6 Nov 2011 08:16:06 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A5C798FC1C; Sun, 6 Nov 2011 08:16:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68G6kX008669; Sun, 6 Nov 2011 08:16:06 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68G69P008667; Sun, 6 Nov 2011 08:16:06 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060816.pA68G69P008667@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:16:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227172 - head/usr.bin/make X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:16:06 -0000 Author: ed Date: Sun Nov 6 08:16:06 2011 New Revision: 227172 URL: http://svn.freebsd.org/changeset/base/227172 Log: Add missing static keywords to make(1) Modified: head/usr.bin/make/globals.h Modified: head/usr.bin/make/globals.h ============================================================================== --- head/usr.bin/make/globals.h Sun Nov 6 08:15:59 2011 (r227171) +++ head/usr.bin/make/globals.h Sun Nov 6 08:16:06 2011 (r227172) @@ -75,6 +75,7 @@ extern Boolean beSilent; /* True if shou extern Boolean beVerbose; /* True if should print extra cruft */ extern Boolean beQuiet; /* True if want quiet headers with -j */ extern Boolean noExecute; /* True if should execute nothing */ +extern Boolean printGraphOnly; /* -p flag */ extern Boolean allPrecious; /* True if every target is precious */ extern Boolean is_posix; /* .POSIX target seen */ extern Boolean mfAutoDeps; /* .MAKEFILEDEPS target seen */ From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:16:12 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36F611065D87; Sun, 6 Nov 2011 08:16:12 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2526A8FC1E; Sun, 6 Nov 2011 08:16:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68GCdv008708; Sun, 6 Nov 2011 08:16:12 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68GCle008706; Sun, 6 Nov 2011 08:16:12 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060816.pA68GCle008706@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:16:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227173 - head/usr.bin/ministat X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:16:12 -0000 Author: ed Date: Sun Nov 6 08:16:11 2011 New Revision: 227173 URL: http://svn.freebsd.org/changeset/base/227173 Log: Add missing static keywords to ministat(1) Modified: head/usr.bin/ministat/ministat.c Modified: head/usr.bin/ministat/ministat.c ============================================================================== --- head/usr.bin/ministat/ministat.c Sun Nov 6 08:16:06 2011 (r227172) +++ head/usr.bin/ministat/ministat.c Sun Nov 6 08:16:11 2011 (r227173) @@ -23,8 +23,8 @@ __FBSDID("$FreeBSD$"); #define NSTUDENT 100 #define NCONF 6 -double const studentpct[] = { 80, 90, 95, 98, 99, 99.5 }; -double student [NSTUDENT + 1][NCONF] = { +static double const studentpct[] = { 80, 90, 95, 98, 99, 99.5 }; +static double student[NSTUDENT + 1][NCONF] = { /* inf */ { 1.282, 1.645, 1.960, 2.326, 2.576, 3.090 }, /* 1. */ { 3.078, 6.314, 12.706, 31.821, 63.657, 318.313 }, /* 2. */ { 1.886, 2.920, 4.303, 6.965, 9.925, 22.327 }, From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:16:18 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 821DC106627E; Sun, 6 Nov 2011 08:16:18 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6726B8FC1D; Sun, 6 Nov 2011 08:16:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68GItv008747; Sun, 6 Nov 2011 08:16:18 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68GIZi008745; Sun, 6 Nov 2011 08:16:18 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060816.pA68GIZi008745@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:16:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227174 - head/usr.bin/mt X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:16:18 -0000 Author: ed Date: Sun Nov 6 08:16:18 2011 New Revision: 227174 URL: http://svn.freebsd.org/changeset/base/227174 Log: Add missing static keywords to mt(1) Modified: head/usr.bin/mt/mt.c Modified: head/usr.bin/mt/mt.c ============================================================================== --- head/usr.bin/mt/mt.c Sun Nov 6 08:16:11 2011 (r227173) +++ head/usr.bin/mt/mt.c Sun Nov 6 08:16:18 2011 (r227174) @@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$"); #define FALSE 0 #endif -struct commands { +static const struct commands { const char *c_name; int c_code; int c_ronly; @@ -114,22 +114,22 @@ struct commands { { NULL, 0, 0, 0 } }; -const char *getblksiz(int); -void printreg(const char *, u_int, const char *); -void status(struct mtget *); -void usage(void); -void st_status (struct mtget *); -int stringtodens (const char *s); -const char *denstostring (int d); -int denstobp(int d, int bpi); -u_int32_t stringtocomp(const char *s); -const char *comptostring(u_int32_t comp); -void warn_eof(void); +static const char *getblksiz(int); +static void printreg(const char *, u_int, const char *); +static void status(struct mtget *); +static void usage(void); +static void st_status(struct mtget *); +static int stringtodens(const char *s); +static const char *denstostring(int d); +static int denstobp(int d, int bpi); +static u_int32_t stringtocomp(const char *s); +static const char *comptostring(u_int32_t comp); +static void warn_eof(void); int main(int argc, char *argv[]) { - struct commands *comp; + const struct commands *comp; struct mtget mt_status; struct mtop mt_com; int ch, len, mtfd; @@ -303,7 +303,7 @@ main(int argc, char *argv[]) /* NOTREACHED */ } -struct tape_desc { +static const struct tape_desc { short t_type; /* type of magtape device */ const char *t_name; /* printing name */ const char *t_dsbits; /* "drive status" register */ @@ -316,10 +316,10 @@ struct tape_desc { /* * Interpret the status buffer returned */ -void +static void status(struct mtget *bp) { - struct tape_desc *mt; + const struct tape_desc *mt; for (mt = tapes;; mt++) { if (mt->t_type == 0) { @@ -344,7 +344,7 @@ status(struct mtget *bp) /* * Print a register a la the %b format of the kernel's printf. */ -void +static void printreg(const char *s, u_int v, const char *bits) { int i, any = 0; @@ -374,14 +374,14 @@ printreg(const char *s, u_int v, const c } } -void +static void usage(void) { (void)fprintf(stderr, "usage: mt [-f device] command [count]\n"); exit(1); } -struct densities { +static const struct densities { int dens; int bpmm; int bpi; @@ -437,7 +437,7 @@ struct densities { { 0, 0, 0, NULL } }; -struct compression_types { +static const struct compression_types { u_int32_t comp_number; const char *name; } comp_types[] = { @@ -450,11 +450,11 @@ struct compression_types { { 0xf0f0f0f0, NULL} }; -const char * +static const char * denstostring(int d) { static char buf[20]; - struct densities *sd; + const struct densities *sd; /* densities 0 and 0x7f are handled as special cases */ if (d == 0) @@ -475,10 +475,10 @@ denstostring(int d) * Given a specific density number, return either the bits per inch or bits * per millimeter for the given density. */ -int +static int denstobp(int d, int bpi) { - struct densities *sd; + const struct densities *sd; for (sd = dens; sd->dens; sd++) if (sd->dens == d) @@ -493,10 +493,10 @@ denstobp(int d, int bpi) } } -int +static int stringtodens(const char *s) { - struct densities *sd; + const struct densities *sd; size_t l = strlen(s); for (sd = dens; sd->dens; sd++) @@ -506,7 +506,7 @@ stringtodens(const char *s) } -const char * +static const char * getblksiz(int bs) { static char buf[25]; @@ -518,11 +518,11 @@ getblksiz(int bs) } } -const char * +static const char * comptostring(u_int32_t comp) { static char buf[20]; - struct compression_types *ct; + const struct compression_types *ct; if (comp == MT_COMP_DISABLED) return "disabled"; @@ -540,10 +540,10 @@ comptostring(u_int32_t comp) return(ct->name); } -u_int32_t +static u_int32_t stringtocomp(const char *s) { - struct compression_types *ct; + const struct compression_types *ct; size_t l = strlen(s); for (ct = comp_types; ct->name; ct++) @@ -553,7 +553,7 @@ stringtocomp(const char *s) return(ct->comp_number); } -void +static void st_status(struct mtget *bp) { printf("Mode Density Blocksize bpi " @@ -634,7 +634,7 @@ st_status(struct mtget *bp) bp->mt_fileno, bp->mt_blkno, bp->mt_resid); } -void +static void warn_eof(void) { fprintf(stderr, From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:16:25 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3AD1810659F8; Sun, 6 Nov 2011 08:16:24 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6EAEC8FC1D; Sun, 6 Nov 2011 08:16:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68GOle008790; Sun, 6 Nov 2011 08:16:24 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68GOwY008787; Sun, 6 Nov 2011 08:16:24 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060816.pA68GOwY008787@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:16:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227175 - head/usr.bin/pr X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:16:25 -0000 Author: ed Date: Sun Nov 6 08:16:24 2011 New Revision: 227175 URL: http://svn.freebsd.org/changeset/base/227175 Log: Add missing static keywords to pr(1) Modified: head/usr.bin/pr/extern.h head/usr.bin/pr/pr.c Modified: head/usr.bin/pr/extern.h ============================================================================== --- head/usr.bin/pr/extern.h Sun Nov 6 08:16:18 2011 (r227174) +++ head/usr.bin/pr/extern.h Sun Nov 6 08:16:24 2011 (r227175) @@ -38,7 +38,9 @@ * $FreeBSD$ */ +extern int eopterr; extern int eoptind; +extern int eoptopt; extern char *eoptarg; void addnum(char *, int, int); Modified: head/usr.bin/pr/pr.c ============================================================================== --- head/usr.bin/pr/pr.c Sun Nov 6 08:16:18 2011 (r227174) +++ head/usr.bin/pr/pr.c Sun Nov 6 08:16:24 2011 (r227175) @@ -80,40 +80,40 @@ __FBSDID("$FreeBSD$"); /* * parameter variables */ -int pgnm; /* starting page number */ -int clcnt; /* number of columns */ -int colwd; /* column data width - multiple columns */ -int across; /* mult col flag; write across page */ -int dspace; /* double space flag */ -char inchar; /* expand input char */ -int ingap; /* expand input gap */ -int pausefst; /* Pause before first page */ -int pauseall; /* Pause before each page */ -int formfeed; /* use formfeed as trailer */ -char *header; /* header name instead of file name */ -char ochar; /* contract output char */ -int ogap; /* contract output gap */ -int lines; /* number of lines per page */ -int merge; /* merge multiple files in output */ -char nmchar; /* line numbering append char */ -int nmwd; /* width of line number field */ -int offst; /* number of page offset spaces */ -int nodiag; /* do not report file open errors */ -char schar; /* text column separation character */ -int sflag; /* -s option for multiple columns */ -int nohead; /* do not write head and trailer */ -int pgwd; /* page width with multiple col output */ -const char *timefrmt; /* time conversion string */ +static int pgnm; /* starting page number */ +static int clcnt; /* number of columns */ +static int colwd; /* column data width - multiple columns */ +static int across; /* mult col flag; write across page */ +static int dspace; /* double space flag */ +static char inchar; /* expand input char */ +static int ingap; /* expand input gap */ +static int pausefst; /* Pause before first page */ +static int pauseall; /* Pause before each page */ +static int formfeed; /* use formfeed as trailer */ +static char *header; /* header name instead of file name */ +static char ochar; /* contract output char */ +static int ogap; /* contract output gap */ +static int lines; /* number of lines per page */ +static int merge; /* merge multiple files in output */ +static char nmchar; /* line numbering append char */ +static int nmwd; /* width of line number field */ +static int offst; /* number of page offset spaces */ +static int nodiag; /* do not report file open errors */ +static char schar; /* text column separation character */ +static int sflag; /* -s option for multiple columns */ +static int nohead; /* do not write head and trailer */ +static int pgwd; /* page width with multiple col output */ +static const char *timefrmt; /* time conversion string */ /* * misc globals */ -FILE *err; /* error message file pointer */ -int addone; /* page length is odd with double space */ -int errcnt; /* error count on file processing */ -char digs[] = "0123456789"; /* page number translation map */ +static FILE *err; /* error message file pointer */ +static int addone; /* page length is odd with double space */ +static int errcnt; /* error count on file processing */ +static char digs[] = "0123456789"; /* page number translation map */ -char fnamedefault[] = FNAME; +static char fnamedefault[] = FNAME; int main(int argc, char *argv[]) From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:16:30 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56DF41065A06; Sun, 6 Nov 2011 08:16:30 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4687B8FC28; Sun, 6 Nov 2011 08:16:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68GTbo008830; Sun, 6 Nov 2011 08:16:29 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68GT9Q008828; Sun, 6 Nov 2011 08:16:29 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060816.pA68GT9Q008828@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:16:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227176 - head/usr.bin/quota X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:16:30 -0000 Author: ed Date: Sun Nov 6 08:16:29 2011 New Revision: 227176 URL: http://svn.freebsd.org/changeset/base/227176 Log: Add missing static keywords to quota(1) Modified: head/usr.bin/quota/quota.c Modified: head/usr.bin/quota/quota.c ============================================================================== --- head/usr.bin/quota/quota.c Sun Nov 6 08:16:24 2011 (r227175) +++ head/usr.bin/quota/quota.c Sun Nov 6 08:16:29 2011 (r227176) @@ -73,8 +73,7 @@ __FBSDID("$FreeBSD$"); #include #include -const char *qfname = QUOTAFILENAME; -const char *qfextension[] = INITQFNAMES; +static const char *qfextension[] = INITQFNAMES; struct quotause { struct quotause *next; @@ -101,12 +100,12 @@ static int callaurpc(char *host, int pro xdrproc_t inproc, char *in, xdrproc_t outproc, char *out); static int alldigits(char *s); -int hflag; -int lflag; -int rflag; -int qflag; -int vflag; -char *filename = NULL; +static int hflag; +static int lflag; +static int rflag; +static int qflag; +static int vflag; +static char *filename = NULL; int main(int argc, char *argv[]) From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:16:37 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8520A10664F4; Sun, 6 Nov 2011 08:16:36 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4BDAF8FC24; Sun, 6 Nov 2011 08:16:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68GapU008870; Sun, 6 Nov 2011 08:16:36 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68Ga7d008868; Sun, 6 Nov 2011 08:16:36 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060816.pA68Ga7d008868@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:16:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227177 - head/usr.bin/rs X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:16:37 -0000 Author: ed Date: Sun Nov 6 08:16:35 2011 New Revision: 227177 URL: http://svn.freebsd.org/changeset/base/227177 Log: Add missing static keywords to rs(1) Modified: head/usr.bin/rs/rs.c Modified: head/usr.bin/rs/rs.c ============================================================================== --- head/usr.bin/rs/rs.c Sun Nov 6 08:16:29 2011 (r227176) +++ head/usr.bin/rs/rs.c Sun Nov 6 08:16:35 2011 (r227177) @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include -long flags; +static long flags; #define TRANSPOSE 000001 #define MTRANSPOSE 000002 #define ONEPERLINE 000004 @@ -72,34 +72,34 @@ long flags; #define ONEPERCHAR 0100000 #define NOARGS 0200000 -short *colwidths; -short *cord; -short *icbd; -short *ocbd; -int nelem; -char **elem; -char **endelem; -char *curline; -int allocsize = BUFSIZ; -int curlen; -int irows, icols; -int orows = 0, ocols = 0; -int maxlen; -int skip; -int propgutter; -char isep = ' ', osep = ' '; -char blank[] = ""; -int owidth = 80, gutter = 2; - -void getargs(int, char *[]); -void getfile(void); -int getline(void); -char *getlist(short **, char *); -char *getnum(int *, char *, int); -char **getptrs(char **); -void prepfile(void); -void prints(char *, int); -void putfile(void); +static short *colwidths; +static short *cord; +static short *icbd; +static short *ocbd; +static int nelem; +static char **elem; +static char **endelem; +static char *curline; +static int allocsize = BUFSIZ; +static int curlen; +static int irows, icols; +static int orows = 0, ocols = 0; +static int maxlen; +static int skip; +static int propgutter; +static char isep = ' ', osep = ' '; +static char blank[] = ""; +static int owidth = 80, gutter = 2; + +static void getargs(int, char *[]); +static void getfile(void); +static int getline(void); +static char *getlist(short **, char *); +static char *getnum(int *, char *, int); +static char **getptrs(char **); +static void prepfile(void); +static void prints(char *, int); +static void putfile(void); static void usage(void); #define INCR(ep) do { \ @@ -121,7 +121,7 @@ main(int argc, char *argv[]) exit(0); } -void +static void getfile(void) { char *p; @@ -189,7 +189,7 @@ getfile(void) nelem = ep - elem; } -void +static void putfile(void) { char **ep; @@ -211,7 +211,7 @@ putfile(void) } } -void +static void prints(char *s, int col) { int n; @@ -237,7 +237,7 @@ usage(void) exit(1); } -void +static void prepfile(void) { char **ep; @@ -330,9 +330,9 @@ prepfile(void) } #define BSIZE (LINE_MAX * 2) -char ibuf[BSIZE]; +static char ibuf[BSIZE]; -int +static int getline(void) /* get line; maintain curline, curlen; manage storage */ { static int putlength; @@ -372,7 +372,7 @@ getline(void) /* get line; maintain curl return(c); } -char ** +static char ** getptrs(char **sp) { char **p; @@ -387,7 +387,7 @@ getptrs(char **sp) return(sp); } -void +static void getargs(int ac, char *av[]) { char *p; @@ -498,7 +498,7 @@ getargs(int ac, char *av[]) } } -char * +static char * getlist(short **list, char *p) { int count = 1; @@ -534,7 +534,7 @@ getlist(short **list, char *p) * num = number p points to; if (strict) complain * returns pointer to end of num */ -char * +static char * getnum(int *num, char *p, int strict) { char *t = p; From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:16:42 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 376521066545; Sun, 6 Nov 2011 08:16:42 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0D2E78FC1C; Sun, 6 Nov 2011 08:16:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68GffT008908; Sun, 6 Nov 2011 08:16:41 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68GfbF008906; Sun, 6 Nov 2011 08:16:41 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060816.pA68GfbF008906@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:16:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227178 - head/usr.bin/ruptime X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:16:42 -0000 Author: ed Date: Sun Nov 6 08:16:41 2011 New Revision: 227178 URL: http://svn.freebsd.org/changeset/base/227178 Log: Add missing static keywords to ruptime(1) Modified: head/usr.bin/ruptime/ruptime.c Modified: head/usr.bin/ruptime/ruptime.c ============================================================================== --- head/usr.bin/ruptime/ruptime.c Sun Nov 6 08:16:35 2011 (r227177) +++ head/usr.bin/ruptime/ruptime.c Sun Nov 6 08:16:41 2011 (r227178) @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include -struct hs { +static struct hs { struct whod hs_wd; int hs_nusers; } *hs; @@ -62,19 +62,18 @@ struct hs { #define ISDOWN(h) (now - (h)->hs_wd.wd_recvtime > 11 * 60) #define WHDRSIZE __offsetof(struct whod, wd_we) -size_t nhosts; -time_t now; -int rflg = 1; -DIR *dirp; - -int hscmp(const void *, const void *); -char *interval(time_t, const char *); -int lcmp(const void *, const void *); -void morehosts(void); -void ruptime(const char *, int, int (*)(const void *, const void *)); -int tcmp(const void *, const void *); -int ucmp(const void *, const void *); -void usage(void); +static size_t nhosts; +static time_t now; +static int rflg = 1; +static DIR *dirp; + +static int hscmp(const void *, const void *); +static char *interval(time_t, const char *); +static int lcmp(const void *, const void *); +static void ruptime(const char *, int, int (*)(const void *, const void *)); +static int tcmp(const void *, const void *); +static int ucmp(const void *, const void *); +static void usage(void); int main(int argc, char *argv[]) @@ -119,7 +118,7 @@ main(int argc, char *argv[]) exit(0); } -char * +static char * interval(time_t tval, const char *updown) { static char resbuf[32]; @@ -147,7 +146,7 @@ interval(time_t tval, const char *updown #define HS(a) ((const struct hs *)(a)) /* Alphabetical comparison. */ -int +static int hscmp(const void *a1, const void *a2) { return (rflg * @@ -155,7 +154,7 @@ hscmp(const void *a1, const void *a2) } /* Load average comparison. */ -int +static int lcmp(const void *a1, const void *a2) { if (ISDOWN(HS(a1))) @@ -170,7 +169,7 @@ lcmp(const void *a1, const void *a2) (HS(a2)->hs_wd.wd_loadav[0] - HS(a1)->hs_wd.wd_loadav[0])); } -void +static void ruptime(const char *host, int aflg, int (*cmp)(const void *, const void *)) { struct hs *hsp; @@ -261,7 +260,7 @@ ruptime(const char *host, int aflg, int } /* Number of users comparison. */ -int +static int ucmp(const void *a1, const void *a2) { if (ISDOWN(HS(a1))) @@ -276,7 +275,7 @@ ucmp(const void *a1, const void *a2) } /* Uptime comparison. */ -int +static int tcmp(const void *a1, const void *a2) { return (rflg * ( @@ -288,7 +287,7 @@ tcmp(const void *a1, const void *a2) )); } -void +static void usage(void) { (void)fprintf(stderr, "usage: ruptime [-alrtu] [host ...]\n"); From owner-svn-src-all@FreeBSD.ORG Sun Nov 6 08:16:48 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BD3B1065745; Sun, 6 Nov 2011 08:16:48 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0B99D8FC18; Sun, 6 Nov 2011 08:16:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA68GlMw008947; Sun, 6 Nov 2011 08:16:47 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68GlPX008945; Sun, 6 Nov 2011 08:16:47 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060816.pA68GlPX008945@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:16:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227179 - head/usr.bin/rusers X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 08:16:48 -0000 Author: ed Date: Sun Nov 6 08:16:47 2011 New Revision: 227179 URL: http://svn.freebsd.org/changeset/base/227179 Log: Add missing static keywords to rusers(1) Modified: head/usr.bin/rusers/rusers.c Modified: head/usr.bin/rusers/rusers.c ============================================================================== --- head/usr.bin/rusers/rusers.c Sun Nov 6 08:16:41 2011 (r227178) +++ head/usr.bin/rusers/rusers.c Sun Nov 6 08:16:47 2011 (r227179) @@ -56,10 +56,10 @@ __FBSDID("$FreeBSD$"); #define HOST_WIDTH 20 #define LINE_WIDTH 15 -int longopt; -int allopt; +static int longopt; +static int all