From owner-svn-src-stable-7@FreeBSD.ORG Sun Jun 24 18:38:17 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A2A9C106566C; Sun, 24 Jun 2012 18:38:17 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 72FC08FC15; Sun, 24 Jun 2012 18:38: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 q5OIcHkQ025389; Sun, 24 Jun 2012 18:38:17 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5OIcHfu025385; Sun, 24 Jun 2012 18:38:17 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201206241838.q5OIcHfu025385@svn.freebsd.org> From: Christian Brueffer Date: Sun, 24 Jun 2012 18:38: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: r237539 - in stable/7: . share/man/man9 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2012 18:38:17 -0000 Author: brueffer Date: Sun Jun 24 18:38:16 2012 New Revision: 237539 URL: http://svn.freebsd.org/changeset/base/237539 Log: MFC: r211353 Tie up some loose ends r88509 left behind: - chooseproc() is long gone, MLINK choosethread instead - Update NAME section for choosethread - Mark chooseproc.9 for removal Modified: stable/7/ObsoleteFiles.inc (contents, props changed) stable/7/share/man/man9/Makefile stable/7/share/man/man9/runqueue.9 Directory Properties: stable/7/share/man/man9/ (props changed) Modified: stable/7/ObsoleteFiles.inc ============================================================================== --- stable/7/ObsoleteFiles.inc Sun Jun 24 17:37:08 2012 (r237538) +++ stable/7/ObsoleteFiles.inc Sun Jun 24 18:38:16 2012 (r237539) @@ -22,6 +22,8 @@ OLD_FILES+=usr/share/man/man8/MAKEDEV.8. OLD_FILES+=usr/share/man/man9/vgonel.9.gz # 20101025: catch up with vm_page_sleep_if_busy rename OLD_FILES+=usr/share/man/man9/vm_page_sleep_busy.9.gz +# 20100815: retired last traces of chooseproc(9) +OLD_FILES+=usr/share/man/man9/chooseproc.9.gz # 20091129: pecoff image activator removed .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/pecoff_machdep.h Modified: stable/7/share/man/man9/Makefile ============================================================================== --- stable/7/share/man/man9/Makefile Sun Jun 24 17:37:08 2012 (r237538) +++ stable/7/share/man/man9/Makefile Sun Jun 24 18:38:16 2012 (r237539) @@ -930,7 +930,7 @@ MLINKS+=rtalloc.9 rtalloc1.9 \ rtalloc.9 rtalloc_ign.9 \ rtalloc.9 RTFREE.9 \ rtalloc.9 rtfree.9 -MLINKS+=runqueue.9 chooseproc.9 \ +MLINKS+=runqueue.9 choosethread.9 \ runqueue.9 procrunnable.9 \ runqueue.9 remrunqueue.9 \ runqueue.9 setrunqueue.9 Modified: stable/7/share/man/man9/runqueue.9 ============================================================================== --- stable/7/share/man/man9/runqueue.9 Sun Jun 24 17:37:08 2012 (r237538) +++ stable/7/share/man/man9/runqueue.9 Sun Jun 24 18:38:16 2012 (r237539) @@ -23,11 +23,11 @@ .\" .\" $FreeBSD$ .\" -.Dd November 3, 2000 +.Dd August 15, 2010 .Dt RUNQUEUE 9 .Os .Sh NAME -.Nm chooseproc , +.Nm choosethread , .Nm procrunnable , .Nm remrunqueue , .Nm setrunqueue From owner-svn-src-stable-7@FreeBSD.ORG Mon Jun 25 23:40:58 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 898C81065673; Mon, 25 Jun 2012 23:40:58 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6EC178FC19; Mon, 25 Jun 2012 23:40: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 q5PNewgQ002921; Mon, 25 Jun 2012 23:40:58 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5PNewXt002919; Mon, 25 Jun 2012 23:40:58 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201206252340.q5PNewXt002919@svn.freebsd.org> From: Warren Block Date: Mon, 25 Jun 2012 23:40:58 +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: r237586 - stable/7/lib/libc/locale X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2012 23:40:58 -0000 Author: wblock (doc committer) Date: Mon Jun 25 23:40:58 2012 New Revision: 237586 URL: http://svn.freebsd.org/changeset/base/237586 Log: MFC r225808: Fix grammar. PR: 140457 Submitted by: jeremyhu AT apple.com Approved by: gjb (mentor) Modified: stable/7/lib/libc/locale/isspace.3 Directory Properties: stable/7/lib/libc/ (props changed) Modified: stable/7/lib/libc/locale/isspace.3 ============================================================================== --- stable/7/lib/libc/locale/isspace.3 Mon Jun 25 23:40:19 2012 (r237585) +++ stable/7/lib/libc/locale/isspace.3 Mon Jun 25 23:40:58 2012 (r237586) @@ -47,16 +47,16 @@ .Sh DESCRIPTION The .Fn isspace -function tests for the white-space characters. +function tests for white-space characters. For any locale, this includes the following standard characters: .Pp .Bl -column \&`\et''___ \&``\et''___ \&``\et''___ \&``\et''___ \&``\et''___ \&``\et''___ .It "\&``\et''\t``\en''\t``\ev''\t``\ef''\t``\er''\t`` ''" .El .Pp -In the "C" locale +In the "C" locale, .Fn isspace -successful test is limited to this characters only. +returns non-zero for these characters only. The value of the argument must be representable as an .Vt "unsigned char" or the value of From owner-svn-src-stable-7@FreeBSD.ORG Wed Jun 27 00:37:22 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C9A071065672; Wed, 27 Jun 2012 00:37:22 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 99D908FC15; Wed, 27 Jun 2012 00:37: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 q5R0bMRO071415; Wed, 27 Jun 2012 00:37:22 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5R0bMCm071413; Wed, 27 Jun 2012 00:37:22 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201206270037.q5R0bMCm071413@svn.freebsd.org> From: Xin LI Date: Wed, 27 Jun 2012 00:37:22 +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: r237617 - stable/7/bin/rm X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2012 00:37:22 -0000 Author: delphij Date: Wed Jun 27 00:37:22 2012 New Revision: 237617 URL: http://svn.freebsd.org/changeset/base/237617 Log: MFC r237339: Polish previous revision: if the fts_* routines have lstat()'ed the directory entry then use the struct stat from that instead of doing it again, and skip the rm_overwrite() call if fts_read() indicated that the entry couldn't be a regular file. Obtained from: OpenBSD MFC r237284 (kevlo): Fix potential symlink race condition in "rm -P" by adding a check that the file we have opened is the one we expected. Also open in non-blocking mode to avoid a potential hang with FIFOs. Obtained from: NetBSD via OpenBSD Modified: stable/7/bin/rm/rm.c Directory Properties: stable/7/bin/rm/ (props changed) Modified: stable/7/bin/rm/rm.c ============================================================================== --- stable/7/bin/rm/rm.c Wed Jun 27 00:34:06 2012 (r237616) +++ stable/7/bin/rm/rm.c Wed Jun 27 00:37:22 2012 (r237617) @@ -288,10 +288,16 @@ rm_tree(char **argv) if (fflag) continue; /* FALLTHROUGH */ - default: + + case FTS_F: + case FTS_NSOK: if (Pflag) - if (!rm_overwrite(p->fts_accpath, NULL)) + if (!rm_overwrite(p->fts_accpath, p->fts_info == + FTS_NSOK ? NULL : p->fts_statp)) continue; + /* FALLTHROUGH */ + + default: rval = unlink(p->fts_accpath); if (rval == 0 || (fflag && errno == ENOENT)) { if (rval == 0 && vflag) @@ -386,7 +392,7 @@ rm_file(char **argv) int rm_overwrite(char *file, struct stat *sbp) { - struct stat sb; + struct stat sb, sb2; struct statfs fsb; off_t len; int bsize, fd, wlen; @@ -405,8 +411,15 @@ rm_overwrite(char *file, struct stat *sb file, sbp->st_ino); return (0); } - if ((fd = open(file, O_WRONLY, 0)) == -1) + if ((fd = open(file, O_WRONLY|O_NONBLOCK|O_NOFOLLOW, 0)) == -1) + goto err; + if (fstat(fd, &sb2)) goto err; + if (sb2.st_dev != sbp->st_dev || sb2.st_ino != sbp->st_ino || + !S_ISREG(sb2.st_mode)) { + errno = EPERM; + goto err; + } if (fstatfs(fd, &fsb) == -1) goto err; bsize = MAX(fsb.f_iosize, 1024); From owner-svn-src-stable-7@FreeBSD.ORG Wed Jun 27 06:41:11 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7F58410657E6; Wed, 27 Jun 2012 06:41:11 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 699D78FC14; Wed, 27 Jun 2012 06:41:11 +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 q5R6fBGl087639; Wed, 27 Jun 2012 06:41:11 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5R6fBpq087637; Wed, 27 Jun 2012 06:41:11 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201206270641.q5R6fBpq087637@svn.freebsd.org> From: Eitan Adler Date: Wed, 27 Jun 2012 06:41:11 +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: r237633 - stable/7/lib/libc/gen X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2012 06:41:11 -0000 Author: eadler Date: Wed Jun 27 06:41:10 2012 New Revision: 237633 URL: http://svn.freebsd.org/changeset/base/237633 Log: MFC r237286, r237523: Don't close an uninitialized descriptor. PR: bin/167302 Approved by: cperciva (implicit) Modified: stable/7/lib/libc/gen/syslog.c Directory Properties: stable/7/lib/libc/ (props changed) Modified: stable/7/lib/libc/gen/syslog.c ============================================================================== --- stable/7/lib/libc/gen/syslog.c Wed Jun 27 06:40:59 2012 (r237632) +++ stable/7/lib/libc/gen/syslog.c Wed Jun 27 06:41:10 2012 (r237633) @@ -413,8 +413,10 @@ void closelog(void) { THREAD_LOCK(); - (void)_close(LogFile); - LogFile = -1; + if (LogFile != -1) { + (void)_close(LogFile); + LogFile = -1; + } LogTag = NULL; status = NOCONN; THREAD_UNLOCK(); From owner-svn-src-stable-7@FreeBSD.ORG Thu Jun 28 13:12:35 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DD2B106566C; Thu, 28 Jun 2012 13:12:35 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 075948FC1B; Thu, 28 Jun 2012 13:12:35 +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 q5SDCY6W077977; Thu, 28 Jun 2012 13:12:34 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5SDCYS4077975; Thu, 28 Jun 2012 13:12:34 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201206281312.q5SDCYS4077975@svn.freebsd.org> From: Warren Block Date: Thu, 28 Jun 2012 13:12:34 +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: r237710 - stable/7/share/man/man7 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2012 13:12:35 -0000 Author: wblock (doc committer) Date: Thu Jun 28 13:12:34 2012 New Revision: 237710 URL: http://svn.freebsd.org/changeset/base/237710 Log: MFC r237655: Point out that /usr/src, /usr/doc, and /usr/ports may be empty or not exist until populated with csup(1) or svn(1). PR: 169487 Submitted by: Moritz Wilhelmy Modified: stable/7/share/man/man7/build.7 Directory Properties: stable/7/share/man/man7/ (props changed) Modified: stable/7/share/man/man7/build.7 ============================================================================== --- stable/7/share/man/man7/build.7 Thu Jun 28 13:11:34 2012 (r237709) +++ stable/7/share/man/man7/build.7 Thu Jun 28 13:12:34 2012 (r237710) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 29, 2011 +.Dd June 27, 2012 .Dt BUILD 7 .Os .Sh NAME @@ -39,6 +39,10 @@ normally .Pa /usr/doc , and .Pa /usr/ports . +These directories may be initially empty or non-existent until updated with +.Xr csup 1 +or +.Xr svn 1 . Directory .Pa /usr/src contains the @@ -422,7 +426,7 @@ on built objects. .It Va NO_SHARE If set, the build does not descend into the .Pa /usr/src/share -subdirectory (i.e. manpages, locale data files, timezone data files and +subdirectory (i.e., manpages, locale data files, timezone data files and other .Pa /usr/src/share files will not be rebuild from their sources). @@ -494,8 +498,10 @@ make TARGET_ARCH=sparc64 DESTDIR=/client .Ed .Sh SEE ALSO .Xr cc 1 , +.Xr csup 1 , .Xr install 1 , .Xr make 1 , +.Xr svn 1 , .Xr make.conf 5 , .Xr src.conf 5 , .Xr ports 7 , From owner-svn-src-stable-7@FreeBSD.ORG Sat Jun 30 20:24:00 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 534FF106564A; Sat, 30 Jun 2012 20:24:00 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3D7C28FC19; Sat, 30 Jun 2012 20:24: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 q5UKO0h2039806; Sat, 30 Jun 2012 20:24:00 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5UKO0Jc039803; Sat, 30 Jun 2012 20:24:00 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201206302024.q5UKO0Jc039803@svn.freebsd.org> From: Gavin Atkinson Date: Sat, 30 Jun 2012 20:24:00 +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: r237854 - stable/7/sbin/mdconfig X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2012 20:24:00 -0000 Author: gavin Date: Sat Jun 30 20:23:59 2012 New Revision: 237854 URL: http://svn.freebsd.org/changeset/base/237854 Log: Merge r237645 from head: The -S option, to specify the sector size, has been usable on all types of memory disks since r135340. Update the man page to reflect this. Noticed by: avg Modified: stable/7/sbin/mdconfig/mdconfig.8 Directory Properties: stable/7/sbin/mdconfig/ (props changed) Modified: stable/7/sbin/mdconfig/mdconfig.8 ============================================================================== --- stable/7/sbin/mdconfig/mdconfig.8 Sat Jun 30 20:22:20 2012 (r237853) +++ stable/7/sbin/mdconfig/mdconfig.8 Sat Jun 30 20:23:59 2012 (r237854) @@ -41,7 +41,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 11, 2007 +.Dd June 27, 2012 .Dt MDCONFIG 8 .Os .Sh NAME @@ -140,7 +140,7 @@ and .Fl t Ar swap are implied if not specified. .It Fl S Ar sectorsize -Sectorsize to use for malloc backed device. +Sectorsize to use for the memory disk, in bytes. .It Fl x Ar sectors/track See the description of the .Fl y