svn commit: r324236 - head/lib/libc/sys

[Ruslan Ermilov]

Author: ru
Date: Tue Oct  3 11:13:25 2017
New Revision: 324236
URL: https://svnweb.freebsd.org/changeset/base/324236

Log:
  Fixed description of msg_name/msg_namelen in recvmsg().

Modified:
  head/lib/libc/sys/recv.2

Modified: head/lib/libc/sys/recv.2
==
--- head/lib/libc/sys/recv.2Tue Oct  3 11:00:34 2017(r324235)
+++ head/lib/libc/sys/recv.2Tue Oct  3 11:13:25 2017(r324236)
@@ -28,7 +28,7 @@
 .\" @(#)recv.2 8.3 (Berkeley) 2/21/94
 .\" $FreeBSD$
 .\"
-.Dd February 3, 2017
+.Dd October 3, 2017
 .Dt RECV 2
 .Os
 .Sh NAME
@@ -230,7 +230,7 @@ Here
 .Fa msg_name
 and
 .Fa msg_namelen
-specify the destination address if the socket is unconnected;
+specify the source address if the socket is unconnected;
 .Fa msg_name
 may be given as a null pointer if no names are desired or required.
 The
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r280688 - head/share/man/man4

[Ruslan Ermilov]

Author: ru
Date: Thu Mar 26 12:52:21 2015
New Revision: 280688
URL: https://svnweb.freebsd.org/changeset/base/280688

Log:
  Corrected descriptions of net.inet.icmp.icmplim and icmplim_output.
  
  Reviewed by:  pluknet

Modified:
  head/share/man/man4/icmp.4

Modified: head/share/man/man4/icmp.4
==
--- head/share/man/man4/icmp.4  Thu Mar 26 12:17:47 2015(r280687)
+++ head/share/man/man4/icmp.4  Thu Mar 26 12:52:21 2015(r280688)
@@ -28,7 +28,7 @@
 .\" @(#)icmp.4 8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd September 30, 2014
+.Dd March 26, 2015
 .Dt ICMP 4
 .Os
 .Sh NAME
@@ -177,13 +177,11 @@ Defaults to 0.
 .It Va icmplim
 .Pq Vt integer
 Bandwidth limit for ICMP replies in packets/second.
-Used when
-.Va icmplim_output
-is non-zero.
+If set to zero, no limiting will occur.
 Defaults to 200.
 .It Va icmplim_output
 .Pq Vt boolean
-Enable/disable bandwidth limiting of ICMP replies.
+Enable/disable logging of ICMP replies bandwidth limiting.
 Defaults to true.
 .It Va drop_redirect
 .Pq Vt boolean
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r259548 - head/lib/libc/sys

[Ruslan Ermilov]

Author: ru
Date: Wed Dec 18 12:18:17 2013
New Revision: 259548
URL: http://svnweb.freebsd.org/changeset/base/259548

Log:
  shm_open(2): Fixed the history information.
  
  While here, sort xrefs.
  
  Reviewed by:  jhb

Modified:
  head/lib/libc/sys/shm_open.2

Modified: head/lib/libc/sys/shm_open.2
==
--- head/lib/libc/sys/shm_open.2Wed Dec 18 08:53:40 2013
(r259547)
+++ head/lib/libc/sys/shm_open.2Wed Dec 18 12:18:17 2013
(r259548)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 20, 2007
+.Dd December 18, 2013
 .Dt SHM_OPEN 2
 .Os
 .Sh NAME
@@ -253,8 +253,8 @@ requires write permission to the shared 
 .El
 .Sh SEE ALSO
 .Xr close 2 ,
-.Xr ftruncate 2 ,
 .Xr fstat 2 ,
+.Xr ftruncate 2 ,
 .Xr mmap 2 ,
 .Xr munmap 2
 .Sh STANDARDS
@@ -273,7 +273,7 @@ functions first appeared in
 .Fx 4.3 .
 The functions were reimplemented as system calls using shared memory objects
 directly rather than files in
-.Fx 7.0 .
+.Fx 8.0 .
 .Sh AUTHORS
 .An Garrett A. Wollman Aq woll...@freebsd.org
 (C library support and this manual page)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r247534 - head/lib/libutil

[Ruslan Ermilov]

Author: ru
Date: Fri Mar  1 07:39:14 2013
New Revision: 247534
URL: http://svnweb.freebsd.org/changeset/base/247534

Log:
  Fixed documented prototype of kinfo_getproc(3).

Modified:
  head/lib/libutil/kinfo_getproc.3

Modified: head/lib/libutil/kinfo_getproc.3
==
--- head/lib/libutil/kinfo_getproc.3Fri Mar  1 07:01:24 2013
(r247533)
+++ head/lib/libutil/kinfo_getproc.3Fri Mar  1 07:39:14 2013
(r247534)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 25, 2012
+.Dd March 1, 2013
 .Dt KINFO_GETPROC 3
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .In sys/types.h
 .In libutil.h
 .Ft struct kinfo_proc *
-.Fn kinfo_getproc "pid_t pid" "int *cntp"
+.Fn kinfo_getproc "pid_t pid"
 .Sh DESCRIPTION
 This function is used for obtaining process information from the kernel.
 .Pp
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r239640 - head/gnu/usr.bin/groff/tmac

[Ruslan Ermilov]

Author: ru
Date: Fri Aug 24 06:55:16 2012
New Revision: 239640
URL: http://svn.freebsd.org/changeset/base/239640

Log:
  A workaround in r238563 was for makes (notably bmake) without the
  internal knowledge that "cd" is a shell's built-in.  Such makes
  may attempt to exec() "cd" that in turn will fail on systems that
  lack the "cd" executable.
  
  Reworked this by eliminating the root cause.
  
  Submitted by: Simon Gerraty 

Modified:
  head/gnu/usr.bin/groff/tmac/Makefile

Modified: head/gnu/usr.bin/groff/tmac/Makefile
==
--- head/gnu/usr.bin/groff/tmac/MakefileFri Aug 24 05:36:37 2012
(r239639)
+++ head/gnu/usr.bin/groff/tmac/MakefileFri Aug 24 06:55:16 2012
(r239640)
@@ -62,13 +62,12 @@ $f-s: $f
 .endfor
 
 beforeinstall:
-   cd ${DIST_DIR}; \
+   (cd ${DIST_DIR} && \
${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-   ${NORMALFILES} ${DESTDIR}${TMACDIR}
-   cd ${.CURDIR}; \
+   ${NORMALFILES} ${DESTDIR}${TMACDIR})
+   (cd ${.CURDIR} && \
${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-   koi8-r.tmac hyphen.ru ${DESTDIR}${TMACDIR}
-   cd ${.OBJDIR};
+   koi8-r.tmac hyphen.ru ${DESTDIR}${TMACDIR})
 .for f in ${STRIPFILES} ${SPECIALFILES}
${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
$f-s ${DESTDIR}${TMACDIR}/$f
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: contrib/groff/tmac

[Ruslan Ermilov]

On Mon, Dec 26, 2011 at 09:51:53PM +, Ed Schouten wrote:
> Author: ed
> Date: Mon Dec 26 21:51:53 2011
> New Revision: 228904
> URL: http://svn.freebsd.org/changeset/base/228904
> 
> Log:
>   Add libstdthreads.
[...]
> Modified:
>   head/contrib/groff/tmac/doc-syms
>   head/contrib/groff/tmac/groff_mdoc.man

On Thu, Jan 05, 2012 at 09:36:12PM +, Ulrich Spoerlein wrote:
> Author: uqs
> Date: Thu Jan  5 21:36:12 2012
> New Revision: 229651
> URL: http://svn.freebsd.org/changeset/base/229651
> 
> Log:
>   Pull up vendor changes to mdoc(7)
>   
>   This switches us to using -isoC-2011 as the symbol name which is used by
>   groff and mdocml. It follows the change to 4 digit years as done with
>   IEEE Std 1003 post-1999.
>   
>   MFC after:  2 weeks (groff changes only)
> 
> Modified:
>   head/contrib/groff/tmac/doc-syms
>   head/contrib/groff/tmac/groff_mdoc.man
>   head/lib/libstdthreads/thrd_create.3
[...]

Please don't directly commit to "mdoc" in contrib/groff/.  mdoc is still
distributed under the BSD license, here's the quote from groff/LICENSES:

:   . The -mdoc macro set, using the BSD license.
: 
:   tmac/doc.tmac
:   tmac/doc-old.tmac
:   tmac/doc-common
:   tmac/doc-ditroff
:   tmac/doc-nroff
:   tmac/doc-syms
:   tmac/groff_mdoc.man

Vendor changes to mdoc should first be committed to vendor/groff/dist/
and then merged from there.

Local changes should be made to gnu/usr.bin/groff/tmac/mdoc.local and may
also be submitted upstream at your discretion.


Cheers,
-- 
Ruslan Ermilov
r...@freebsd.org
FreeBSD committer
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r238800 - head/contrib/groff/tmac

[Ruslan Ermilov]

Author: ru
Date: Thu Jul 26 11:12:38 2012
New Revision: 238800
URL: http://svn.freebsd.org/changeset/base/238800

Log:
  Pull up vendor changes to mdoc(7).

Modified:
  head/contrib/groff/tmac/doc-syms
  head/contrib/groff/tmac/doc.tmac
Directory Properties:
  head/contrib/groff/   (props changed)

Modified: head/contrib/groff/tmac/doc-syms
==
--- head/contrib/groff/tmac/doc-symsThu Jul 26 11:10:25 2012
(r238799)
+++ head/contrib/groff/tmac/doc-symsThu Jul 26 11:12:38 2012
(r238800)
@@ -661,7 +661,7 @@
 .as doc-str-St--susv3  " 
(\*[Lq]\*[doc-Tn-font-size]SUSv3\*[doc-str-St]\*[Rq])
 .ds doc-str-St--svid4  System\~V Interface Definition, Fourth Edition
 .as doc-str-St--svid4  " 
(\*[Lq]\*[doc-Tn-font-size]SVID\*[doc-str-St]\^4\*[Rq])
-.ds doc-str-St--xbd5   \*[doc-Tn-font-size]X/Open\*[doc-str-St] System 
Interface Definitions Issue\~5
+.ds doc-str-St--xbd5   \*[doc-Tn-font-size]X/Open\*[doc-str-St] Base 
Definitions Issue\~5
 .as doc-str-St--xbd5   " 
(\*[Lq]\*[doc-Tn-font-size]XBD\*[doc-str-St]\^5\*[Rq])
 .ds doc-str-St--xcu5   \*[doc-Tn-font-size]X/Open\*[doc-str-St] 
Commands and Utilities Issue\~5
 .as doc-str-St--xcu5   " 
(\*[Lq]\*[doc-Tn-font-size]XCU\*[doc-str-St]\^5\*[Rq])

Modified: head/contrib/groff/tmac/doc.tmac
==
--- head/contrib/groff/tmac/doc.tmacThu Jul 26 11:10:25 2012
(r238799)
+++ head/contrib/groff/tmac/doc.tmacThu Jul 26 11:12:38 2012
(r238800)
@@ -438,7 +438,7 @@
 .  \" last argument
 .  if (\n[doc-reg-dfr1] == 4) \
 .nop \|\-\c
-.  nop \f[]\s[0]\c
+.  nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
 .  doc-print-and-reset
 .\}
 .el \{\
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r238799 - in head: contrib/groff/tmac gnu/usr.bin/groff/tmac

[Ruslan Ermilov]

Author: ru
Date: Thu Jul 26 11:10:25 2012
New Revision: 238799
URL: http://svn.freebsd.org/changeset/base/238799

Log:
  Backed out r228904, and added libstdthreads support to mdoc(7) to where
  it belongs.

Modified:
  head/contrib/groff/tmac/doc-syms
  head/contrib/groff/tmac/groff_mdoc.man
  head/gnu/usr.bin/groff/tmac/mdoc.local

Modified: head/contrib/groff/tmac/doc-syms
==
--- head/contrib/groff/tmac/doc-symsThu Jul 26 10:58:30 2012
(r238798)
+++ head/contrib/groff/tmac/doc-symsThu Jul 26 11:10:25 2012
(r238799)
@@ -814,7 +814,6 @@
 .ds doc-str-Lb-librt   \*[Px] \*[doc-str-Lb]Real-time Library (librt, 
\-lrt)
 .ds doc-str-Lb-libsdp  Bluetooth Service Discovery Protocol User Library 
(libsdp, \-lsdp)
 .ds doc-str-Lb-libssp  Buffer Overflow Protection Library (libssp, \-lssp)
-.ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
 .ds doc-str-Lb-libSystem   System Library (libSystem, \-lSystem)
 .ds doc-str-Lb-libtermcap  Termcap Access Library (libtermcap, \-ltermcap)
 .ds doc-str-Lb-libterminfo Terminal Information Library (libterminfo, 
\-lterminfo)

Modified: head/contrib/groff/tmac/groff_mdoc.man
==
--- head/contrib/groff/tmac/groff_mdoc.man  Thu Jul 26 10:58:30 2012
(r238798)
+++ head/contrib/groff/tmac/groff_mdoc.man  Thu Jul 26 11:10:25 2012
(r238799)
@@ -1797,8 +1797,6 @@ and their results are:
 .Lb libsdp
 .It Li libssp
 .Lb libssp
-.It Li libstdthreads
-.Lb libstdthreads
 .It Li libSystem
 .Lb libSystem
 .It Li libtermcap

Modified: head/gnu/usr.bin/groff/tmac/mdoc.local
==
--- head/gnu/usr.bin/groff/tmac/mdoc.local  Thu Jul 26 10:58:30 2012
(r238798)
+++ head/gnu/usr.bin/groff/tmac/mdoc.local  Thu Jul 26 11:10:25 2012
(r238799)
@@ -42,6 +42,7 @@
 .ds doc-str-Lb-libproc Processor Monitoring and Analysis Library (libproc, 
\-lproc)
 .ds doc-str-Lb-libprocstat Process and Files Information Retrieval 
(libprocstat, \-lprocstat)
 .ds doc-str-Lb-librtld_db  Run-time Linker Debugging Library (librtld_db, 
\-lrtld_db)
+.ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
 .
 .\" Default .Os value
 .ds doc-default-operating-system FreeBSD\~10.0
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r236255 - head/contrib/groff/tmac

[Ruslan Ermilov]

On Wed, May 30, 2012 at 08:07:38PM -0700, David O'Brien wrote:
> On Wed, May 30, 2012 at 07:34:33AM +0400, Sergey Kandaurov wrote:
> > On 29 May 2012 23:49, David E. O'Brien  wrote:
> ...
> > > Modified: head/contrib/groff/tmac/doc-common
> ...
> > > +.ds doc-operating-system-FreeBSD-8.3 � � 8.3
> > > +.ds doc-operating-system-FreeBSD-9.1 � � 9.1
> > > +.ds doc-operating-system-FreeBSD-10.0 � �10.0
> > This should be imported from savannah.gnu.org repository,
> > and not changed directly.
> 
> Unfortunately we cannot do that per r217595:
> 
>   This is a direct commit to contrib/ as we will no longer import
>   any newer groff snapshots, due to licensing issues.
> 
> > For local changes not found in the (latest) contrib doc-common
> > you should use gnu/usr.bin/groff/tmac/mdoc.local
> 
> I followed r217595, was that commit the wrong approach?

Wrong.  mdoc is still distributed under the BSD license, and changes
to it should be cherry picked and merged via vendor/groff/dist/.

"8.3" and "10.0" that you added were already present in mdoc.local.

I've cleaned up this mess now while I was pulling up latest changes
to mdoc.

And BTW, I still recommend a pre-commit review for groff, as hinted
in src/MAINTAINERS.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r238798 - in head: contrib/groff/tmac gnu/usr.bin/groff/tmac

[Ruslan Ermilov]

Author: ru
Date: Thu Jul 26 10:58:30 2012
New Revision: 238798
URL: http://svn.freebsd.org/changeset/base/238798

Log:
  Backed out r236255, and added FreeBSD 9.1 support to mdoc(7) to where
  it belongs.

Modified:
  head/contrib/groff/tmac/doc-common
  head/gnu/usr.bin/groff/tmac/mdoc.local

Modified: head/contrib/groff/tmac/doc-common
==
--- head/contrib/groff/tmac/doc-common  Thu Jul 26 10:47:26 2012
(r238797)
+++ head/contrib/groff/tmac/doc-common  Thu Jul 26 10:58:30 2012
(r238798)
@@ -574,10 +574,7 @@
 .ds doc-operating-system-FreeBSD-8.0 8.0
 .ds doc-operating-system-FreeBSD-8.1 8.1
 .ds doc-operating-system-FreeBSD-8.2 8.2
-.ds doc-operating-system-FreeBSD-8.3 8.3
 .ds doc-operating-system-FreeBSD-9.0 9.0
-.ds doc-operating-system-FreeBSD-9.1 9.1
-.ds doc-operating-system-FreeBSD-10.010.0
 .
 .ds doc-operating-system-Darwin-8.0.0  8.0.0
 .ds doc-operating-system-Darwin-8.1.0  8.1.0

Modified: head/gnu/usr.bin/groff/tmac/mdoc.local
==
--- head/gnu/usr.bin/groff/tmac/mdoc.local  Thu Jul 26 10:47:26 2012
(r238797)
+++ head/gnu/usr.bin/groff/tmac/mdoc.local  Thu Jul 26 10:58:30 2012
(r238798)
@@ -49,6 +49,7 @@
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-7.47.4
 .ds doc-operating-system-FreeBSD-8.38.3
+.ds doc-operating-system-FreeBSD-9.19.1
 .ds doc-operating-system-FreeBSD-10.0   10.0
 .
 .\" Definitions not (yet) in doc-syms
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r238563 - head/gnu/usr.bin/groff/tmac

[Ruslan Ermilov]

On Wed, Jul 18, 2012 at 05:57:43AM +, David E. O'Brien wrote:
> Author: obrien
> Date: Wed Jul 18 05:57:42 2012
> New Revision: 238563
> URL: http://svn.freebsd.org/changeset/base/238563
> 
> Log:
>   a ";" tells make we want the shell to be used
>   
>   Submitted by:   Simon Gerraty 
> 
> Modified:
>   head/gnu/usr.bin/groff/tmac/Makefile

I don't quite understand what this change does, could you elaborate?

Without -jN (in backwards compatibility mode), the "cd" is a no-op
(whether it's terminated by `;' or not) because make will execute a
single shell per command, with cwd set to ${.OBJDIR}.

With -jN, "cd" becomes necessary because all commands are executed as
a script by one shell (the reason it was added in the first place),
but adding `;' is a no-op because commands are on separate lines.

> Modified: head/gnu/usr.bin/groff/tmac/Makefile
> ==
> --- head/gnu/usr.bin/groff/tmac/Makefile  Wed Jul 18 05:50:40 2012
> (r238562)
> +++ head/gnu/usr.bin/groff/tmac/Makefile  Wed Jul 18 05:57:42 2012
> (r238563)
> @@ -68,7 +68,7 @@ beforeinstall:
>   cd ${.CURDIR}; \
>   ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
>   koi8-r.tmac hyphen.ru ${DESTDIR}${TMACDIR}
> - cd ${.OBJDIR}
> + cd ${.OBJDIR};
>  .for f in ${STRIPFILES} ${SPECIALFILES}
>   ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
>   $f-s ${DESTDIR}${TMACDIR}/$f
> 

-- 
Ruslan Ermilov
r...@freebsd.org
FreeBSD committer
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r237132 - head/share/man/man4

[Ruslan Ermilov]

Author: ru
Date: Fri Jun 15 09:12:47 2012
New Revision: 237132
URL: http://svn.freebsd.org/changeset/base/237132

Log:
  Fixed an example that set IP_ONESBCAST socket option to actually work,
  and not return EINVAL.

Modified:
  head/share/man/man4/ip.4

Modified: head/share/man/man4/ip.4
==
--- head/share/man/man4/ip.4Fri Jun 15 08:50:44 2012(r237131)
+++ head/share/man/man4/ip.4Fri Jun 15 09:12:47 2012(r237132)
@@ -32,7 +32,7 @@
 .\" @(#)ip.4   8.2 (Berkeley) 11/30/93
 .\" $FreeBSD$
 .\"
-.Dd June 12, 2012
+.Dd June 15, 2012
 .Dt IP 4
 .Os
 .Sh NAME
@@ -227,7 +227,7 @@ configured with the broadcast address 19
 .Bd -literal
 char msg[512];
 struct sockaddr_in sin;
-u_char onesbcast = 1;  /* 0 = disable (default), 1 = enable */
+int onesbcast = 1; /* 0 = disable (default), 1 = enable */
 
 setsockopt(s, IPPROTO_IP, IP_ONESBCAST, &onesbcast, sizeof(onesbcast));
 sin.sin_addr.s_addr = inet_addr("192.168.2.255");
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r234697 - head

[Ruslan Ermilov]

Author: ru
Date: Thu Apr 26 09:07:32 2012
New Revision: 234697
URL: http://svn.freebsd.org/changeset/base/234697

Log:
  Fixed a misspelling of OLD_LIBS in r232671 by pluknet@.
  (The patch in the PR 165523 had this spelled correctly.)

Modified:
  head/ObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc  Thu Apr 26 08:37:51 2012(r234696)
+++ head/ObsoleteFiles.inc  Thu Apr 26 09:07:32 2012(r234697)
@@ -459,7 +459,7 @@ OLD_FILES+=usr/share/man/man5/lastlog.5.
 OLD_FILES+=usr/share/man/man5/utmp.5.gz
 OLD_FILES+=usr/share/man/man5/wtmp.5.gz
 OLD_LIBS+=lib/libutil.so.8
-OLB_LIBS+=usr/lib32/libutil.so.8
+OLD_LIBS+=usr/lib32/libutil.so.8
 # 20100105: new userland semaphore implementation
 OLD_FILES+=usr/include/sys/semaphore.h
 # 20100103: ntptrace(8) removed
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r232393 - head/lib/libc/gen

[Ruslan Ermilov]

Author: ru
Date: Fri Mar  2 14:05:50 2012
New Revision: 232393
URL: http://svn.freebsd.org/changeset/base/232393

Log:
  Removed excessive _seekdir() call in closedir().  This saves one lseek()
  syscall.  Before r5958, seekdir() was called for its side effect of
  freeing memory allocated by opendir() for rewinddir(), but that revision
  added _reclaim_telldir() that frees all memory allocated by telldir()
  calls, making this call redundant.
  
  This introduces a slight change.  If an application duplicated the descriptor
  obtained through dirfd(), it can no longer rely on file position to be
  reset to the start of file after a call to closedir().  It's believed to
  be safe because neither POSIX, nor any other OS I've tested (NetBSD, Linux,
  OS X) rewind the file offset pointer on closedir().
  
  Reported by:  Igor Sysoev

Modified:
  head/lib/libc/gen/closedir.c

Modified: head/lib/libc/gen/closedir.c
==
--- head/lib/libc/gen/closedir.cFri Mar  2 13:19:56 2012
(r232392)
+++ head/lib/libc/gen/closedir.cFri Mar  2 14:05:50 2012
(r232393)
@@ -48,14 +48,12 @@ __FBSDID("$FreeBSD$");
  * close a directory.
  */
 int
-closedir(dirp)
-   DIR *dirp;
+closedir(DIR *dirp)
 {
int fd;
 
if (__isthreaded)
_pthread_mutex_lock(&dirp->dd_lock);
-   _seekdir(dirp, dirp->dd_rewind);/* free seekdir storage */
fd = dirp->dd_fd;
dirp->dd_fd = -1;
dirp->dd_loc = 0;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r232385 - head/lib/libc/gen

[Ruslan Ermilov]

Author: ru
Date: Fri Mar  2 10:03:38 2012
New Revision: 232385
URL: http://svn.freebsd.org/changeset/base/232385

Log:
  Finally removed the stat() and fstat() calls from the opendir() code.
  They were made excessive in r205424 by opening with O_DIRECTORY.
  Also eliminated the fcntl() call used to set FD_CLOEXEC by opening
  with O_CLOEXEC.
  
  (fdopendir() still checks that the passed descriptor is a directory,
  and sets FD_CLOEXEC on it.)
  
  Reviewed by:  ed

Modified:
  head/lib/libc/gen/opendir.c

Modified: head/lib/libc/gen/opendir.c
==
--- head/lib/libc/gen/opendir.c Fri Mar  2 09:52:42 2012(r232384)
+++ head/lib/libc/gen/opendir.c Fri Mar  2 10:03:38 2012(r232385)
@@ -66,7 +66,17 @@ opendir(const char *name)
 DIR *
 fdopendir(int fd)
 {
+   struct stat statb;
 
+   /* Check that fd is associated with a directory. */
+   if (_fstat(fd, &statb) != 0)
+   return (NULL);
+   if (!S_ISDIR(statb.st_mode)) {
+   errno = ENOTDIR;
+   return (NULL);
+   }
+   if (_fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
+   return (NULL);
return (__opendir_common(fd, NULL, DTF_HIDEW|DTF_NODUP));
 }
 
@@ -74,21 +84,11 @@ DIR *
 __opendir2(const char *name, int flags)
 {
int fd;
-   struct stat statb;
DIR *dir;
int saved_errno;
 
-   /*
-* stat() before _open() because opening of special files may be
-* harmful.
-*/
-   if (stat(name, &statb) != 0)
-   return (NULL);
-   if (!S_ISDIR(statb.st_mode)) {
-   errno = ENOTDIR;
-   return (NULL);
-   }
-   if ((fd = _open(name, O_RDONLY | O_NONBLOCK | O_DIRECTORY)) == -1)
+   if ((fd = _open(name,
+   O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC)) == -1)
return (NULL);
 
dir = __opendir_common(fd, name, flags);
@@ -119,19 +119,9 @@ __opendir_common(int fd, const char *nam
int saved_errno;
int unionstack;
int fd2;
-   struct stat statb;
 
-   dirp = NULL;
-   /* _fstat() the open handler because the file may have changed.  */
-   if (_fstat(fd, &statb) != 0)
-   goto fail;
-   if (!S_ISDIR(statb.st_mode)) {
-   errno = ENOTDIR;
-   goto fail;
-   }
-   if (_fcntl(fd, F_SETFD, FD_CLOEXEC) == -1 ||
-   (dirp = malloc(sizeof(DIR) + sizeof(struct _telldir))) == NULL)
-   goto fail;
+   if ((dirp = malloc(sizeof(DIR) + sizeof(struct _telldir))) == NULL)
+   return (NULL);
 
dirp->dd_td = (struct _telldir *)((char *)dirp + sizeof(DIR));
LIST_INIT(&dirp->dd_td->td_locq);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r228620 - head/share/man/man9

[Ruslan Ermilov]

Author: ru
Date: Sat Dec 17 06:57:35 2011
New Revision: 228620
URL: http://svn.freebsd.org/changeset/base/228620

Log:
  Fixed some of markup.
  
  Reviewed by:  jhb

Modified:
  head/share/man/man9/shm_map.9

Modified: head/share/man/man9/shm_map.9
==
--- head/share/man/man9/shm_map.9   Sat Dec 17 02:23:30 2011
(r228619)
+++ head/share/man/man9/shm_map.9   Sat Dec 17 06:57:35 2011
(r228620)
@@ -30,9 +30,8 @@
 .Dt SHM_MAP 9
 .Os
 .Sh NAME
-.Nm shm_map ,
-.Nm shm_unmap
-.Nd map shared memory objects into the kernel's address space
+.Nm shm_map , shm_unmap
+.Nd "map shared memory objects into the kernel's address space"
 .Sh SYNOPSIS
 .In sys/types.h
 .In sys/mman.h
@@ -42,9 +41,9 @@
 .Fn shm_unmap "struct file *fp" "void *mem" "size_t size"
 .Sh DESCRIPTION
 The
-.Nm shm_map
+.Fn shm_map
 and
-.Nm shm_unmap
+.Fn shm_unmap
 functions provide an API for mapping shared memory objects into the kernel.
 Shared memory objects are created by
 .Xr shm_open 2 .
@@ -57,13 +56,13 @@ Shared memory objects can still be grown
 .Pp
 To simplify the accounting needed to enforce the above requirement,
 callers of this API are required to unmap the entire region mapped by
-.Nm shm_map
+.Fn shm_map
 when calling
-.Nm shm_unmap .
+.Fn shm_unmap .
 Unmapping only a portion of the region is not permitted.
 .Pp
 The
-.Nm shm_map
+.Fn shm_map
 function locates the shared memory object associated with the open file
 .Fa fp .
 It maps the region of that object described by
@@ -77,9 +76,9 @@ will be set to the start of the mapping.
 All pages for the range will be wired into memory upon successful return.
 .Pp
 The
-.Nm shm_unmap
+.Fn shm_unmap
 function unmaps a region previously mapped by
-.Nm shm_map .
+.Fn shm_map .
 The
 .Fa mem
 argument should match the value previously returned in
@@ -87,22 +86,22 @@ argument should match the value previous
 and the
 .Fa size
 argument should match the value passed to
-.Nm shm_map .
+.Fn shm_map .
 .Pp
 Note that
-.Nm shm_map
+.Fn shm_map
 will not hold an extra reference on the open file
 .Fa fp
 for the lifetime of the mapping.
 Instead,
 the calling code is required to do this if it wishes to use
-.Nm shm_unmap
+.Fn shm_unmap
 on the region in the future.
 .Sh RETURN VALUES
 The
-.Nm shm_map
+.Fn shm_map
 and
-.Nm shm_unmap
+.Fn shm_unmap
 functions return zero on success or an error on failure.
 .Sh EXAMPLES
 The following function accepts a file descriptor for a shared memory
@@ -110,7 +109,7 @@ object.
 It maps the first sixteen kilobytes of the object into the kernel,
 performs some work on that address,
 and then unmaps the address before returning.
-.Bd -literal
+.Bd -literal -offset indent
 int
 shm_example(int fd)
 {
@@ -118,7 +117,7 @@ shm_example(int fd)
void *mem;
int error;
 
-   error = fget(curthread, fd, CAP_MMAP, &fp)
+   error = fget(curthread, fd, CAP_MMAP, &fp);
if (error)
return (error);
error = shm_map(fp, 16384, 0, &mem);
@@ -136,7 +135,7 @@ shm_example(int fd)
 .Ed
 .Sh ERRORS
 The
-.Nm shm_map
+.Fn shm_map
 function returns the following errors on failure:
 .Bl -tag -width Er
 .It Bq Er EINVAL
@@ -158,7 +157,7 @@ The shared memory object could not be ma
 .El
 .Pp
 The
-.Nm shm_unmap
+.Fn shm_unmap
 function returns the following errors on failure:
 .Bl -tag -width Er
 .It Bq Er EINVAL
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r228492 - head/lib/libc/gen

[Ruslan Ermilov]

Author: ru
Date: Wed Dec 14 08:35:08 2011
New Revision: 228492
URL: http://svn.freebsd.org/changeset/base/228492

Log:
  Clean up includes; the prototype for getosreldate() has moved to
   in r183390.

Modified:
  head/lib/libc/gen/getosreldate.c

Modified: head/lib/libc/gen/getosreldate.c
==
--- head/lib/libc/gen/getosreldate.cWed Dec 14 05:34:23 2011
(r228491)
+++ head/lib/libc/gen/getosreldate.cWed Dec 14 08:35:08 2011
(r228492)
@@ -33,12 +33,11 @@ static char sccsid[] = "@(#)gethostid.c 
 #include 
 __FBSDID("$FreeBSD$");
 
-#include 
+#include 
 #include 
-#include 
-#include 
 
-#include 
+#include 
+#include 
 
 int
 getosreldate(void)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r228457 - head/share/man/man5

[Ruslan Ermilov]

Author: ru
Date: Tue Dec 13 08:23:03 2011
New Revision: 228457
URL: http://svn.freebsd.org/changeset/base/228457

Log:
  The "inet" keyword in the "ifconfig_IF_aliasN" is mandatory for
  IPv4 aliases to work since network.subr@197139.
  
  MFC after:3 days

Modified:
  head/share/man/man5/rc.conf.5

Modified: head/share/man/man5/rc.conf.5
==
--- head/share/man/man5/rc.conf.5   Tue Dec 13 07:13:48 2011
(r228456)
+++ head/share/man/man5/rc.conf.5   Tue Dec 13 08:23:03 2011
(r228457)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 23, 2011
+.Dd December 13, 2011
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -1101,7 +1101,9 @@ ipv4_addrs_ed0="192.0.2.129/27 192.0.2.1
 .Pp
 It is also possible to add IP alias entries using
 .Xr ifconfig 8
-syntax.
+syntax with the
+.Dq Li inet
+keyword.
 Assuming that the interface in question was
 .Li ed0 ,
 it might look
@@ -1114,7 +1116,9 @@ ifconfig_ed0_alias1="inet 127.0.0.254 ne
 And so on.
 For each
 .Va ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n
-entry that is found,
+entry with the
+.Dq Li inet
+keyword that is found,
 its contents are passed to
 .Xr ifconfig 8 .
 Execution stops at the first unsuccessful access, so if
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r228351 - in head: contrib/groff/tmac gnu/usr.bin/groff/tmac

[Ruslan Ermilov]

Author: ru
Date: Thu Dec  8 13:54:06 2011
New Revision: 228351
URL: http://svn.freebsd.org/changeset/base/228351

Log:
  Pull up vendor changes to mdoc(7).

Modified:
  head/contrib/groff/tmac/doc-common
  head/contrib/groff/tmac/doc-syms
  head/contrib/groff/tmac/doc.tmac
  head/contrib/groff/tmac/groff_mdoc.man
  head/gnu/usr.bin/groff/tmac/mdoc.local
Directory Properties:
  head/contrib/groff/   (props changed)

Modified: head/contrib/groff/tmac/doc-common
==
--- head/contrib/groff/tmac/doc-common  Thu Dec  8 13:45:32 2011
(r228350)
+++ head/contrib/groff/tmac/doc-common  Thu Dec  8 13:54:06 2011
(r228351)
@@ -264,50 +264,72 @@
 .ds doc-volume-as-algoralgor
 .ds doc-volume-as-amd64amd64
 .ds doc-volume-as-amigaamiga
+.ds doc-volume-as-amigappc amigappc
 .ds doc-volume-as-arc  arc
+.ds doc-volume-as-arm  arm
 .ds doc-volume-as-arm26arm26
 .ds doc-volume-as-arm32arm32
+.ds doc-volume-as-armish   armish
 .ds doc-volume-as-atariatari
+.ds doc-volume-as-aviion   aviion
+.ds doc-volume-as-beagle   beagle
 .ds doc-volume-as-beboxbebox
 .ds doc-volume-as-cats cats
 .ds doc-volume-as-cesfic   cesfic
 .ds doc-volume-as-cobalt   cobalt
 .ds doc-volume-as-dreamcastdreamcast
+.ds doc-volume-as-emipsemips
 .ds doc-volume-as-evbarm   evbarm
 .ds doc-volume-as-evbmips  evbmips
 .ds doc-volume-as-evbppc   evbppc
 .ds doc-volume-as-evbsh3   evbsh3
+.ds doc-volume-as-ews4800mips  ews4800mips
 .ds doc-volume-as-hp300hp300
 .ds doc-volume-as-hp700hp700
 .ds doc-volume-as-hpcarm   hpcarm
 .ds doc-volume-as-hpcmips  hpcmips
 .ds doc-volume-as-hpcshhpcsh
+.ds doc-volume-as-hppa hppa
+.ds doc-volume-as-hppa64   hppa64
 .ds doc-volume-as-i386 i386
+.ds doc-volume-as-ia64 ia64
+.ds doc-volume-as-ibmnws   ibmnws
+.ds doc-volume-as-iyonix   iyonix
+.ds doc-volume-as-landisk  landisk
+.ds doc-volume-as-loongson loongson
 .ds doc-volume-as-luna68k  luna68k
+.ds doc-volume-as-luna88k  luna88k
 .ds doc-volume-as-m68k m68k
 .ds doc-volume-as-mac68k   mac68k
 .ds doc-volume-as-macppc   macppc
 .ds doc-volume-as-mips mips
+.ds doc-volume-as-mips64   mips64
 .ds doc-volume-as-mipsco   mipsco
 .ds doc-volume-as-mmeyemmeye
 .ds doc-volume-as-mvme68k  mvme68k
+.ds doc-volume-as-mvme88k  mvme88k
 .ds doc-volume-as-mvmeppc  mvmeppc
 .ds doc-volume-as-netwindernetwinder
 .ds doc-volume-as-news68k  news68k
 .ds doc-volume-as-newsmips newsmips
 .ds doc-volume-as-next68k  next68k
 .ds doc-volume-as-ofppcofppc
+.ds doc-volume-as-palm palm
 .ds doc-volume-as-pc532pc532
 .ds doc-volume-as-playstation2 playstation2
 .ds doc-volume-as-pmax pmax
 .ds doc-volume-as-pmppcpmppc
 .ds doc-volume-as-powerpc  powerpc
 .ds doc-volume-as-prep prep
+.ds doc-volume-as-rs6000   rs6000
 .ds doc-volume-as-sandpointsandpoint
 .ds doc-volume-as-sbmips   sbmips
+.ds doc-volume-as-sgi  sgi
 .ds doc-volume-as-sgimips  sgimips
 .ds doc-volume-as-sh3  sh3
 .ds doc-volume-as-sharkshark
+.ds doc-volume-as-socppc   socppc
+.ds doc-volume-as-solbournesolbourne
 .ds doc-volume-as-sparcsparc
 .ds doc-volume-as-sparc64  sparc64
 .ds doc-volume-as-sun2 sun2
@@ -316,6 +338,8 @@
 .ds doc-volume-as-vax  vax
 .ds doc-volume-as-x68k x68k
 .ds doc-volume-as-x86_64   x86_64
+.ds doc-volume-as-xen  xen
+.ds doc-volume-as-zaurus   zaurus
 .
 .de Dt
 .  \" reset default arguments
@@ -451,12 +475,16 @@
 .ds doc-operating-system-NetBSD-3.0   3.0
 .ds doc-operating-system-NetBSD-3.0.1 3.0.1
 .ds doc-operating-system-NetBSD-3.0.2 3.0.2
+.ds doc-operating-system-NetBSD-3.0.3 3.0.3
 .ds doc-operating-system-NetBSD-3.1   3.1
+.ds doc-operating-system-NetBSD-3.1.1 3.1.1
 .ds doc-operating-system-NetBSD-4.0   4.0
 .ds doc-operating-system-NetBSD-4.0.1 4.0.1
 .ds doc-operating-system-NetBSD-5.0   5.0
 .ds doc-operating-system-NetBSD-5.0.1 5.0.1
 .ds doc-operating-system-NetBSD-5.0.2 5.0.2
+.ds doc-operating-system-NetBSD-5.1   5.1
+.ds doc-operating-system-NetBSD-6.0   6.0
 .
 .ds doc-operating-system-OpenBSD-2.0  2.0
 .ds doc-operating-system-OpenBSD-2.1  2.1
@@ -487,6 +515,8 @@
 .ds doc-operating-system-OpenBSD-4.6  4.6
 .ds doc-operating-system-OpenBSD-4.7  4.7
 .ds doc-operating-system-OpenBSD-4.8  4.8
+.ds doc-operating-system-OpenBSD-4.9  4.9
+.ds doc-operating-system-OpenBSD-5.0  5.0
 .
 .ds doc-operating-system-FreeBSD-1.0 1.0
 .ds doc-operating-system-FreeBSD-1.1 1.1
@@ -544,6 +574,7 @@
 .ds doc-operating-system-FreeBSD-8.0 8.0
 .ds doc-operating-system-FreeBSD-8.1 8.1
 .ds doc-operating-system-FreeBSD-8.2 8.2
+.ds doc-operating-system-FreeBSD-9.0 9.0

svn commit: r228318 - head/lib/libc/sys

[Ruslan Ermilov]

Author: ru
Date: Wed Dec  7 11:06:18 2011
New Revision: 228318
URL: http://svn.freebsd.org/changeset/base/228318

Log:
  The NOTE_COPY should have been named NOTE_FFCOPY from the very
  beginning.
  
  Submitted by: Igor Sysoev

Modified:
  head/lib/libc/sys/kqueue.2

Modified: head/lib/libc/sys/kqueue.2
==
--- head/lib/libc/sys/kqueue.2  Wed Dec  7 07:03:14 2011(r228317)
+++ head/lib/libc/sys/kqueue.2  Wed Dec  7 11:06:18 2011(r228318)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 15, 2009
+.Dd December 7, 2011
 .Dt KQUEUE 2
 .Os
 .Sh NAME
@@ -459,7 +459,7 @@ Bitwise AND
 .It Dv NOTE_FFOR
 Bitwise OR
 .Va fflags .
-.It Dv NOTE_COPY
+.It Dv NOTE_FFCOPY
 Copy
 .Va fflags .
 .It Dv NOTE_FFCTRLMASK
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r224776 - in head: . contrib/one-true-awk

[Ruslan Ermilov]

Author: ru
Date: Thu Aug 11 10:29:10 2011
New Revision: 224776
URL: http://svn.freebsd.org/changeset/base/224776

Log:
  - Merged awk upstream that includes a fix for a bug exposed by kmod_syms.mk.
  - Provide a build aid for those who already have a buggy awk(1) installed.
  
  Approved by:  re (kib)

Modified:
  head/Makefile.inc1
  head/contrib/one-true-awk/FIXES
  head/contrib/one-true-awk/lib.c
  head/contrib/one-true-awk/main.c
Directory Properties:
  head/contrib/one-true-awk/   (props changed)

Modified: head/Makefile.inc1
==
--- head/Makefile.inc1  Thu Aug 11 10:24:09 2011(r224775)
+++ head/Makefile.inc1  Thu Aug 11 10:29:10 2011(r224776)
@@ -1014,6 +1014,10 @@ _lex=usr.bin/lex
 _yacc= usr.bin/yacc
 .endif
 
+.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
+_awk=  usr.bin/awk
+.endif
+
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=  usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -1052,6 +1056,7 @@ bootstrap-tools:
 ${_groff} \
 ${_ar} \
 ${_dtc} \
+${_awk} \
 usr.bin/lorder \
 usr.bin/makewhatis \
 ${_mklocale} \

Modified: head/contrib/one-true-awk/FIXES
==
--- head/contrib/one-true-awk/FIXES Thu Aug 11 10:24:09 2011
(r224775)
+++ head/contrib/one-true-awk/FIXES Thu Aug 11 10:29:10 2011
(r224776)
@@ -25,6 +25,10 @@ THIS SOFTWARE.
 This file lists all bug fixes, changes, etc., made since the AWK book
 was sent to the printers in August, 1987.
 
+Aug 10, 2011:
+   another fix to avoid core dump with delete(ARGV); again, many thanks
+   to ruslan ermilov.
+
 Aug 7, 2011:
split(s, a, //) now behaves the same as split(s, a, "")
 

Modified: head/contrib/one-true-awk/lib.c
==
--- head/contrib/one-true-awk/lib.c Thu Aug 11 10:24:09 2011
(r224775)
+++ head/contrib/one-true-awk/lib.c Thu Aug 11 10:29:10 2011
(r224776)
@@ -89,8 +89,13 @@ void initgetrec(void)
char *p;
 
for (i = 1; i < *ARGC; i++) {
-   if (!isclvar(p = getargv(i))) { /* find 1st real filename */
-   setsval(lookup("FILENAME", symtab), getargv(i));
+   p = getargv(i); /* find 1st real filename */
+   if (p == NULL || *p == '\0') {  /* deleted or zapped */
+   argno++;
+   continue;
+   }
+   if (!isclvar(p)) {
+   setsval(lookup("FILENAME", symtab), p);
return;
}
setclvar(p);/* a commandline assignment before filename */

Modified: head/contrib/one-true-awk/main.c
==
--- head/contrib/one-true-awk/main.cThu Aug 11 10:24:09 2011
(r224775)
+++ head/contrib/one-true-awk/main.cThu Aug 11 10:29:10 2011
(r224776)
@@ -25,7 +25,7 @@ THIS SOFTWARE.
 #include 
 __FBSDID("$FreeBSD$");
 
-const char *version = "version 20110807 (FreeBSD)";
+const char *version = "version 20110810 (FreeBSD)";
 
 #define DEBUG
 #include 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r224731 - head/contrib/one-true-awk

[Ruslan Ermilov]

Author: ru
Date: Tue Aug  9 12:54:43 2011
New Revision: 224731
URL: http://svn.freebsd.org/changeset/base/224731

Log:
  Update to a 7-Aug-2011 release.
  
  Approved by:  re (kib)

Modified:
  head/contrib/one-true-awk/FIXES
  head/contrib/one-true-awk/awkgram.y
  head/contrib/one-true-awk/b.c
  head/contrib/one-true-awk/lex.c
  head/contrib/one-true-awk/lib.c
  head/contrib/one-true-awk/main.c
  head/contrib/one-true-awk/makefile
  head/contrib/one-true-awk/proto.h
  head/contrib/one-true-awk/run.c
  head/contrib/one-true-awk/tran.c
Directory Properties:
  head/contrib/one-true-awk/   (props changed)

Modified: head/contrib/one-true-awk/FIXES
==
--- head/contrib/one-true-awk/FIXES Tue Aug  9 12:24:33 2011
(r224730)
+++ head/contrib/one-true-awk/FIXES Tue Aug  9 12:54:43 2011
(r224731)
@@ -25,6 +25,24 @@ THIS SOFTWARE.
 This file lists all bug fixes, changes, etc., made since the AWK book
 was sent to the printers in August, 1987.
 
+Aug 7, 2011:
+   split(s, a, //) now behaves the same as split(s, a, "")
+
+Jun 12, 2011:
+   /pat/, \n /pat/ {...} is now legal, though bad style to use.
+
+   added checks to new -v code that permits -vnospace; thanks to
+       ruslan ermilov for spotting this and providing the patch. 
+
+   removed fixed limit on number of open files; thanks to aleksey
+   cheusov and christos zoulos. 
+
+   fixed day 1 bug that resurrected deleted elements of ARGV when
+   used as filenames (in lib.c).
+
+   minor type fiddles to make gcc -Wall -pedantic happier (but not
+   totally so); turned on -fno-strict-aliasing in makefile.
+
 May 6, 2011:
added #ifdef for isblank.
now allows -ffoo as well as -f foo arguments.

Modified: head/contrib/one-true-awk/awkgram.y
==
--- head/contrib/one-true-awk/awkgram.y Tue Aug  9 12:24:33 2011
(r224730)
+++ head/contrib/one-true-awk/awkgram.y Tue Aug  9 12:54:43 2011
(r224731)
@@ -174,8 +174,8 @@ pa_pat:
 pa_stat:
  pa_pat{ $$ = stat2(PASTAT, $1, stat2(PRINT, 
rectonode(), NIL)); }
| pa_pat lbrace stmtlist '}'{ $$ = stat2(PASTAT, $1, $3); }
-   | pa_pat ',' pa_pat { $$ = pa2stat($1, $3, stat2(PRINT, 
rectonode(), NIL)); }
-   | pa_pat ',' pa_pat lbrace stmtlist '}' { $$ = pa2stat($1, $3, $5); }
+   | pa_pat ',' opt_nl pa_pat  { $$ = pa2stat($1, $4, 
stat2(PRINT, rectonode(), NIL)); }
+   | pa_pat ',' opt_nl pa_pat lbrace stmtlist '}'  { $$ = pa2stat($1, $4, 
$6); }
| lbrace stmtlist '}'   { $$ = stat2(PASTAT, NIL, $2); }
| XBEGIN lbrace stmtlist '}'
{ beginloc = linkum(beginloc, $3); $$ = 0; }

Modified: head/contrib/one-true-awk/b.c
==
--- head/contrib/one-true-awk/b.c   Tue Aug  9 12:24:33 2011
(r224730)
+++ head/contrib/one-true-awk/b.c   Tue Aug  9 12:54:43 2011
(r224731)
@@ -234,7 +234,7 @@ void freetr(Node *p)/* free parse tree 
 /* in the parsing of regular expressions, metacharacters like . have */
 /* to be seen literally;  \056 is not a metacharacter. */
 
-int hexstr(char **pp)  /* find and eval hex string at pp, return new p */
+int hexstr(uschar **pp)/* find and eval hex string at pp, return new p 
*/
 {  /* only pick up one 8-bit byte (2 chars) */
uschar *p;
int n = 0;
@@ -248,16 +248,16 @@ int hexstr(char **pp) /* find and eval h
else if (*p >= 'A' && *p <= 'F')
n = 16 * n + *p - 'A' + 10;
}
-   *pp = (char *) p;
+   *pp = (uschar *) p;
return n;
 }
 
 #define isoctdigit(c) ((c) >= '0' && (c) <= '7')   /* multiple use of arg 
*/
 
-int quoted(char **pp)  /* pick up next thing after a \\ */
+int quoted(uschar **pp)/* pick up next thing after a \\ */
/* and increment *pp */
 {
-   char *p = *pp;
+   uschar *p = *pp;
int c;
 
if ((c = *p++) == 't')
@@ -314,13 +314,13 @@ char *cclenter(const char *argp)  /* add 
bp = buf;
for (i = 0; (c = *p++) != 0; ) {
if (c == '\\') {
-   c = quoted((char **) &p);
+   c = quoted(&p);
} else if (c == '-' && i > 0 && bp[-1] != 0) {
if (*p != 0) {
c = bp[-1];
c2 = *p++;
if (c2 == '\\')
- 

svn commit: r224648 - head/usr.bin/man

[Ruslan Ermilov]

Author: ru
Date: Thu Aug  4 08:50:33 2011
New Revision: 224648
URL: http://svn.freebsd.org/changeset/base/224648

Log:
  Clean up markup.
  
  Approved by:  re (kib)

Modified:
  head/usr.bin/man/man.1

Modified: head/usr.bin/man/man.1
==
--- head/usr.bin/man/man.1  Thu Aug  4 07:32:21 2011(r224647)
+++ head/usr.bin/man/man.1  Thu Aug  4 08:50:33 2011(r224648)
@@ -34,7 +34,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl adho
-.Op Fl t | Fl w
+.Op Fl t | w
 .Op Fl M Ar manpath
 .Op Fl P Ar pager
 .Op Fl S Ar mansect
@@ -73,9 +73,9 @@ environment variable.
 .It Fl P Ar pager
 Use specified pager.
 Defaults to
-.Ic "less -sR"
+.Dq Li "less -sR"
 if color support is enabled, or
-.Ic "more -s" .
+.Dq Li "more -s" .
 Overrides the
 .Ev MANPAGER
 environment variable, which in turn overrides the
@@ -84,7 +84,7 @@ environment variable.
 .It Fl S Ar mansect
 Restricts manual sections searched to the specified colon delimited list.
 Defaults to
-.Va 1:1aout:8:2:3:n:4:5:6:7:9:l .
+.Dq Li 1:1aout:8:2:3:n:4:5:6:7:9:l .
 Overrides the
 .Ev MANSECT
 environment variable.
@@ -125,12 +125,13 @@ Overrides the
 and
 .Ev LANG
 environment variables.
-.It Fl p Op Ar eprtv
+.It Fl p Op Cm eprtv
 Use the list of given preprocessors before running
 .Xr nroff 1
 or
 .Xr troff 1 .
 Valid preprocessors arguments:
+.Pp
 .Bl -tag -width indent -compact
 .It Cm e
 .Xr eqn 1
@@ -143,6 +144,7 @@ Valid preprocessors arguments:
 .It Cm v
 .Xr vgrind 1
 .El
+.Pp
 Overrides the
 .Ev MANROFFSEQ
 environment variable.
@@ -161,35 +163,31 @@ The
 utility supports manual pages in different locales.
 The search behavior is dictated by the first of three
 environment variables with a nonempty string:
-.Ev LC_ALL ,
-.Ev LC_CTYPE ,
+.Ev LC_ALL , LC_CTYPE ,
 or
 .Ev LANG .
 If set,
 .Nm
 will search for locale specific manual pages using the following logic:
-.Bl -item -compact -offset indent
-.Sm off
+.Pp
+.Bl -item -offset indent -compact
 .It
-.Va lang _
-.Va country .
-.Va charset
+.Va lang Ns _ Ns Va country Ns . Ns Va charset
 .It
-.Va lang .
-.Va charset
+.Va lang Ns . Ns Va charset
 .It
-.Li en .
-.Va charset
-.Sm on
+.Li en Ns . Ns Va charset
 .El
+.Pp
 For example, if
 .Ev LC_ALL
 is set to
-.Va ja_JP.eucJP ,
+.Dq Li ja_JP.eucJP ,
 .Nm
 will search the following paths when considering section 1 manual pages in
 .Pa /usr/share/man :
-.Bl -item -compact -offset indent
+.Pp
+.Bl -item -offset indent -compact
 .It
 .Pa /usr/share/man/ja_JP.eucJP/man1
 .It
@@ -213,15 +211,16 @@ environment variables.
 For example, if
 .Ev MACHINE_ARCH
 is set to
-.Va i386
+.Dq Li i386
 and
 .Ev MACHINE
 is set to
-.Va pc98 ,
+.Dq Li pc98 ,
 .Nm
 will search the following paths when considering section 4 manual pages in
 .Pa /usr/share/man :
-.Bl -item -compact -offset indent
+.Pp
+.Bl -item -offset indent -compact
 .It
 .Pa /usr/share/man/man4/pc98
 .It
@@ -234,12 +233,12 @@ The
 .Nm
 utility also supports displaying a specific manual page if passed a path
 to the file as long as it contains a
-.Sq /
+.Ql /
 character.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
 .Nm :
-.Bl -tag -width ".Ev MANPATH"
+.Bl -tag -width ".Ev MANROFFSEQ"
 .It Ev LC_ALL , LC_CTYPE , LANG
 Used to find locale specific manual pages.
 Valid values can be found by running the
@@ -254,9 +253,9 @@ option.
 .It Ev MACHINE_ARCH , MACHINE
 Used to find platform specific manual pages.
 If unset, the output of
-.Ic "sysctl hw.machine_arch"
+.Dq Li "sysctl hw.machine_arch"
 and
-.Ic "sysctl hw.machine"
+.Dq Li "sysctl hw.machine"
 is used respectively.
 See
 .Sx IMPLEMENTATION NOTES
@@ -299,14 +298,14 @@ If set, enables color support.
 Program used to display files.
 .Pp
 If unset, and color support is enabled,
-.Ic "less -sR"
+.Dq Li "less -sR"
 is used.
 .Pp
 If unset, and color support is disabled, then
 .Ev PAGER
 is used.
 If that has no value either,
-.Ic "more -s"
+.Dq Li "more -s"
 is used.
 .El
 .Sh FILES
@@ -317,11 +316,11 @@ System configuration file.
 Local configuration files.
 .El
 .Sh SEE ALSO
-.Xr intro 1 ,
 .Xr apropos 1 ,
+.Xr intro 1 ,
 .Xr locale 1 ,
 .Xr manpath 1 ,
-.Xr man.conf 5 ,
 .Xr nroff 1 ,
 .Xr troff 1 ,
-.Xr whatis 1
+.Xr whatis 1 ,
+.Xr man.conf 5
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r223372 - head/bin/realpath

[Ruslan Ermilov]

On Tue, Jun 21, 2011 at 10:28:03PM +0200, Jilles Tjoelker wrote:
> On Tue, Jun 21, 2011 at 07:34:57PM +0000, Ruslan Ermilov wrote:
> > Author: ru
> > Date: Tue Jun 21 19:34:57 2011
> > New Revision: 223372
> > URL: http://svn.freebsd.org/changeset/base/223372
> 
> > Log:
> >   Make ``realpath'' behave like ``realpath .''.
> 
> Is this being added for compatibility with something?
> 
> If not, why do we need this non-standard extension if the shorter and
> standard pwd -P already fulfills this function?

I treat it as a convenient addition to a non-standard utility.

realpath(1) was first added in FreeBSD in year 2000 by phk@,
as a convenience utility.  In r90523 the ability to call
"realpath" without arguments (with a similar behavior but
different implementation) was added by mike@.  Ten months
later, this syntax was removed by johan@ in r108034.

I'm not aware of any standard and/or another non-FreeBSD based
OS that also have this utility (only saw a mention of a patch
that adds an utility of the same name into GNU shell-utils,
but it seems to have never happened).  We could emphasize this:

Index: realpath.1
===
--- realpath.1  (revision 223372)
+++ realpath.1  (working copy)
@@ -69,6 +69,10 @@
 fails.
 .Sh EXIT STATUS
 .Ex -std
+.Sh COMPATIBILITY
+The
+.Nm
+utility is non-standard and should not be used in portable scripts.
 .Sh SEE ALSO
 .Xr realpath 3
 .Sh HISTORY


Cheers,
-- 
Ruslan Ermilov
r...@freebsd.org
FreeBSD committer
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r223372 - head/bin/realpath

[Ruslan Ermilov]

Author: ru
Date: Tue Jun 21 19:34:57 2011
New Revision: 223372
URL: http://svn.freebsd.org/changeset/base/223372

Log:
  Make ``realpath'' behave like ``realpath .''.

Modified:
  head/bin/realpath/realpath.1
  head/bin/realpath/realpath.c

Modified: head/bin/realpath/realpath.1
==
--- head/bin/realpath/realpath.1Tue Jun 21 19:31:31 2011
(r223371)
+++ head/bin/realpath/realpath.1Tue Jun 21 19:34:57 2011
(r223372)
@@ -33,7 +33,7 @@
 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp
 .\" $FreeBSD$
 .\"
-.Dd November 24, 2000
+.Dd June 21, 2011
 .Dt REALPATH 1
 .Os
 .Sh NAME
@@ -42,8 +42,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl q
-.Ar path
-.Op Ar ...
+.Op Ar path ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -57,6 +56,11 @@ and
 .Pa /../
 in
 .Ar path .
+If
+.Ar path
+is absent, the current working directory
+.Pq Sq Pa .\&
+is assumed.
 .Pp
 If
 .Fl q

Modified: head/bin/realpath/realpath.c
==
--- head/bin/realpath/realpath.cTue Jun 21 19:31:31 2011
(r223371)
+++ head/bin/realpath/realpath.cTue Jun 21 19:34:57 2011
(r223372)
@@ -44,7 +44,8 @@ main(int argc, char *argv[])
 {
char buf[PATH_MAX];
char *p;
-   int ch, i, qflag, rval;
+   const char *path;
+   int ch, qflag, rval;
 
qflag = 0;
while ((ch = getopt(argc, argv, "q")) != -1) {
@@ -59,17 +60,16 @@ main(int argc, char *argv[])
}
argc -= optind;
argv += optind;
-   if (argc < 1)
-   usage();
+   path = *argv != NULL ? *argv++ : ".";
rval  = 0;
-   for (i = 0; i < argc; i++) {
-   if ((p = realpath(argv[i], buf)) == NULL) {
+   do {
+   if ((p = realpath(path, buf)) == NULL) {
if (!qflag)
-   warn("%s", argv[i]);
+   warn("%s", path);
rval = 1;
} else
(void)printf("%s\n", p);
-   }
+   } while ((path = *argv++) != NULL);
exit(rval);
 }
 
@@ -77,6 +77,6 @@ static void
 usage(void)
 {
 
-   (void)fprintf(stderr, "usage: realpath [-q] path [...]\n");
+   (void)fprintf(stderr, "usage: realpath [-q] [path ...]\n");
exit(1);
 }
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r223148 - in head: . share/examples/etc share/man/man5 share/man/man7

[Ruslan Ermilov]

Author: ru
Date: Thu Jun 16 12:28:37 2011
New Revision: 223148
URL: http://svn.freebsd.org/changeset/base/223148

Log:
  It's a bit odd, but "make update" in src/ can also update the ports/,
  doc/, and now www/ trees, but only using the "cvsup" transport.
  
  When "make update" is run using a tree's makefile, it can also use
  "cvs" (except for www/) and "svn" (only src/).
  
  Clean up documentation and code regarding "make update":
  
  - Increase oddness by adding support for WWWSUPFILE and NO_WWWUPDATE to
Makefile.inc1 (analogous to PORTSSUPFILE/NO_PORTSUPDATE and
DOCSUPFILE/NO_DOCUPDATE; WWWSUPFILE already supported by www/Makefile).
  
  - Document all trees that support CVS_UPDATE.
  
  - Document all trees that support SUP_UPDATE.
  
  - Document SVN_UPDATE.
  
  - Document NO_WWWUPDATE.
  
  - make.conf(5) mistakenly said that *SUPFILE* had defaults.
  
  - Add an example entry for WWWSUPFILE.

Modified:
  head/Makefile
  head/Makefile.inc1
  head/share/examples/etc/make.conf
  head/share/man/man5/make.conf.5
  head/share/man/man7/build.7

Modified: head/Makefile
==
--- head/Makefile   Thu Jun 16 12:24:02 2011(r223147)
+++ head/Makefile   Thu Jun 16 12:28:37 2011(r223148)
@@ -19,7 +19,7 @@
 # kernel  - buildkernel + installkernel.
 # kernel-toolchain- Builds the subset of world necessary to build a kernel
 # doxygen - Build API documentation of the kernel, needs doxygen.
-# update  - Convenient way to update your source tree (cvs).
+# update  - Convenient way to update your source tree(s).
 # check-old   - List obsolete directories/files/libraries.
 # check-old-dirs  - List obsolete directories.
 # check-old-files - List obsolete files.

Modified: head/Makefile.inc1
==
--- head/Makefile.inc1  Thu Jun 16 12:24:02 2011(r223147)
+++ head/Makefile.inc1  Thu Jun 16 12:28:37 2011(r223148)
@@ -12,6 +12,7 @@
 #  -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel
 #  -DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #  -DNO_DOCUPDATE do not update doc in ${MAKE} update
+#  -DNO_WWWUPDATE do not update www in ${MAKE} update
 #  -DNO_CTF do not run the DTrace CTF conversion tools on built objects
 #  LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 #  TARGET="machine" to crossbuild world for a different machine type
@@ -904,7 +905,7 @@ doxygen:
 #
 # update
 #
-# Update the source tree, by running cvsup and/or running cvs to update to the
+# Update the source tree(s), by running cvsup/cvs/svn to update to the
 # latest copy.
 #
 update:
@@ -927,6 +928,9 @@ update:
 .if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE)
@${SUP} ${SUPFLAGS} ${DOCSUPFILE}
 .endif
+.if defined(WWWSUPFILE) && !defined(NO_WWWUPDATE)
+   @${SUP} ${SUPFLAGS} ${WWWSUPFILE}
+.endif
 .endif
 .if defined(CVS_UPDATE)
@cd ${.CURDIR} ; \

Modified: head/share/examples/etc/make.conf
==
--- head/share/examples/etc/make.conf   Thu Jun 16 12:24:02 2011
(r223147)
+++ head/share/examples/etc/make.conf   Thu Jun 16 12:28:37 2011
(r223148)
@@ -188,6 +188,7 @@
 #SUPFILE=/usr/share/examples/cvsup/standard-supfile
 #PORTSSUPFILE=   /usr/share/examples/cvsup/ports-supfile
 #DOCSUPFILE= /usr/share/examples/cvsup/doc-supfile
+#WWWSUPFILE= /usr/share/examples/cvsup/www-supfile
 #
 # top(1) uses a hash table for the user names.  The size of this hash
 # can be tuned to match the number of local users.  The table size should

Modified: head/share/man/man5/make.conf.5
==
--- head/share/man/man5/make.conf.5 Thu Jun 16 12:24:02 2011
(r223147)
+++ head/share/man/man5/make.conf.5 Thu Jun 16 12:28:37 2011
(r223148)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 15, 2009
+.Dd June 16, 2011
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -181,7 +181,11 @@ options.
 .Pq Vt bool
 Set this to use
 .Xr cvs 1
-to update your ports with
+to update your
+.Pa src , ports
+and
+.Pa doc
+trees with
 .Dq Li "make update" .
 .It Va CXXFLAGS
 .Pq Vt str
@@ -202,8 +206,8 @@ The documentation
 .Ar supfile
 to use when doing a
 .Dq Li "make update" .
-This defaults to
-.Pa /usr/share/examples/cvsup/doc\-supfile .
+For example,
+.Pa /usr/share/examples/cvsup/doc-supfile .
 .It Va INSTALL
 .Pq Vt str
 the default install command.
@@ -259,14 +263,18 @@ Set this to not update the doc tree duri
 .Pq Vt bool
 Set this to not update the ports tree during
 .Dq Li "make update" .
+.It Va NO_WWWUPDATE
+.Pq Vt bool
+Set this to not update the www tree during
+.Dq Li "make update" .
 .It Va PORTSSUPFILE
 .Pq Vt str
 The ports
 .Ar supfile
 to use w

svn commit: r222854 - head/gnu/usr.bin/groff/tmac

[Ruslan Ermilov]

Author: ru
Date: Wed Jun  8 08:16:32 2011
New Revision: 222854
URL: http://svn.freebsd.org/changeset/base/222854

Log:
  Added FreeBSD 8.3.

Modified:
  head/gnu/usr.bin/groff/tmac/mdoc.local

Modified: head/gnu/usr.bin/groff/tmac/mdoc.local
==
--- head/gnu/usr.bin/groff/tmac/mdoc.local  Wed Jun  8 08:12:15 2011
(r222853)
+++ head/gnu/usr.bin/groff/tmac/mdoc.local  Wed Jun  8 08:16:32 2011
(r222854)
@@ -74,6 +74,7 @@
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-7.47.4
+.ds doc-operating-system-FreeBSD-8.38.3
 .ds doc-operating-system-FreeBSD-9.09.0
 .
 .\" Definitions not (yet) in doc-syms
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222852 - in head: contrib/groff/tmac gnu/usr.bin/groff/tmac

[Ruslan Ermilov]

Author: ru
Date: Wed Jun  8 08:08:42 2011
New Revision: 222852
URL: http://svn.freebsd.org/changeset/base/222852

Log:
  Pull up all vendor changes to mdoc(7).
  
  This also replaces the local fix in r219209 that made .Ac emit
  ASCII angle quotes with an official fix.  In the official fix,
  ASCII quotes are output when using the .Aq, .Ao and .Ac calls,
  but only when nested into the .An macro.
  
  PR:   gnu/154822

Modified:
  head/contrib/groff/tmac/doc-common
  head/contrib/groff/tmac/doc-syms
  head/contrib/groff/tmac/doc.tmac
  head/gnu/usr.bin/groff/tmac/mdoc.local

Modified: head/contrib/groff/tmac/doc-common
==
--- head/contrib/groff/tmac/doc-common  Wed Jun  8 04:57:14 2011
(r222851)
+++ head/contrib/groff/tmac/doc-common  Wed Jun  8 08:08:42 2011
(r222852)
@@ -543,6 +543,7 @@
 .ds doc-operating-system-FreeBSD-7.3 7.3
 .ds doc-operating-system-FreeBSD-8.0 8.0
 .ds doc-operating-system-FreeBSD-8.1 8.1
+.ds doc-operating-system-FreeBSD-8.2 8.2
 .
 .ds doc-operating-system-Darwin-8.0.0  8.0.0
 .ds doc-operating-system-Darwin-8.1.0  8.1.0
@@ -563,6 +564,17 @@
 .ds doc-operating-system-Darwin-9.4.0  9.4.0
 .ds doc-operating-system-Darwin-9.5.0  9.5.0
 .ds doc-operating-system-Darwin-9.6.0  9.6.0
+.ds doc-operating-system-Darwin-9.7.0  9.7.0
+.ds doc-operating-system-Darwin-9.8.0  9.8.0
+.ds doc-operating-system-Darwin-10.6.0 10.6.0
+.ds doc-operating-system-Darwin-10.1.0 10.1.0
+.ds doc-operating-system-Darwin-10.2.0 10.2.0
+.ds doc-operating-system-Darwin-10.3.0 10.3.0
+.ds doc-operating-system-Darwin-10.4.0 10.4.0
+.ds doc-operating-system-Darwin-10.5.0 10.5.0
+.ds doc-operating-system-Darwin-10.6.0 10.6.0
+.ds doc-operating-system-Darwin-10.7.0 10.7.0
+.ds doc-operating-system-Darwin-11.0.0 11.0.0
 .
 .ds doc-operating-system-DragonFly-1.01.0
 .ds doc-operating-system-DragonFly-1.11.1

Modified: head/contrib/groff/tmac/doc-syms
==
--- head/contrib/groff/tmac/doc-symsWed Jun  8 04:57:14 2011
(r222851)
+++ head/contrib/groff/tmac/doc-symsWed Jun  8 08:08:42 2011
(r222852)
@@ -617,6 +617,8 @@
 .\" POSIX Part 1: System API
 .ds doc-str-St--p1003.1\*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 
1003.1
 .as doc-str-St--p1003.1" (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1b   \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 
1003.1b
+.as doc-str-St--p1003.1b   " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .ds doc-str-St--p1003.1-88 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 
1003.1-1988
 .as doc-str-St--p1003.1-88 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
 .ds doc-str-St--p1003.1-90 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 
9945-1:1990
@@ -754,6 +756,7 @@
 .
 .ds doc-str-Lb-libarm  ARM Architecture Library (libarm, \-larm)
 .ds doc-str-Lb-libarm32ARM32 Architecture Library (libarm32, \-larm32)
+.ds doc-str-Lb-libbsm  Basic Security Module Library (libbsm, \-lbsm)
 .ds doc-str-Lb-libcStandard C\~Library (libc, \-lc)
 .ds doc-str-Lb-libcdk  Curses Development Kit Library (libcdk, \-lcdk)
 .ds doc-str-Lb-libcompat   Compatibility Library (libcompat, \-lcompat)
@@ -779,6 +782,7 @@
 .ds doc-str-Lb-libpthread  \*[Px] \*[doc-str-Lb]Threads Library (libpthread, 
\-lpthread)
 .ds doc-str-Lb-libresolv   DNS Resolver Library (libresolv, \-lresolv)
 .ds doc-str-Lb-librt   \*[Px] \*[doc-str-Lb]Real-time Library (librt, 
\-lrt)
+.ds doc-str-Lb-libSystem   System Library (libSystem, \-lSystem)
 .ds doc-str-Lb-libtermcap  Termcap Access Library (libtermcap, \-ltermcap)
 .ds doc-str-Lb-libusbhid   USB Human Interface Devices Library (libusbhid, 
\-lusbhid)
 .ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil)

Modified: head/contrib/groff/tmac/doc.tmac
==
--- head/contrib/groff/tmac/doc.tmacWed Jun  8 04:57:14 2011
(r222851)
+++ head/contrib/groff/tmac/doc.tmacWed Jun  8 08:08:42 2011
(r222852)
@@ -1197,8 +1197,14 @@
 .  if !\n[doc-arg-limit] \
 .ds doc-macro-name Aq
 .
-.  ds doc-quote-left <
-.  ds doc-quote-right >
+.  ie "\*[doc-macro-name]"An" \{\
+.ds doc-quote-left <
+.ds doc-quote-right >
+.  \}
+.  el \{\
+.ds doc-quote-left \[la]
+.ds doc-quote-right \[ra]
+.  \}
 .
 .  doc-enclose-string \$@
 ..
@@ -1527,7 +1533,10 @@
 .  if !\n[doc-arg-limit] \
 .ds doc-macro-name Ao
 .
-.  ds doc-quote-left \[la]
+.  ie "\*[doc-macro-name]"An" \
+.ds doc-quote-left <
+.  el \
+.ds doc-quote-left \[la]
 .
 .  doc-enclose-open \$@
 ..
@@ -1546,7 +1555,10 @@
 .  if !\n[doc-arg-limit] \
 .ds doc-macro-name Ac
 .
-.  ds doc-quote-right \[ra]
+.  ie "\*[doc-macro-name]"An" \
+.ds doc-quote-right >
+.  el \
+.ds doc-quote-right \[ra]
 .
 .  doc-enclose-close \$@
 ..

Modified: 

svn commit: r222653 - head/usr.bin/man

[Ruslan Ermilov]

Author: ru
Date: Fri Jun  3 14:34:38 2011
New Revision: 222653
URL: http://svn.freebsd.org/changeset/base/222653

Log:
  When MANCOLOR environment variable is set, enable ANSI color escapes
  in grotty(1).  This makes it possible to view colorized manpages in
  color.
  
  When MANPAGER environment variable is set, use it instead of PAGER.
  
  Why another environment variable, one might ask?  With color output
  enabled, both a terminal and a pager should support the ANSI color
  escapes.  On a supporting terminal, less(1) with option -R would be
  such a pager, while "more -s" (the current default pager for man(1))
  will show garbage.  It means a different default pager is needed when
  color output is enabled, but many people have PAGER set customary,
  and it's unlikely to support ANSI color escapes, so introducing yet
  another variable (MANPAGER) seemed like a good option to me:
  
  - if MANPAGER is set, use that unconditionally;
  
  - if you disable color support (it is by default), and don't set
MANPAGER, you get an old behavior: -P pager, $PAGER, "more -s",
in that order;
  
  - if you enable color support (by setting MANCOLOR), and don't set
MANPAGER, we ignore PAGER which is unlikely to support ANSI color
escapes, and you get: -P pager, "less -Rs", in that order;
  
  - you might have good reasons for different man(1) and general
purpose pagers;
  
  - later versions of GNU man(1) support MANPAGER.

Modified:
  head/usr.bin/man/man.1
  head/usr.bin/man/man.sh

Modified: head/usr.bin/man/man.1
==
--- head/usr.bin/man/man.1  Fri Jun  3 13:49:18 2011(r222652)
+++ head/usr.bin/man/man.1  Fri Jun  3 14:34:38 2011(r222653)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 2, 2011
+.Dd June 3, 2011
 .Dt MAN 1
 .Os
 .Sh NAME
@@ -73,8 +73,12 @@ environment variable.
 .It Fl P Ar pager
 Use specified pager.
 Defaults to
+.Ic "less -sR"
+if color support is enabled, or
 .Ic "more -s" .
 Overrides the
+.Ev MANPAGER
+environment variable, which in turn overrides the
 .Ev PAGER
 environment variable.
 .It Fl S Ar mansect
@@ -289,9 +293,19 @@ Otherwise, if set to a special value
 .Dq Li tty ,
 and output is to a terminal,
 the pages may be displayed over the whole width of the screen.
-.It Ev PAGER
+.It Ev MANCOLOR
+If set, enables color support.
+.It Ev MANPAGER
 Program used to display files.
-If unset,
+.Pp
+If unset, and color support is enabled,
+.Ic "less -sR"
+is used.
+.Pp
+If unset, and color support is disabled, then
+.Ev PAGER
+is used.
+If that has no value either,
 .Ic "more -s"
 is used.
 .El

Modified: head/usr.bin/man/man.sh
==
--- head/usr.bin/man/man.sh Fri Jun  3 13:49:18 2011(r222652)
+++ head/usr.bin/man/man.sh Fri Jun  3 14:34:38 2011(r222653)
@@ -294,10 +294,10 @@ man_display_page() {
ret=0
else
if [ $debug -gt 0 ]; then
-   decho "Command: $cattool $catpage | $PAGER"
+   decho "Command: $cattool $catpage | $MANPAGER"
ret=0
else
-   eval "$cattool $catpage | $PAGER"
+   eval "$cattool $catpage | $MANPAGER"
ret=$?
fi
fi
@@ -356,6 +356,10 @@ man_display_page() {
;;
esac
 
+   if [ -z "$MANCOLOR" ]; then
+   NROFF="$NROFF -P-c"
+   fi
+
if [ -n "${use_width}" ]; then
NROFF="$NROFF -rLL=${use_width}n -rLT=${use_width}n"
fi
@@ -382,7 +386,7 @@ man_display_page() {
if [ -n "$tflag" ]; then
pipeline="$pipeline | $TROFF"
else
-   pipeline="$pipeline | $NROFF | $PAGER"
+   pipeline="$pipeline | $NROFF | $MANPAGER"
fi
 
if [ $debug -gt 0 ]; then
@@ -484,7 +488,7 @@ man_parse_args() {
while getopts 'M:P:S:adfhkm:op:tw' cmd_arg; do
case "${cmd_arg}" in
M)  MANPATH=$OPTARG ;;
-   P)  PAGER=$OPTARG ;;
+   P)  MANPAGER=$OPTARG ;;
S)  MANSECT=$OPTARG ;;
a)  aflag=aflag ;;
d)  debug=$(( $debug + 1 )) ;;
@@ -808,7 +812,7 @@ search_whatis() {
bad=${bad#\\n}
 
if [ -n "$good" ]; then
-   echo -e "$good" | $PAGER
+   echo -e "$good" | $MANPAGER
fi
 
if [ -n "$bad" ]; then
@@ -832,13 +836,21 @@ setup_cattool() {
 }
 
 # Usage: setup_pager
-# Correctly sets $PAGER
+# Correctly sets $MANPAGER
 setup_pager() {
# Setup pager.
-   if [ -z "$PAGER" ]; then
-   PAGER="more -s"
+   if [ -z "$MANPAGER" ]; then
+   if [ -n "$M

svn commit: r222650 - head/usr.bin/man

[Ruslan Ermilov]

Author: ru
Date: Fri Jun  3 13:45:11 2011
New Revision: 222650
URL: http://svn.freebsd.org/changeset/base/222650

Log:
  Don't use col(1) since grotty(1) never outputs reverse line feeds,
  and because col(1) mangles ANSI color escapes if enabled.  Spaces
  to tabs compression is now done by passing -h to grotty(1).
  
  Discussed with:   uqs

Modified:
  head/usr.bin/man/man.conf.5
  head/usr.bin/man/man.sh

Modified: head/usr.bin/man/man.conf.5
==
--- head/usr.bin/man/man.conf.5 Fri Jun  3 13:12:26 2011(r222649)
+++ head/usr.bin/man/man.conf.5 Fri Jun  3 13:45:11 2011(r222650)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 1, 2010
+.Dd June 3, 2011
 .Os
 .Dt MAN.CONF 5
 .Sh NAME
@@ -72,7 +72,6 @@ For pages in a given language, overridin
 display is supported via the following definitions:
 .Bl -tag -offset indent -compact
 .It EQN Ns _ Ns Va LANG
-.It COL Ns _ Ns Va LANG
 .It NROFF Ns _ Ns Va LANG
 .It PIC Ns _ Ns Va LANG
 .It TBL Ns _ Ns Va LANG

Modified: head/usr.bin/man/man.sh
==
--- head/usr.bin/man/man.sh Fri Jun  3 13:12:26 2011(r222649)
+++ head/usr.bin/man/man.sh Fri Jun  3 13:45:11 2011(r222650)
@@ -279,7 +279,7 @@ man_check_for_so() {
 # Usage: man_display_page
 # Display either the manpage or catpage depending on the use_cat variable
 man_display_page() {
-   local EQN COL NROFF PIC TBL TROFF REFER VGRIND
+   local EQN NROFF PIC TBL TROFF REFER VGRIND
local IFS l nroff_dev pipeline preproc_arg tool
 
# We are called with IFS set to colon. This causes really weird
@@ -347,7 +347,7 @@ man_display_page() {
# Allow language specific calls to override the default
# set of utilities.
l=$(echo $man_lang | tr [:lower:] [:upper:])
-   for tool in EQN COL NROFF PIC TBL TROFF REFER VGRIND; do
+   for tool in EQN NROFF PIC TBL TROFF REFER VGRIND; do
eval "$tool=\${${tool}_$l:-\$$tool}"
done
;;
@@ -368,7 +368,7 @@ man_display_page() {
g)  ;; # Ignore for compatability.
p)  pipeline="$pipeline | $PIC" ;;
r)  pipeline="$pipeline | $REFER" ;;
-   t)  pipeline="$pipeline | $TBL"; use_col=yes ;;
+   t)  pipeline="$pipeline | $TBL" ;;
v)  pipeline="$pipeline | $VGRIND" ;;
*)  usage ;;
esac
@@ -377,19 +377,12 @@ man_display_page() {
pipeline="${pipeline#" | "}"
else
pipeline="$TBL"
-   use_col=yes
fi
 
if [ -n "$tflag" ]; then
pipeline="$pipeline | $TROFF"
else
-   pipeline="$pipeline | $NROFF"
-
-   if [ -n "$use_col" ]; then
-   pipeline="$pipeline | $COL"
-   fi
-
-   pipeline="$pipeline | $PAGER"
+   pipeline="$pipeline | $NROFF | $PAGER"
fi
 
if [ $debug -gt 0 ]; then
@@ -928,14 +921,13 @@ do_whatis() {
 
 # User's PATH setting decides on the groff-suite to pick up.
 EQN=eqn
-NROFF='groff -S -P-c -Wall -mtty-char -man'
+NROFF='groff -S -P-ch -Wall -mtty-char -man'
 PIC=pic
 REFER=refer
 TBL=tbl
 TROFF='groff -S -man'
 VGRIND=vgrind
 
-COL=/usr/bin/col
 LOCALE=/usr/bin/locale
 STTY=/bin/stty
 SYSCTL=/sbin/sysctl
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222648 - head/contrib/groff/tmac

[Ruslan Ermilov]

Author: ru
Date: Fri Jun  3 12:02:53 2011
New Revision: 222648
URL: http://svn.freebsd.org/changeset/base/222648

Log:
  Re-enable SGR support (ANSI color escapes) in grotty(1) by default.
  Our man(1) and bsd.doc.mk still disable it for POLA reasons via the
  -c option to grotty(1).
  
  PR:   gnu/82353

Modified:
  head/contrib/groff/tmac/troffrc

Modified: head/contrib/groff/tmac/troffrc
==
--- head/contrib/groff/tmac/troffrc Fri Jun  3 11:58:17 2011
(r222647)
+++ head/contrib/groff/tmac/troffrc Fri Jun  3 12:02:53 2011
(r222648)
@@ -50,12 +50,4 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4
 .\" Handle paper formats
 .do mso papersize.tmac
 .
-.\" Disable SGR support in grotty(1).
-.if n \{\
-.  do nop \X'tty: sgr 0'
-.  sp -1
-.  nr nl 0-1
-.  nr % -1
-.\}
-.
 .\" Don't let blank lines creep in here.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222647 - head/share/mk

[Ruslan Ermilov]

Author: ru
Date: Fri Jun  3 11:58:17 2011
New Revision: 222647
URL: http://svn.freebsd.org/changeset/base/222647

Log:
  Don't pass -o1- to groff(1) by default.  If ms(7) formatted document
  uses the .RP macro, a separate cover page is created as page 0 which
  is not otherwise output.  The bug was hiding by a hack in troffrc
  that disables SGR support in grotty(1), which I'm going to remove now.
  For POLA reasons, still disable SGR support in grotty(1), by passing
  -P-c to groff(1).  If we want SGR sequences in these documents, this
  can be removed.
  
  MFC after:1 week

Modified:
  head/share/mk/bsd.doc.mk

Modified: head/share/mk/bsd.doc.mk
==
--- head/share/mk/bsd.doc.mkFri Jun  3 10:39:36 2011(r222646)
+++ head/share/mk/bsd.doc.mkFri Jun  3 11:58:17 2011(r222647)
@@ -54,10 +54,10 @@ INDXBIB?=   indxbib
 PIC?=  pic
 REFER?=refer
 .for _dev in ${PRINTERDEVICE:Mascii}
-ROFF.ascii?=   groff -Tascii ${TRFLAGS} -mtty-char ${MACROS} -o${PAGES}
+ROFF.ascii?=   groff -Tascii -P-c ${TRFLAGS} -mtty-char ${MACROS} 
${PAGES:C/^/-o/1}
 .endfor
 .for _dev in ${PRINTERDEVICE:Nascii}
-ROFF.${_dev}?= groff -T${_dev} ${TRFLAGS} ${MACROS} -o${PAGES}
+ROFF.${_dev}?= groff -T${_dev} ${TRFLAGS} ${MACROS} ${PAGES:C/^/-o/1}
 .endfor
 SOELIM?=   soelim
 TBL?=  tbl
@@ -94,8 +94,6 @@ DFILE.${_dev}=${DOC}.${_dev}${DCOMPRESS
 .endif
 .endfor
 
-PAGES?=1-
-
 UNROFF?=   unroff
 HTML_SPLIT?=   yes
 UNROFFFLAGS?=  -fhtml
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222646 - head/sbin/geom/class/part

[Ruslan Ermilov]

Author: ru
Date: Fri Jun  3 10:39:36 2011
New Revision: 222646
URL: http://svn.freebsd.org/changeset/base/222646

Log:
  Generally clean up markup.

Modified:
  head/sbin/geom/class/part/gpart.8

Modified: head/sbin/geom/class/part/gpart.8
==
--- head/sbin/geom/class/part/gpart.8   Fri Jun  3 09:32:49 2011
(r222645)
+++ head/sbin/geom/class/part/gpart.8   Fri Jun  3 10:39:36 2011
(r222646)
@@ -61,7 +61,8 @@ which is used to define a logical partit
 The
 .Dv GEOM_PART_EBR_COMPAT
 option enables backward compatibility for partition names
-in the EBR scheme. Also it makes impossible any types of actions
+in the EBR scheme.
+Also it makes impossible any types of actions
 with such partitions.
 The
 .Dv GEOM_PART_GPT
@@ -170,7 +171,7 @@ utility:
 .\"  SHOW 
 .Nm
 .Cm show
-.Op Fl l | Fl r
+.Op Fl l | r
 .Op Fl p
 .Op Ar geom ...
 .\"  UNDO 
@@ -200,11 +201,14 @@ The partition begins on the logical bloc
 option.
 Its size is given by the
 .Fl s Ar size
-option. SI unit suffixes are allowed. One or both
+option.
+SI unit suffixes are allowed.
+One or both
 .Fl b
 and
 .Fl s
-options can be omitted. If so they are automatically calculated.
+options can be omitted.
+If so they are automatically calculated.
 The type of the partition is given by the
 .Fl t Ar type
 option.
@@ -399,7 +403,7 @@ about its use.
 Recover corrupt partition's scheme metadata on the geom
 .Ar geom .
 See the section entitled
-.Sx "RECOVERING"
+.Sx RECOVERING
 below for the additional information.
 .Pp
 Additional options include:
@@ -453,7 +457,7 @@ action and given from standard input.
 Only partition table may be restored.
 This action does not affect content of partitions.
 This mean that you should copy your data from backup after restoring
-partition table and write bootcode again if it is needed. 
+partition table and write bootcode again if it is needed.
 .Pp
 Additional options include:
 .Bl -tag -width 10n
@@ -474,7 +478,7 @@ about its use.
 .It Cm set
 Set the named attribute on the partition entry.
 See the section entitled
-.Sx "ATTRIBUTES"
+.Sx ATTRIBUTES
 below for a list of available attributes.
 .Pp
 Additional options include:
@@ -511,7 +515,7 @@ action and can be used to undo any chang
 .It Cm unset
 Clear the named attribute on the partition entry.
 See the section entitled
-.Sx "ATTRIBUTES"
+.Sx ATTRIBUTES
 below for a list of available attributes.
 .Pp
 Additional options include:
@@ -616,75 +620,75 @@ by GPT.
 .El
 .Sh ATTRIBUTES
 The scheme-specific attributes for EBR:
-.Bl -tag -width ".Ar active"
-.It Ar active
+.Bl -tag -width ".Cm active"
+.It Cm active
 .El
 .Pp
 The scheme-specific attributes for GPT:
-.Bl -tag -width ".Ar bootfailed"
-.It Ar bootme
+.Bl -tag -width ".Cm bootfailed"
+.It Cm bootme
 When set, the
 .Nm gptboot
 stage 1 boot loader will try to boot the system from this partition.
 Multiple partitions might be marked with the
-.Ar bootme
+.Cm bootme
 attribute.
 In such scenario the
 .Nm gptboot
 will try all
-.Ar bootme
+.Cm bootme
 partitions one by one, until the next boot stage is successfully entered.
-.It Ar bootonce
+.It Cm bootonce
 Setting this attribute automatically sets the
-.Ar bootme
+.Cm bootme
 attribute.
 When set, the
 .Nm gptboot
 stage 1 boot loader will try to boot the system from this partition only once.
 Partitions with both
-.Ar bootonce
+.Cm bootonce
 and
-.Ar bootme
+.Cm bootme
 attributes are tried before partitions with only the
-.Ar bootme
+.Cm bootme
 attribute.
 Before
-.Ar bootonce
+.Cm bootonce
 partition is tried, the
 .Nm gptboot
 removes the
-.Ar bootme
+.Cm bootme
 attribute and tries to execute the next boot stage.
 If it fails, the
-.Ar bootonce
+.Cm bootonce
 attribute that is now alone is replaced with the
-.Ar bootfailed
+.Cm bootfailed
 attribute.
 If the execution of the next boot stage succeeds, but the system is not fully
 booted, the
 .Nm gptboot
 will look for
-.Ar bootonce
+.Cm bootonce
 attributes alone (without the
-.Ar bootme
+.Cm bootme
 attribute) on the next system boot and will replace those with the
-.Ar bootfailed
+.Cm bootfailed
 attribute.
 If the system is fully booted, the
 .Pa /etc/rc.d/gptboot
 start-up script will look for partition with the
-.Ar bootonce
+.Cm bootonce
 attribute alone, will remove the attribute and log that the system was
 successfully booted from this partition.
 There should be at most one
-.Ar bootonce
+.Cm bootonce
 partition when system is successfully booted.
 Multiple partitions might be marked with the
-.Ar bootonce
+.Cm bootonce
 and
-.Ar bootme
+.Cm bootme
 attribute pairs.
-.It Ar bootfailed
+.It Cm bootfailed
 This attribute should not be manually managed.
 It is managed by the
 .Nm gptboot
@@ -692,24 +696,24 @@ stage 1 boot loader and the
 .Pa /etc/rc.d/gptboot
 start-up script.
 This attribute is used to mark partitions that had the
-.Ar bootonce
+.Cm bootonce
 attribute set, but we failed to boot

svn commit: r222638 - head/usr.bin/man

[Ruslan Ermilov]

Author: ru
Date: Fri Jun  3 05:56:52 2011
New Revision: 222638
URL: http://svn.freebsd.org/changeset/base/222638

Log:
  Trim more when parsing MANCONFIG directive.

Modified:
  head/usr.bin/man/man.sh

Modified: head/usr.bin/man/man.sh
==
--- head/usr.bin/man/man.sh Fri Jun  3 05:33:38 2011(r222637)
+++ head/usr.bin/man/man.sh Fri Jun  3 05:56:52 2011(r222638)
@@ -704,7 +704,7 @@ parse_file() {
manlocales="$manlocales:$tstr"
;;
MANCONFIG*) decho "MANCONFIG" 3
-   trim "${line#MANCONF}"
+   trim "${line#MANCONFIG}"
config_local="$tstr"
;;
# Set variables in the form of FOO_BAR
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222636 - head/usr.bin/man

[Ruslan Ermilov]

Author: ru
Date: Fri Jun  3 05:16:54 2011
New Revision: 222636
URL: http://svn.freebsd.org/changeset/base/222636

Log:
  Typo.

Modified:
  head/usr.bin/man/man.conf.5

Modified: head/usr.bin/man/man.conf.5
==
--- head/usr.bin/man/man.conf.5 Fri Jun  3 05:16:33 2011(r222635)
+++ head/usr.bin/man/man.conf.5 Fri Jun  3 05:16:54 2011(r222636)
@@ -112,7 +112,7 @@ with the following contents:
 .Bd -literal -offset indent
 # Setup Japanese toolset
 MANLOCALE  ja_JP.eucJP
-EQN_JA /usr/local/bin/gepn
+EQN_JA /usr/local/bin/geqn
 PIC_JA /usr/local/bin/gpic
 TBL_JA /usr/local/bin/gtbl
 NROFF_JA   /usr/local/bin/groff -man -dlang=ja_JP.eucJP
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222635 - head/usr.bin/man

[Ruslan Ermilov]

Author: ru
Date: Fri Jun  3 05:16:33 2011
New Revision: 222635
URL: http://svn.freebsd.org/changeset/base/222635

Log:
  Added support for the MANWIDTH environment variable:
  
  If set to a numeric value, used as the width manpages should be
  displayed.  Otherwise, if set to a special value ``tty'', and
  output is to a terminal, the pages may be displayed over the
  whole width of the screen.

Modified:
  head/usr.bin/man/man.1
  head/usr.bin/man/man.sh

Modified: head/usr.bin/man/man.1
==
--- head/usr.bin/man/man.1  Fri Jun  3 03:39:33 2011(r222634)
+++ head/usr.bin/man/man.1  Fri Jun  3 05:16:33 2011(r222635)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 1, 2010
+.Dd June 2, 2011
 .Dt MAN 1
 .Os
 .Sh NAME
@@ -283,6 +283,12 @@ Restricts manual sections searched to th
 Corresponds to the
 .Fl S
 option.
+.It Ev MANWIDTH
+If set to a numeric value, used as the width manpages should be displayed.
+Otherwise, if set to a special value
+.Dq Li tty ,
+and output is to a terminal,
+the pages may be displayed over the whole width of the screen.
 .It Ev PAGER
 Program used to display files.
 If unset,

Modified: head/usr.bin/man/man.sh
==
--- head/usr.bin/man/man.sh Fri Jun  3 03:39:33 2011(r222634)
+++ head/usr.bin/man/man.sh Fri Jun  3 05:16:33 2011(r222635)
@@ -112,7 +112,11 @@ check_man() {
setup_cattool $manpage
decho "Found manpage $manpage"
 
-   if exists "$2" && is_newer $found $manpage; then
+   if [ -n "${use_width}" ]; then
+   # non-standard width
+   unset use_cat
+   decho "Skipping catpage: non-standard page width"
+   elif exists "$2" && is_newer $found $manpage; then
# cat page found and is newer, use that
use_cat=yes
catpage=$found
@@ -352,6 +356,10 @@ man_display_page() {
;;
esac
 
+   if [ -n "${use_width}" ]; then
+   NROFF="$NROFF -rLL=${use_width}n -rLT=${use_width}n"
+   fi
+
if [ -n "$MANROFFSEQ" ]; then
set -- -$MANROFFSEQ
while getopts 'egprtv' preproc_arg; do
@@ -562,6 +570,35 @@ man_setup() {
 
build_manpath
man_setup_locale
+   man_setup_width
+}
+
+# Usage: man_setup_width
+# Set up page width.
+man_setup_width() {
+   local sizes
+
+   unset use_width
+   case "$MANWIDTH" in
+   [0-9]*)
+   if [ "$MANWIDTH" -gt 0 2>/dev/null ]; then
+   use_width=$MANWIDTH
+   fi
+   ;;
+   [Tt][Tt][Yy])
+   if { sizes=$($STTY size 0>&3 2>/dev/null); } 3>&1; then
+   set -- $sizes
+   if [ $2 -gt 80 ]; then
+   use_width=$(($2-2))
+   fi
+   fi
+   ;;
+   esac
+   if [ -n "$use_width" ]; then
+   decho "Using non-standard page width: ${use_width}"
+   else
+   decho 'Using standard page width'
+   fi
 }
 
 # Usage: man_setup_locale
@@ -900,6 +937,7 @@ VGRIND=vgrind
 
 COL=/usr/bin/col
 LOCALE=/usr/bin/locale
+STTY=/bin/stty
 SYSCTL=/sbin/sysctl
 
 debug=0
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222286 - in head: contrib/openbsm/libbsm lib/libc/gen share/man/man4 share/man/man7 share/man/man9 tools/tools/ether_reflect usr.bin/mkcsmapper usr.bin/mkesdb usr.sbin/bsnmpd/modules/s...

[Ruslan Ermilov]

Author: ru
Date: Wed May 25 14:13:53 2011
New Revision: 86
URL: http://svn.freebsd.org/changeset/base/86

Log:
  [mdoc] Fixed .Dt call.

Modified:
  head/contrib/openbsm/libbsm/audit_submit.3
  head/lib/libc/gen/feature_present.3
  head/share/man/man4/atrtc.4
  head/share/man/man4/attimer.4
  head/share/man/man4/cc.4
  head/share/man/man4/h_ertt.4
  head/share/man/man4/nvram2env.4
  head/share/man/man7/eventtimers.7
  head/share/man/man9/devfs_set_cdevpriv.9
  head/share/man/man9/hhook.9
  head/share/man/man9/khelp.9
  head/tools/tools/ether_reflect/ether_reflect.1
  head/usr.bin/mkcsmapper/mkcsmapper.1
  head/usr.bin/mkesdb/mkesdb.1
  head/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
  head/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
  head/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3
  head/usr.sbin/usbdump/usbdump.8

Modified: head/contrib/openbsm/libbsm/audit_submit.3
==
--- head/contrib/openbsm/libbsm/audit_submit.3  Wed May 25 13:55:49 2011
(r85)
+++ head/contrib/openbsm/libbsm/audit_submit.3  Wed May 25 14:13:53 2011
(r86)
@@ -30,7 +30,7 @@
 .\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#17 $
 .\"
 .Dd January 18, 2008
-.Dt audit_submit 3
+.Dt AUDIT_SUBMIT 3
 .Os
 .Sh NAME
 .Nm audit_submit

Modified: head/lib/libc/gen/feature_present.3
==
--- head/lib/libc/gen/feature_present.3 Wed May 25 13:55:49 2011
(r85)
+++ head/lib/libc/gen/feature_present.3 Wed May 25 14:13:53 2011
(r86)
@@ -29,7 +29,7 @@
 .\" $FreeBSD$
 .\"
 .Dd January 8, 2008
-.Dt feature_present 3
+.Dt FEATURE_PRESENT 3
 .Os
 .Sh NAME
 .Nm feature_present

Modified: head/share/man/man4/atrtc.4
==
--- head/share/man/man4/atrtc.4 Wed May 25 13:55:49 2011(r85)
+++ head/share/man/man4/atrtc.4 Wed May 25 14:13:53 2011(r86)
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd September 17, 2010
-.Dt atrtc 4
+.Dt ATRTC 4
 .Os
 .Sh NAME
 .Nm atrtc

Modified: head/share/man/man4/attimer.4
==
--- head/share/man/man4/attimer.4   Wed May 25 13:55:49 2011
(r85)
+++ head/share/man/man4/attimer.4   Wed May 25 14:13:53 2011
(r86)
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd September 14, 2010
-.Dt attimer 4
+.Dt ATTIMER 4
 .Os
 .Sh NAME
 .Nm attimer

Modified: head/share/man/man4/cc.4
==
--- head/share/man/man4/cc.4Wed May 25 13:55:49 2011(r85)
+++ head/share/man/man4/cc.4Wed May 25 14:13:53 2011(r86)
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd February 15, 2011
-.Dt cc 4
+.Dt CC 4
 .Os
 .Sh NAME
 .Nm cc

Modified: head/share/man/man4/h_ertt.4
==
--- head/share/man/man4/h_ertt.4Wed May 25 13:55:49 2011
(r85)
+++ head/share/man/man4/h_ertt.4Wed May 25 14:13:53 2011
(r86)
@@ -30,7 +30,7 @@
 .\" $FreeBSD$
 .\"
 .Dd February 15, 2011
-.Dt h_ertt 9
+.Dt H_ERTT 9
 .Os
 .Sh NAME
 .Nm h_ertt

Modified: head/share/man/man4/nvram2env.4
==
--- head/share/man/man4/nvram2env.4 Wed May 25 13:55:49 2011
(r85)
+++ head/share/man/man4/nvram2env.4 Wed May 25 14:13:53 2011
(r86)
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd April 3, 2011
-.Dt nvram2env 4
+.Dt NVRAM2ENV 4
 .Os
 .Sh NAME
 .Nm nvram2env

Modified: head/share/man/man7/eventtimers.7
==
--- head/share/man/man7/eventtimers.7   Wed May 25 13:55:49 2011
(r85)
+++ head/share/man/man7/eventtimers.7   Wed May 25 14:13:53 2011
(r86)
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd September 15, 2010
-.Dt eventtimers 4
+.Dt EVENTTIMERS 4
 .Os
 .Sh NAME
 .Nm eventtimers

Modified: head/share/man/man9/devfs_set_cdevpriv.9
==
--- head/share/man/man9/devfs_set_cdevpriv.9Wed May 25 13:55:49 2011
(r85)
+++ head/share/man/man9/devfs_set_cdevpriv.9Wed May 25 14:13:53 2011
(r86)
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd September 8, 2008
-.Dt DEVFS_CDEVPRIV
+.Dt DEVFS_CDEVPRIV 9
 .Os
 .Sh NAME
 .Nm devfs_set_cdevpriv ,

Modified: head/share/man/man9/hhook.9
==
--- head/share/man/man9/hhook.9 Wed May 25 13:55:49 2011(r85)
+++ head/share/man/man9/hhook.9 Wed May 25 14:13:53 2011(r86)
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd February 15, 2011
-.Dt hhook 9
+.Dt HHOOK 9
 .Os
 .Sh NA

svn commit: r222245 - head/usr.bin/showmount

[Ruslan Ermilov]

Author: ru
Date: Tue May 24 06:56:40 2011
New Revision: 45
URL: http://svn.freebsd.org/changeset/base/45

Log:
  Ensure there is a whitespace after a mount point.
  
  PR:   157286
  Submitted by: Marcus Reid
  MFC after:3 days

Modified:
  head/usr.bin/showmount/showmount.c

Modified: head/usr.bin/showmount/showmount.c
==
--- head/usr.bin/showmount/showmount.c  Tue May 24 06:46:07 2011
(r44)
+++ head/usr.bin/showmount/showmount.c  Tue May 24 06:56:40 2011
(r45)
@@ -185,7 +185,7 @@ main(int argc, char **argv)
printf("Exports list on %s:\n", host);
exp = exportslist;
while (exp) {
-   printf("%-35s", exp->ex_dirp);
+   printf("%-34s ", exp->ex_dirp);
grp = exp->ex_groups;
if (grp == NULL) {
printf("Everyone\n");
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222220 - head/sys/kern

[Ruslan Ermilov]

Author: ru
Date: Mon May 23 19:59:01 2011
New Revision: 20
URL: http://svn.freebsd.org/changeset/base/20

Log:
  BKVASIZE was bumped to 16k more than a decade ago.

Modified:
  head/sys/kern/vfs_bio.c

Modified: head/sys/kern/vfs_bio.c
==
--- head/sys/kern/vfs_bio.c Mon May 23 19:58:08 2011(r19)
+++ head/sys/kern/vfs_bio.c Mon May 23 19:59:01 2011(r20)
@@ -654,7 +654,7 @@ bufinit(void)
  * To support extreme low-memory systems, make sure hidirtybuffers cannot
  * eat up all available buffer space.  This occurs when our minimum cannot
  * be met.  We try to size hidirtybuffers to 3/4 our buffer space assuming
- * BKVASIZE'd (8K) buffers.
+ * BKVASIZE'd buffers.
  */
while ((long)hidirtybuffers * BKVASIZE > 3 * hibufspace / 4) {
hidirtybuffers >>= 1;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222218 - head/sys/conf

[Ruslan Ermilov]

Author: ru
Date: Mon May 23 19:57:12 2011
New Revision: 18
URL: http://svn.freebsd.org/changeset/base/18

Log:
  expr -> sh arithmetic expansion

Modified:
  head/sys/conf/newvers.sh

Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.shMon May 23 19:32:02 2011(r17)
+++ head/sys/conf/newvers.shMon May 23 19:57:12 2011(r18)
@@ -139,4 +139,4 @@ int osreldate = ${RELDATE};
 char kern_ident[] = "${i}";
 EOF
 
-echo `expr ${v} + 1` > version
+echo $((v + 1)) > version
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222139 - head/usr.sbin/tzsetup

[Ruslan Ermilov]

Author: ru
Date: Fri May 20 17:35:10 2011
New Revision: 222139
URL: http://svn.freebsd.org/changeset/base/222139

Log:
  - add missing options and arguments to program's usage()
and sync it with manpage's SYNOPSIS
  
  - generally clean up a manpage's formatting
  
  Reviewed by:  edwin

Modified:
  head/usr.sbin/tzsetup/tzsetup.8
  head/usr.sbin/tzsetup/tzsetup.c

Modified: head/usr.sbin/tzsetup/tzsetup.8
==
--- head/usr.sbin/tzsetup/tzsetup.8 Fri May 20 17:29:03 2011
(r222138)
+++ head/usr.sbin/tzsetup/tzsetup.8 Fri May 20 17:35:10 2011
(r222139)
@@ -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: head/usr.sbin/tzsetup/tzsetup.c
==
--- head/usr.sbin/tzsetup/tzsetup.c Fri May 20 17:29:03 2011
(r222138)
+++ head/usr.sbin/tzsetup/tzsetup.c Fri May 20 17:35:10 2011
(r222139)
@@ -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);
 }
 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222019 - head/share/man/man4

[Ruslan Ermilov]

Author: ru
Date: Tue May 17 11:26:59 2011
New Revision: 222019
URL: http://svn.freebsd.org/changeset/base/222019

Log:
  Document the supported hardware, somewhat.
  
  Reviewed by:  hselasky
  MFC after:3 days

Modified:
  head/share/man/man4/xhci.4

Modified: head/share/man/man4/xhci.4
==
--- head/share/man/man4/xhci.4  Tue May 17 11:23:43 2011(r222018)
+++ head/share/man/man4/xhci.4  Tue May 17 11:26:59 2011(r222019)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 24, 2011
+.Dd May 17, 2011
 .Dt XHCI 4
 .Os
 .Sh NAME
@@ -49,6 +49,13 @@ The
 controller supports
 .Tn USB
 connection speeds up to 5.0Gbps when using a USB 3.0 compliant device.
+.Sh HARDWARE
+The
+.Nm
+driver supports
+.Tn XHCI
+compatible controllers having PCI class 12 (serial bus),
+subclass 3 (USB) and programming interface 48 (XHCI).
 .Sh SEE ALSO
 .Xr ehci 4 ,
 .Xr ohci 4 ,
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222018 - in head/sys/dev: pci usb/controller

[Ruslan Ermilov]

Author: ru
Date: Tue May 17 11:23:43 2011
New Revision: 222018
URL: http://svn.freebsd.org/changeset/base/222018

Log:
  Renamed PCI_INTERFACE_XHCI to PCIP_SERIALBUS_USB_XHCI and moved it
  to .
  
  Reviewed by:  hselasky
  MFC after:3 days

Modified:
  head/sys/dev/pci/pcireg.h
  head/sys/dev/usb/controller/xhci_pci.c
  head/sys/dev/usb/controller/xhcireg.h

Modified: head/sys/dev/pci/pcireg.h
==
--- head/sys/dev/pci/pcireg.h   Tue May 17 11:08:15 2011(r222017)
+++ head/sys/dev/pci/pcireg.h   Tue May 17 11:23:43 2011(r222018)
@@ -367,6 +367,7 @@
 #definePCIP_SERIALBUS_USB_UHCI 0x00
 #definePCIP_SERIALBUS_USB_OHCI 0x10
 #definePCIP_SERIALBUS_USB_EHCI 0x20
+#definePCIP_SERIALBUS_USB_XHCI 0x30
 #definePCIP_SERIALBUS_USB_DEVICE   0xfe
 #definePCIS_SERIALBUS_FC   0x04
 #definePCIS_SERIALBUS_SMBUS0x05

Modified: head/sys/dev/usb/controller/xhci_pci.c
==
--- head/sys/dev/usb/controller/xhci_pci.c  Tue May 17 11:08:15 2011
(r222017)
+++ head/sys/dev/usb/controller/xhci_pci.c  Tue May 17 11:23:43 2011
(r222018)
@@ -137,7 +137,7 @@ xhci_pci_match(device_t self)
 {
if ((pci_get_class(self) == PCIC_SERIALBUS)
&& (pci_get_subclass(self) == PCIS_SERIALBUS_USB)
-   && (pci_get_progif(self) == PCI_INTERFACE_XHCI)) {
+   && (pci_get_progif(self) == PCIP_SERIALBUS_USB_XHCI)) {
return ("XHCI (generic) USB 3.0 controller");
}
return (NULL);  /* dunno */

Modified: head/sys/dev/usb/controller/xhcireg.h
==
--- head/sys/dev/usb/controller/xhcireg.h   Tue May 17 11:08:15 2011
(r222017)
+++ head/sys/dev/usb/controller/xhcireg.h   Tue May 17 11:23:43 2011
(r222018)
@@ -33,7 +33,6 @@
 #definePCI_XHCI_USBREV 0x60/* RO USB protocol revision */
 #definePCI_USB_REV_3_0 0x30/* USB 3.0 */
 #definePCI_XHCI_FLADJ  0x61/* RW frame length adjust */
-#definePCI_INTERFACE_XHCI  0x30/* USB 3.0 - XHCI */
 
 /* XHCI capability registers */
 #defineXHCI_CAPLENGTH  0x00/* RO capability */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222017 - head/share/man/man5

[Ruslan Ermilov]

Author: ru
Date: Tue May 17 11:08:15 2011
New Revision: 222017
URL: http://svn.freebsd.org/changeset/base/222017

Log:
  Regen for WITH_OFED.

Modified:
  head/share/man/man5/src.conf.5

Modified: head/share/man/man5/src.conf.5
==
--- head/share/man/man5/src.conf.5  Tue May 17 11:06:41 2011
(r222016)
+++ head/share/man/man5/src.conf.5  Tue May 17 11:08:15 2011
(r222017)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z 
ru
 .\" $FreeBSD$
-.Dd May 10, 2011
+.Dd May 17, 2011
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -712,6 +712,11 @@ will not be built either if this option 
 Set to not build
 .Xr ntpd 8
 and related programs.
+.It Va WITH_OFED
+.\" from FreeBSD: head/tools/build/options/WITH_OFED 222016 2011-05-17 
11:06:41Z ru
+Set to build the
+.Dq "OpenFabrics Enterprise Distribution"
+Infiniband software stack.
 .It Va WITHOUT_OPENSSH
 .\" from FreeBSD: head/tools/build/options/WITHOUT_OPENSSH 156932 2006-03-21 
07:50:50Z ru
 Set to not build OpenSSH.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222016 - head/tools/build/options

[Ruslan Ermilov]

Author: ru
Date: Tue May 17 11:06:41 2011
New Revision: 222016
URL: http://svn.freebsd.org/changeset/base/222016

Log:
  Added description for WITH_OFED.

Added:
  head/tools/build/options/WITH_OFED   (contents, props changed)

Added: head/tools/build/options/WITH_OFED
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/tools/build/options/WITH_OFED  Tue May 17 11:06:41 2011
(r222016)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to build the
+.Dq "OpenFabrics Enterprise Distribution"
+Infiniband software stack.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r222014 - head/share/misc

[Ruslan Ermilov]

Author: ru
Date: Tue May 17 10:44:11 2011
New Revision: 222014
URL: http://svn.freebsd.org/changeset/base/222014

Log:
  Revert change to "MF" I made in r189767.  I bet that at the time of r189767
  I checked with http://www.iso.org/iso/country_codes/iso_3166_code_lists.htm
  and "MF" was officially spelled in English as "Saint Martin" there, but now
  that "SX" exists (for "Sint Maarten (Dutch part)") (nice official "English"
  spelling!) they seem to have added a "(French part)" suffix to "MF".  Since
  this is also in line with Newsletter VI-1 (2007-09-21), catch up.

Modified:
  head/share/misc/iso3166

Modified: head/share/misc/iso3166
==
--- head/share/misc/iso3166 Tue May 17 10:38:44 2011(r222013)
+++ head/share/misc/iso3166 Tue May 17 10:44:11 2011(r222014)
@@ -206,7 +206,7 @@ RW  RWA 646 Rwanda
 BL BLM 652 Saint Barthelemy
 KN KNA 659 Saint Kitts and Nevis
 LC LCA 662 Saint Lucia
-MF MAF 663 Saint Martin
+MF MAF 663 Saint Martin (French Part)
 VC VCT 670 Saint Vincent and the Grenadines
 WS WSM 882 Samoa
 SM SMR 674 San Marino
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221832 - head/usr.bin/mkuzip

[Ruslan Ermilov]

Author: ru
Date: Fri May 13 09:55:48 2011
New Revision: 221832
URL: http://svn.freebsd.org/changeset/base/221832

Log:
  Fixed an embedded shell script.
  
  Reviewed by:  sobomax

Modified:
  head/usr.bin/mkuzip/mkuzip.c

Modified: head/usr.bin/mkuzip/mkuzip.c
==
--- head/usr.bin/mkuzip/mkuzip.cFri May 13 09:52:04 2011
(r221831)
+++ head/usr.bin/mkuzip/mkuzip.cFri May 13 09:55:48 2011
(r221832)
@@ -31,7 +31,7 @@
 
 #define CLOOP_MAGIC_LEN 128
 static char CLOOP_MAGIC_START[] = "#!/bin/sh\n#V2.0 Format\n"
-"m=geom_uzip\n(kldstat -m $m 2>&-||kldload $m)>&-&&"
+"(kldstat -qm g_uzip||kldload geom_uzip)>&-&&"
 "mount_cd9660 /dev/`mdconfig -af $0`.uzip $1\nexit $?\n";
 
 static char *readblock(int, char *, u_int32_t);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221734 - head/share/man/man5

[Ruslan Ermilov]

Author: ru
Date: Tue May 10 13:25:42 2011
New Revision: 221734
URL: http://svn.freebsd.org/changeset/base/221734

Log:
  Regen.

Modified:
  head/share/man/man5/src.conf.5

Modified: head/share/man/man5/src.conf.5
==
--- head/share/man/man5/src.conf.5  Tue May 10 13:01:11 2011
(r221733)
+++ head/share/man/man5/src.conf.5  Tue May 10 13:25:42 2011
(r221734)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
-.\" from FreeBSD: head/tools/build/options/makeman 221161 2011-04-28 11:21:49Z 
des
+.\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z 
ru
 .\" $FreeBSD$
-.Dd April 30, 2011
+.Dd May 10, 2011
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -78,9 +78,9 @@ The following list provides a name and s
 that can be used for source builds.
 .Bl -tag -width indent
 .It Va WITHOUT_ACCT
-.\" from FreeBSD: head/tools/build/options/WITHOUT_ACCT 183242 2008-09-21 
22:02:26Z sam
+.\" from FreeBSD: head/tools/build/options/WITHOUT_ACCT 221540 2011-05-06 
19:13:03Z ru
 Set to not build process accounting tools such as
-.Xr ac 8 
+.Xr ac 8
 and
 .Xr accton 8 .
 .It Va WITHOUT_ACPI
@@ -132,6 +132,8 @@ When set, it also enforces the following
 .It
 .Va WITHOUT_BIND_ETC
 .It
+.Va WITHOUT_BIND_LIBS
+.It
 .Va WITHOUT_BIND_LIBS_LWRES
 .It
 .Va WITHOUT_BIND_MTREE
@@ -253,6 +255,15 @@ When set, it also enforces the following
 .It Va WITHOUT_CLANG
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CLANG 208971 2010-06-10 
06:20:26Z ed
 Set to not build the Clang C/C++ compiler.
+.Pp
+It is a default setting on
+arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mipseb, mips/mips64el, 
mips/mips64eb, mips/mipsn32eb, powerpc/powerpc64, sparc64/sparc64 and 
sun4v/sparc64.
+.It Va WITH_CLANG
+.\" from FreeBSD: head/tools/build/options/WITH_CLANG 221730 2011-05-10 
11:14:40Z ru
+Set to build the Clang C/C++ compiler.
+.Pp
+It is a default setting on
+amd64/amd64, i386/i386, pc98/i386 and powerpc/powerpc.
 .It Va WITHOUT_CPP
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 
07:50:50Z ru
 Set to not build
@@ -264,10 +275,6 @@ When set, it also enforces the following
 .Pp
 .Bl -item -compact
 .It
-.Va WITHOUT_GSSAPI
-(can be overridden with
-.Va WITH_GSSAPI )
-.It
 .Va WITHOUT_KERBEROS
 .It
 .Va WITHOUT_KERBEROS_SUPPORT
@@ -276,6 +283,15 @@ When set, it also enforces the following
 .It
 .Va WITHOUT_OPENSSL
 .El
+.Pp
+When set, the following options are also in effect:
+.Pp
+.Bl -inset -compact
+.It Va WITHOUT_GSSAPI
+(unless
+.Va WITH_GSSAPI
+is set explicitly)
+.El
 .It Va WITHOUT_CTM
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CTM 183242 2008-09-21 
22:02:26Z sam
 Set to not build
@@ -285,7 +301,7 @@ and related utilities.
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CVS 156932 2006-03-21 
07:50:50Z ru
 Set to not build CVS.
 .It Va WITHOUT_CXX
-.\" from FreeBSD: head/tools/build/options/WITHOUT_CXX 220401 2011-04-06 
20:08:23Z uqs
+.\" from FreeBSD: head/tools/build/options/WITHOUT_CXX 220402 2011-04-06 
20:19:07Z uqs
 Set to not build
 .Xr g++ 1
 and related libraries.
@@ -316,12 +332,22 @@ dynamically.
 Set to avoid installing examples to
 .Pa /usr/share/examples/ .
 .It Va WITHOUT_FDT
-.\" from FreeBSD: head/tools/build/options/WITHOUT_FDT 218942 2011-02-22 
08:20:12Z uqs
-Set to not build Flattened Device Tree support as part of the base system. This
-includes the device tree compiler (dtc) and libfdt support library.
+.\" from FreeBSD: head/tools/build/options/WITHOUT_FDT 221539 2011-05-06 
19:10:27Z ru
+Set to not build Flattened Device Tree support as part of the base system.
+This includes the device tree compiler (dtc) and libfdt support library.
+.Pp
+It is a default setting on
+amd64/amd64, i386/i386, ia64/ia64, mips/mipsel, mips/mipseb, mips/mips64el, 
mips/mips64eb, mips/mipsn32eb, pc98/i386, powerpc/powerpc64, sparc64/sparc64 
and sun4v/sparc64.
+.It Va WITH_FDT
+.\" from FreeBSD: head/tools/build/options/WITH_FDT 221730 2011-05-10 
11:14:40Z ru
+Set to build Flattened Device Tree support as part of the base system.
+This includes the device tree compiler (dtc) and libfdt support library.
+.Pp
+It is a default setting on
+arm/arm, arm/armeb and powerpc/powerpc.
 .It Va WITHOUT_FLOPPY
-.\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 183306 2008-09-23 
16:15:42Z sam
-Set to not build or install programs 
+.\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 
19:13:03Z ru
+Set to not build or install programs
 for operating floppy disk driver.
 .It Va WITHOUT_FORTH
 .\" from FreeBSD: head/tools/build/options/WITHOUT_FORTH 156932 2006-03-21 
07:50:50Z ru
@@ -367,9 +393,11 @@ Set to build some programs without optio
 .It Va WITHOUT_GPIB
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GPIB 156932 2006-03-21 
07:50:50Z ru
 Set to not build GPIB bus support.
-.It Va WITH_GPIO
-.\" from FreeBSD: head/tools/build/options/W

svn commit: r221733 - head/tools/build/options

[Ruslan Ermilov]

Author: ru
Date: Tue May 10 13:01:11 2011
New Revision: 221733
URL: http://svn.freebsd.org/changeset/base/221733

Log:
  Reassurance for impatient.

Modified:
  head/tools/build/options/makeman

Modified: head/tools/build/options/makeman
==
--- head/tools/build/options/makemanTue May 10 12:57:39 2011
(r221732)
+++ head/tools/build/options/makemanTue May 10 13:01:11 2011
(r221733)
@@ -260,6 +260,7 @@ EOF
done
echo '.El'
fi
+   twiddle >&2
done
cat 

svn commit: r221732 - head/tools/build/options

[Ruslan Ermilov]

Author: ru
Date: Tue May 10 12:57:39 2011
New Revision: 221732
URL: http://svn.freebsd.org/changeset/base/221732

Log:
  Style.

Modified:
  head/tools/build/options/makeman

Modified: head/tools/build/options/makeman
==
--- head/tools/build/options/makemanTue May 10 12:40:35 2011
(r221731)
+++ head/tools/build/options/makemanTue May 10 12:57:39 2011
(r221732)
@@ -206,21 +206,21 @@ EOF
if [ ! -f ${opt} ] ; then
echo "no description found for ${opt}, skipping" >&2
continue
-   else
-   echo ".It Va ${opt}"
-   sed -e's/\$\(FreeBSD: .*\) \$/from \1/' ${opt}
-   if [ -n "${targets}" ] ; then
-   echo '.Pp'
-   echo 'It is a default setting on'
-   echo $(echo ${targets} | sed -e's/ /, /g' 
-e's/\(.*\), /\1 and /').
-   fi
fi
 
-   if [ "${opt%%_*}" = "WITHOUT" ] ; then
+   echo ".It Va ${opt}"
+   sed -e's/\$\(FreeBSD: .*\) \$/from \1/' ${opt}
+   if [ -n "${targets}" ] ; then
+   echo '.Pp'
+   echo 'It is a default setting on'
+   echo $(echo ${targets} | sed -e's/ /, /g' -e's/\(.*\), 
/\1 and /').
+   fi
+
+   if [ "${opt%%_*}" = 'WITHOUT' ] ; then
sed -n "/^WITH_${opt#WITHOUT_}$/!s/$/=/p" 
$t/config_WITH_ALL > $t/src.conf
show settings SRCCONF=$t/src.conf -D${opt} | sort > 
$t/config_WITH_ALL_${opt}
comm -13 $t/config_WITH_ALL $t/config_WITH_ALL_${opt} | 
sed -n "/^${opt}$/!p" > $t/deps
-   elif [ "${opt%%_*}" = "WITH" ] ; then
+   elif [ "${opt%%_*}" = 'WITH' ] ; then
sed -n "/^WITHOUT${opt#WITH}$/!s/$/=/p" 
$t/config_WITHOUT_ALL > $t/src.conf
show settings SRCCONF=$t/src.conf -D${opt} | sort > 
$t/config_WITHOUT_ALL_${opt}
comm -13 $t/config_WITHOUT_ALL 
$t/config_WITHOUT_ALL_${opt} | sed -n "/^${opt}$/!p" > $t/deps
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221730 - head/tools/build/options

[Ruslan Ermilov]

Author: ru
Date: Tue May 10 11:14:40 2011
New Revision: 221730
URL: http://svn.freebsd.org/changeset/base/221730

Log:
  - There now exist options that have different defaults depending on
the architecture, reflect this in documentation.  For such
options, both WITH_FOO and WITHOUT_FOO description files should
be provided.
  
Prodded by: des
  
  - Setting a build option may enforce other build options, try harder
to detect this case.
  
  - Setting a build option may change other option's default value,
try harder to detect this case.

Added:
  head/tools/build/options/WITH_CLANG
 - copied, changed from r221204, head/tools/build/options/WITHOUT_CLANG
  head/tools/build/options/WITH_FDT
 - copied, changed from r221539, head/tools/build/options/WITHOUT_FDT
Modified:
  head/tools/build/options/makeman

Copied and modified: head/tools/build/options/WITH_CLANG (from r221204, 
head/tools/build/options/WITHOUT_CLANG)
==
--- head/tools/build/options/WITHOUT_CLANG  Fri Apr 29 10:33:54 2011
(r221204, copy source)
+++ head/tools/build/options/WITH_CLANG Tue May 10 11:14:40 2011
(r221730)
@@ -1,2 +1,2 @@
 .\" $FreeBSD$
-Set to not build the Clang C/C++ compiler.
+Set to build the Clang C/C++ compiler.

Copied and modified: head/tools/build/options/WITH_FDT (from r221539, 
head/tools/build/options/WITHOUT_FDT)
==
--- head/tools/build/options/WITHOUT_FDTFri May  6 19:10:27 2011
(r221539, copy source)
+++ head/tools/build/options/WITH_FDT   Tue May 10 11:14:40 2011
(r221730)
@@ -1,3 +1,3 @@
 .\" $FreeBSD$
-Set to not build Flattened Device Tree support as part of the base system.
+Set to build Flattened Device Tree support as part of the base system.
 This includes the device tree compiler (dtc) and libfdt support library.

Modified: head/tools/build/options/makeman
==
--- head/tools/build/options/makemanTue May 10 11:06:14 2011
(r221729)
+++ head/tools/build/options/makemanTue May 10 11:14:40 2011
(r221730)
@@ -2,34 +2,98 @@
 #
 # This file is in the public domain.
 
+set -o errexit
+
 ident='$FreeBSD$'
 
+t=$(mktemp -d -t makeman)
+trap 'test -d $t && rm -rf $t' exit
+
 #
-# usage: show { settings | options } ...
+# usage: no_targets all_targets yes_targets
+#
+no_targets()
+{
+   for t1 in $1 ; do
+   for t2 in $2 ; do
+   if [ "${t1}" = "${t2}" ] ; then
+   continue 2
+   fi
+   done
+   echo ${t1}
+   done
+}
+
+show_options()
+{
+   ALL_TARGETS=$(echo $(make -C ../../.. targets | tail -n +2))
+   rm -f $t/settings
+   for target in ${ALL_TARGETS} ; do
+   make -C ../../.. showconfig \
+   SRCCONF=/dev/null __MAKE_CONF=/dev/null \
+   TARGET_ARCH=${target#*/} TARGET=${target%/*} |
+   while read var _ val ; do
+   opt=${var#MK_}
+   case ${val} in
+   yes)
+   echo ${opt} ${target}
+   ;;
+   no)
+   echo ${opt}
+   ;;
+   *)
+   echo 'make showconfig broken' >&2
+   exit 1
+   ;;
+   esac
+   done > $t/settings.target
+   if [ -r $t/settings ] ; then
+   join -t\  $t/settings $t/settings.target > 
$t/settings.new
+   mv $t/settings.new $t/settings
+   else
+   mv $t/settings.target $t/settings
+   fi
+   done
+
+   cat $t/settings | while read opt targets ; do
+   if [ "${targets}" = "${ALL_TARGETS}" ] ; then
+   echo "WITHOUT_${opt}"
+   elif [ -z "${targets}" ] ; then
+   echo "WITH_${opt}"
+   else
+   echo "WITHOUT_${opt}" $(no_targets "${ALL_TARGETS}" 
"${targets}")
+   echo "WITH_${opt} ${targets}"
+   fi
+   done
+}
+
+#
+# usage: show { settings | with | without } ...
 #
 show()
 {
 
-   mode=$1; shift
+   mode=$1 ; shift
case ${mode} in
settings)
yes_prefix=WITH
no_prefix=WITHOUT
;;
-   options)
-   yes_prefix=WITHOUT
+   with)
+   yes_prefix=WITH
no_prefix=WITH
;;
+   without)
+   yes_prefix=WITHOUT
+   no_prefix=WITHOUT
+   ;;
*)
-   echo "internal error" >/de

svn commit: r221729 - head/tools/build/options

[Ruslan Ermilov]

Author: ru
Date: Tue May 10 11:06:14 2011
New Revision: 221729
URL: http://svn.freebsd.org/changeset/base/221729

Log:
  The Objective C support was removed in r220755.
  
  Submitted by: des

Deleted:
  head/tools/build/options/WITHOUT_OBJC
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221728 - head/share/mk

[Ruslan Ermilov]

Author: ru
Date: Tue May 10 11:00:40 2011
New Revision: 221728
URL: http://svn.freebsd.org/changeset/base/221728

Log:
  Removed unsupported options MK_BINUTILS and MK_GCC that were
  silently added in r218936.

Modified:
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkTue May 10 10:58:57 2011(r221727)
+++ head/share/mk/bsd.own.mkTue May 10 11:00:40 2011(r221728)
@@ -297,7 +297,6 @@ __DEFAULT_YES_OPTIONS = \
 BIND_MTREE \
 BIND_NAMED \
 BIND_UTILS \
-BINUTILS \
 BLUETOOTH \
 BOOT \
 BSD_CPIO \
@@ -318,7 +317,6 @@ __DEFAULT_YES_OPTIONS = \
 FP_LIBC \
 FREEBSD_UPDATE \
 GAMES \
-GCC \
 GCOV \
 GDB \
 GNU \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221726 - head/share/mk

[Ruslan Ermilov]

Author: ru
Date: Tue May 10 10:48:43 2011
New Revision: 221726
URL: http://svn.freebsd.org/changeset/base/221726

Log:
  Another fallout from r220359: MK_GNU_CPIO was mistakenly re-added
  after being removed in r205702.  Remove it again.

Modified:
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkTue May 10 07:12:11 2011(r221725)
+++ head/share/mk/bsd.own.mkTue May 10 10:48:43 2011(r221726)
@@ -394,7 +394,6 @@ __DEFAULT_NO_OPTIONS = \
 BIND_LIBS \
 BIND_SIGCHASE \
 BIND_XML \
-GNU_CPIO \
 HESIOD \
 ICONV \
 IDEA \
@@ -405,7 +404,7 @@ __DEFAULT_NO_OPTIONS = \
 # this means that we have to test TARGET_ARCH (the buildworld case) as well
 # as MACHINE_ARCH (the non-buildworld case).  Normally TARGET_ARCH is not
 # used at all in bsd.*.mk, but we have to make an exception here if we want
-# to allow defaults for some things like clang and ftd to vary by target
+# to allow defaults for some things like clang and fdt to vary by target
 # architecture.
 #
 .if defined(TARGET_ARCH)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221541 - head/tools/build/options

[Ruslan Ermilov]

Author: ru
Date: Fri May  6 19:14:06 2011
New Revision: 221541
URL: http://svn.freebsd.org/changeset/base/221541

Log:
  MK_GPIO changed its default; reflect.

Added:
  head/tools/build/options/WITHOUT_GPIO
 - copied, changed from r221204, head/tools/build/options/WITH_GPIO
Deleted:
  head/tools/build/options/WITH_GPIO

Copied and modified: head/tools/build/options/WITHOUT_GPIO (from r221204, 
head/tools/build/options/WITH_GPIO)
==
--- head/tools/build/options/WITH_GPIO  Fri Apr 29 10:33:54 2011
(r221204, copy source)
+++ head/tools/build/options/WITHOUT_GPIO   Fri May  6 19:14:06 2011
(r221541)
@@ -1,2 +1,4 @@
 .\" $FreeBSD$
-Set to build gpioctl(8) as part of the base system.
+Set to not build
+.Xr gpioctl 8
+as part of the base system.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221540 - head/tools/build/options

[Ruslan Ermilov]

Author: ru
Date: Fri May  6 19:13:03 2011
New Revision: 221540
URL: http://svn.freebsd.org/changeset/base/221540

Log:
  Removed trailing whitespace.

Modified:
  head/tools/build/options/WITHOUT_ACCT
  head/tools/build/options/WITHOUT_FLOPPY

Modified: head/tools/build/options/WITHOUT_ACCT
==
--- head/tools/build/options/WITHOUT_ACCT   Fri May  6 19:10:27 2011
(r221539)
+++ head/tools/build/options/WITHOUT_ACCT   Fri May  6 19:13:03 2011
(r221540)
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
 Set to not build process accounting tools such as
-.Xr ac 8 
+.Xr ac 8
 and
 .Xr accton 8 .

Modified: head/tools/build/options/WITHOUT_FLOPPY
==
--- head/tools/build/options/WITHOUT_FLOPPY Fri May  6 19:10:27 2011
(r221539)
+++ head/tools/build/options/WITHOUT_FLOPPY Fri May  6 19:13:03 2011
(r221540)
@@ -1,3 +1,3 @@
 .\" $FreeBSD$
-Set to not build or install programs 
+Set to not build or install programs
 for operating floppy disk driver.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221539 - head/tools/build/options

[Ruslan Ermilov]

Author: ru
Date: Fri May  6 19:10:27 2011
New Revision: 221539
URL: http://svn.freebsd.org/changeset/base/221539

Log:
  Tidy up formatting.

Modified:
  head/tools/build/options/WITHOUT_FDT

Modified: head/tools/build/options/WITHOUT_FDT
==
--- head/tools/build/options/WITHOUT_FDTFri May  6 18:40:51 2011
(r221538)
+++ head/tools/build/options/WITHOUT_FDTFri May  6 19:10:27 2011
(r221539)
@@ -1,3 +1,3 @@
 .\" $FreeBSD$
-Set to not build Flattened Device Tree support as part of the base system. This
-includes the device tree compiler (dtc) and libfdt support library.
+Set to not build Flattened Device Tree support as part of the base system.
+This includes the device tree compiler (dtc) and libfdt support library.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221533 - head/contrib/one-true-awk

[Ruslan Ermilov]

Author: ru
Date: Fri May  6 14:21:46 2011
New Revision: 221533
URL: http://svn.freebsd.org/changeset/base/221533

Log:
  Update to a 6-May-2011 release (upstreamed some of our changes).

Deleted:
  head/contrib/one-true-awk/proctab.c
Modified:
  head/contrib/one-true-awk/FIXES
  head/contrib/one-true-awk/main.c
Directory Properties:
  head/contrib/one-true-awk/   (props changed)

Modified: head/contrib/one-true-awk/FIXES
==
--- head/contrib/one-true-awk/FIXES Fri May  6 14:11:20 2011
(r221532)
+++ head/contrib/one-true-awk/FIXES Fri May  6 14:21:46 2011
(r221533)
@@ -25,6 +25,11 @@ THIS SOFTWARE.
 This file lists all bug fixes, changes, etc., made since the AWK book
 was sent to the printers in August, 1987.
 
+May 6, 2011:
+   added #ifdef for isblank.
+   now allows -ffoo as well as -f foo arguments.
+   (thanks, ruslan)
+
 May 1, 2011:
after advice from todd miller, kevin lo, ruslan ermilov,
and arnold robbins, changed srand() to return the previous

Modified: head/contrib/one-true-awk/main.c
==
--- head/contrib/one-true-awk/main.cFri May  6 14:11:20 2011
(r221532)
+++ head/contrib/one-true-awk/main.cFri May  6 14:21:46 2011
(r221533)
@@ -25,7 +25,7 @@ THIS SOFTWARE.
 #include 
 __FBSDID("$FreeBSD$");
 
-const char *version = "version 20110501 (FreeBSD)";
+const char *version = "version 20110506 (FreeBSD)";
 
 #define DEBUG
 #include 
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
safe = 1;
break;
case 'f':   /* next argument is program filename */
-   if (argv[1][2] != 0) {  /* arg is -fsomething */
+   if (argv[1][2] != 0) {  /* arg is -fsomething */
if (npfile >= MAX_PFILE - 1)
FATAL("too many -f options"); 
pfile[npfile++] = &argv[1][2];
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221492 - head/usr.bin/nfsstat

[Ruslan Ermilov]

Author: ru
Date: Thu May  5 10:17:49 2011
New Revision: 221492
URL: http://svn.freebsd.org/changeset/base/221492

Log:
  - Add a forgotten -o to usage().
  - Sync usage() with manpage's SYNOPSIS.

Modified:
  head/usr.bin/nfsstat/nfsstat.c

Modified: head/usr.bin/nfsstat/nfsstat.c
==
--- head/usr.bin/nfsstat/nfsstat.c  Thu May  5 10:17:08 2011
(r221491)
+++ head/usr.bin/nfsstat/nfsstat.c  Thu May  5 10:17:49 2011
(r221492)
@@ -646,7 +646,7 @@ void
 usage(void)
 {
(void)fprintf(stderr,
-   "usage: nfsstat [-ceszW] [-M core] [-N system] [-w interval]\n");
+   "usage: nfsstat [-ceoszW] [-M core] [-N system] [-w wait]\n");
exit(1);
 }
 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221491 - head/usr.bin/nfsstat

[Ruslan Ermilov]

Author: ru
Date: Thu May  5 10:17:08 2011
New Revision: 221491
URL: http://svn.freebsd.org/changeset/base/221491

Log:
  [mdoc] remove a hard sentence break.

Modified:
  head/usr.bin/nfsstat/nfsstat.1

Modified: head/usr.bin/nfsstat/nfsstat.1
==
--- head/usr.bin/nfsstat/nfsstat.1  Thu May  5 09:55:55 2011
(r221490)
+++ head/usr.bin/nfsstat/nfsstat.1  Thu May  5 10:17:08 2011
(r221491)
@@ -66,7 +66,8 @@ instead of the default
 Extract the name list from the specified system instead of the default
 .Pa /boot/kernel/kernel .
 .It Fl o
-Report statistics for the old NFS client and/or server. Without this
+Report statistics for the old NFS client and/or server.
+Without this
 option statistics for the new NFS client and/or server will be reported.
 .It Fl s
 Only display server side statistics.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221436 - in head: sbin/mount_nfs sys/fs/nfsclient sys/nfs sys/nfsclient

[Ruslan Ermilov]

Author: ru
Date: Wed May  4 13:27:45 2011
New Revision: 221436
URL: http://svn.freebsd.org/changeset/base/221436

Log:
  Implemented a mount option "nocto" that disables cache coherency
  checking at open time.  It may improve performance for read-only
  NFS mounts.  Use deliberately.
  
  MFC after:1 week
  Reviewed by:  rmacklem, jhb (earlier version)

Modified:
  head/sbin/mount_nfs/mount_nfs.8
  head/sys/fs/nfsclient/nfs_clvfsops.c
  head/sys/fs/nfsclient/nfs_clvnops.c
  head/sys/nfs/nfs_diskless.c
  head/sys/nfsclient/nfs_vfsops.c
  head/sys/nfsclient/nfs_vnops.c
  head/sys/nfsclient/nfsargs.h

Modified: head/sbin/mount_nfs/mount_nfs.8
==
--- head/sbin/mount_nfs/mount_nfs.8 Wed May  4 13:20:44 2011
(r221435)
+++ head/sbin/mount_nfs/mount_nfs.8 Wed May  4 13:27:45 2011
(r221436)
@@ -28,7 +28,7 @@
 .\"@(#)mount_nfs.8 8.3 (Berkeley) 3/29/95
 .\" $FreeBSD$
 .\"
-.Dd April 27, 2011
+.Dd May 3, 2011
 .Dt MOUNT_NFS 8
 .Os
 .Sh NAME
@@ -180,6 +180,17 @@ NFS port number 2049 or replies to reque
 Setting the
 .Va vfs.nfs.nfs_ip_paranoia
 sysctl to 0 will make this option the default.
+.It Cm nocto
+Normally, NFS clients maintain the close-to-open cache coherency.
+This works by flushing at close time and checking at open time.
+Checking at open time is implemented by getting attributes from
+the server and purging the data cache if they do not match
+attributes cached by the client.
+.Pp
+This option disables checking at open time.
+It may improve performance for read-only mounts,
+but should only be used if the data on the server changes rarely.
+Be sure to understand the consequences before enabling this option.
 .It Cm noinet4 , noinet6
 Disables
 .Dv AF_INET

Modified: head/sys/fs/nfsclient/nfs_clvfsops.c
==
--- head/sys/fs/nfsclient/nfs_clvfsops.cWed May  4 13:20:44 2011
(r221435)
+++ head/sys/fs/nfsclient/nfs_clvfsops.cWed May  4 13:27:45 2011
(r221436)
@@ -716,7 +716,7 @@ static const char *nfs_opts[] = { "from"
 "retrans", "acregmin", "acregmax", "acdirmin", "acdirmax", "resvport",
 "readahead", "hostname", "timeout", "addr", "fh", "nfsv3", "sec",
 "principal", "nfsv4", "gssname", "allgssname", "dirpath",
-"negnametimeo",
+"negnametimeo", "nocto",
 NULL };
 
 /*
@@ -833,6 +833,8 @@ nfs_mount(struct mount *mp)
}
if (vfs_getopt(mp->mnt_optnew, "allgssname", NULL, NULL) == 0)
args.flags |= NFSMNT_ALLGSSNAME;
+   if (vfs_getopt(mp->mnt_optnew, "nocto", NULL, NULL) == 0)
+   args.flags |= NFSMNT_NOCTO;
if (vfs_getopt(mp->mnt_optnew, "readdirsize", (void **)&opt, NULL) == 
0) {
if (opt == NULL) { 
vfs_mount_error(mp, "illegal readdirsize");

Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==
--- head/sys/fs/nfsclient/nfs_clvnops.c Wed May  4 13:20:44 2011
(r221435)
+++ head/sys/fs/nfsclient/nfs_clvnops.c Wed May  4 13:27:45 2011
(r221436)
@@ -1026,7 +1026,8 @@ nfs_lookup(struct vop_lookup_args *ap)
 */
newvp = *vpp;
newnp = VTONFS(newvp);
-   if ((flags & (ISLASTCN | ISOPEN)) == (ISLASTCN | ISOPEN) &&
+   if (!(nmp->nm_flag & NFSMNT_NOCTO) &&
+   (flags & (ISLASTCN | ISOPEN)) == (ISLASTCN | ISOPEN) &&
!(newnp->n_flag & NMODIFIED)) {
mtx_lock(&newnp->n_mtx);
newnp->n_attrstamp = 0;

Modified: head/sys/nfs/nfs_diskless.c
==
--- head/sys/nfs/nfs_diskless.c Wed May  4 13:20:44 2011(r221435)
+++ head/sys/nfs/nfs_diskless.c Wed May  4 13:27:45 2011(r221436)
@@ -112,6 +112,8 @@ nfs_parse_options(const char *envopts, s
nd->flags |= NFSMNT_NOCONN;
else if (strcmp(o, "nolockd") == 0)
nd->flags |= NFSMNT_NOLOCKD;
+   else if (strcmp(o, "nocto") == 0)
+   nd->flags |= NFSMNT_NOCTO;
else if (strcmp(o, "nfsv2") == 0)
nd->flags &= ~(NFSMNT_NFSV3 | NFSMNT_NFSV4);
else if (strcmp(o, "nfsv3") == 0) {

Modified: head/sys/nfsclient/nfs_vfsops.c
==
--- head/sys/nfsclient/nfs_vfsops.c Wed May  4 13:20:44 2011
(r221435)
+++ head/sys/nfsclient/nfs_vfsops.c Wed May  4 13:27:45 2011
(r221436)
@@ -786,7 +786,7 @@ static const char *nfs_opts[] = { "from"
 "readahead", "readdirsize", "soft", "hard", "mntudp", "tcp", "udp",
 "wsize", "rsize", "retrans", "acregmin", "acregmax", "acdirmin",
 "acdirmax", "deadthresh", "ho

svn commit: r221429 - head/sys/fs/nfsclient

[Ruslan Ermilov]

Author: ru
Date: Wed May  4 11:22:52 2011
New Revision: 221429
URL: http://svn.freebsd.org/changeset/base/221429

Log:
  In ncl_printf(), call vprintf() instead of printf().
  
  MFC after:3 days

Modified:
  head/sys/fs/nfsclient/nfs_clsubs.c

Modified: head/sys/fs/nfsclient/nfs_clsubs.c
==
--- head/sys/fs/nfsclient/nfs_clsubs.c  Wed May  4 09:52:34 2011
(r221428)
+++ head/sys/fs/nfsclient/nfs_clsubs.c  Wed May  4 11:22:52 2011
(r221429)
@@ -167,7 +167,7 @@ ncl_printf(const char *fmt, ...)
 
mtx_lock(&Giant);
va_start(ap, fmt);
-   printf(fmt, ap);
+   vprintf(fmt, ap);
va_end(ap);
mtx_unlock(&Giant);
 }
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221385 - head/share/man/man4

[Ruslan Ermilov]

Author: ru
Date: Tue May  3 13:34:40 2011
New Revision: 221385
URL: http://svn.freebsd.org/changeset/base/221385

Log:
  Fixed the HISTORY section which was copied without editing from aio(4).
  
  Submitted by: Igor Sysoev

Modified:
  head/share/man/man4/sem.4

Modified: head/share/man/man4/sem.4
==
--- head/share/man/man4/sem.4   Tue May  3 13:16:02 2011(r221384)
+++ head/share/man/man4/sem.4   Tue May  3 13:34:40 2011(r221385)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 11, 2006
+.Dd May 3, 2011
 .Dt SEM 4
 .Os
 .Sh NAME
@@ -73,9 +73,5 @@ dynamic kernel module.
 .Sh HISTORY
 The
 .Nm
-facility appeared as a kernel option in
-.Fx 3.0 .
-The
-.Nm
-kernel module appeared in
+facility appeared in
 .Fx 5.0 .
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221383 - head/usr.bin/calendar/calendars

[Ruslan Ermilov]

Author: ru
Date: Tue May  3 12:29:03 2011
New Revision: 221383
URL: http://svn.freebsd.org/changeset/base/221383

Log:
  Fixed bad format and misorder.

Modified:
  head/usr.bin/calendar/calendars/calendar.freebsd

Modified: head/usr.bin/calendar/calendars/calendar.freebsd
==
--- head/usr.bin/calendar/calendars/calendar.freebsdTue May  3 12:22:46 
2011(r221382)
+++ head/usr.bin/calendar/calendars/calendar.freebsdTue May  3 12:29:03 
2011(r221383)
@@ -45,8 +45,8 @@
 02/01  Juli Mallett  born in Washington, Pennsylvania, 
United States, 1985
 02/02  Diomidis D. Spinellis  born in Athens, Greece, 1967
 02/02  Michael W Lucas  born in Detroit, Michigan, United 
States, 1967
-02/02  Yoichi Nakayama  born in Tsu, Mie, Japan, 1976
 02/02  Dmitry Chagin  born in Stalingrad, USSR, 1976
+02/02  Yoichi Nakayama  born in Tsu, Mie, Japan, 1976
 02/05  Frank Laszlo  born in Howell, Michigan, United 
States, 1983
 02/10  David Greenman  born in Portland, Oregon, United 
States, 1968
 02/10  Paul Richards  born in Ammanford, Carmarthenshire, 
United Kingdom, 1968
@@ -68,7 +68,6 @@
 02/24  Johan Karlsson  born in Mariannelund, Sweden, 1974
 02/24  Colin Percival  born in Burnaby, Canada, 1981
 02/26  Pietro Cerutti  born in Faido, Switzerland, 1984
-05/19  Sofian Brabez  born in Toulouse, France, 1984
 02/28  Daichi GOTO  born in Shimizu Suntou, Shizuoka, 
Japan, 1980
 03/01  Hye-Shik Chang  born in Daejeon, Republic of Korea, 
1980
 03/02  Cy Schubert  born in Edmonton, Alberta, Canada, 1956
@@ -151,7 +150,8 @@
 05/17  Thomas Abthorpe  born in Port Arthur, Ontario, 
Canada, 1968
 05/19  Philippe Charnier  born in Fontainebleau, France, 
1966
 05/19  Ian Dowse  born in Dublin, Ireland, 1975
-05/20  Dan Moschuk  died in Burlington, Ontario, Canada, 
2010 
+05/19  Sofian Brabez  born in Toulouse, France, 1984
+05/20  Dan Moschuk  died in Burlington, Ontario, Canada, 2010
 05/21  Kris Kennaway  born in Winnipeg, Manitoba, Canada, 
1978
 05/22  Clive Tong-I Lin  born in Changhua, Taiwan, Republic 
of China, 1978
 05/22  Michael Bushkov  born in Rostov-on-Don, Russian 
Federation, 1985
@@ -175,7 +175,7 @@
 06/04  Justin Gibbs  born in San Pedro, California, United 
States, 1973
 06/04  Jason Evans  born in Greeley, Colorado, United 
States, 1973
 06/04  Thomas Moestl  born in Braunschweig, Niedersachsen, 
Germany, 1980
-06/04  Zack Kirsch  born in Memphis, Tennessee, United 
States, 1982
+06/04  Zack Kirsch  born in Memphis, Tennessee, United 
States, 1982
 06/06  Sergei Kolobov  born in Karpinsk, Russian 
Federation, 1972
 06/06  Alan Eldridge  died in Denver, Colorado, 2003
 06/07  Jimmy Olgeni  born in Milano, Italy, 1976
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221382 - head/etc

[Ruslan Ermilov]

Author: ru
Date: Tue May  3 12:22:46 2011
New Revision: 221382
URL: http://svn.freebsd.org/changeset/base/221382

Log:
  Updated `flags' field description.

Modified:
  head/etc/newsyslog.conf

Modified: head/etc/newsyslog.conf
==
--- head/etc/newsyslog.conf Tue May  3 11:47:19 2011(r221381)
+++ head/etc/newsyslog.conf Tue May  3 12:22:46 2011(r221382)
@@ -8,7 +8,7 @@
 # is no process which needs to be signalled when a given log file is
 # rotated, then the entry for that file should include the 'N' flag.
 #
-# The 'flags' field is one or more of the letters: BCGJNUWZ or a '-'.
+# The 'flags' field is one or more of the letters: BCDGJNUXZ or a '-'.
 #
 # Note: some sites will want to select more restrictive protections than the
 # defaults.  In particular, it may be desirable to switch many of the 644
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221381 - head/contrib/one-true-awk

[Ruslan Ermilov]

Author: ru
Date: Tue May  3 11:47:19 2011
New Revision: 221381
URL: http://svn.freebsd.org/changeset/base/221381

Log:
  Update to a 1-May-2011 release (except for the isblank change).

Modified:
  head/contrib/one-true-awk/FIXES
  head/contrib/one-true-awk/README
  head/contrib/one-true-awk/b.c
  head/contrib/one-true-awk/lib.c
  head/contrib/one-true-awk/main.c
  head/contrib/one-true-awk/makefile
  head/contrib/one-true-awk/run.c
Directory Properties:
  head/contrib/one-true-awk/   (props changed)

Modified: head/contrib/one-true-awk/FIXES
==
--- head/contrib/one-true-awk/FIXES Tue May  3 11:39:00 2011
(r221380)
+++ head/contrib/one-true-awk/FIXES Tue May  3 11:47:19 2011
(r221381)
@@ -25,6 +25,32 @@ THIS SOFTWARE.
 This file lists all bug fixes, changes, etc., made since the AWK book
 was sent to the printers in August, 1987.
 
+May 1, 2011:
+   after advice from todd miller, kevin lo, ruslan ermilov,
+   and arnold robbins, changed srand() to return the previous
+   seed (which is 1 on the first call of srand).  the seed is
+   an Awkfloat internally though converted to unsigned int to
+   pass to the library srand().  thanks, everyone. 
+
+   fixed a subtle (and i hope low-probability) overflow error
+   in fldbld, by adding space for one extra \0.  thanks to 
+   robert bassett for spotting this one and providing a fix.
+
+   removed the files related to compilation on windows.  i no
+   longer have anything like a current windows environment, so
+   i can't test any of it.
+
+May 23, 2010:
+   fixed long-standing overflow bug in run.c; many thanks to
+   nelson beebe for spotting it and providing the fix.
+
+   fixed bug that didn't parse -vd=1 properly; thanks to santiago
+   vila for spotting it.
+
+Feb 8, 2010:
+   i give up.  replaced isblank with isspace in b.c; there are
+   no consistent header files.
+
 Nov 26, 2009:
fixed a long-standing issue with when FS takes effect.  a
change to FS is now noticed immediately for subsequent splits.

Modified: head/contrib/one-true-awk/README
==
--- head/contrib/one-true-awk/READMETue May  3 11:39:00 2011
(r221380)
+++ head/contrib/one-true-awk/READMETue May  3 11:47:19 2011
(r221381)
@@ -29,7 +29,7 @@ by Al Aho, Brian Kernighan, and Peter We
 Changes, mostly bug fixes and occasional enhancements, are listed
 in FIXES.  If you distribute this code further, please please please
 distribute FIXES with it.  If you find errors, please report them
-to b...@bell-labs.com.  Thanks.
+to b...@cs.princeton.edu.  Thanks.
 
 The program itself is created by
make

Modified: head/contrib/one-true-awk/b.c
==
--- head/contrib/one-true-awk/b.c   Tue May  3 11:39:00 2011
(r221380)
+++ head/contrib/one-true-awk/b.c   Tue May  3 11:47:19 2011
(r221381)
@@ -752,7 +752,7 @@ Node *unary(Node *np)
 /* #define HAS_ISBLANK */
 #ifndef HAS_ISBLANK
 
-int (isblank)(int c)
+int (xisblank)(int c)
 {
return c==' ' || c=='\t';
 }
@@ -766,7 +766,11 @@ struct charclass {
 } charclasses[] = {
{ "alnum",  5,  isalnum },
{ "alpha",  5,  isalpha },
+#ifndef HAS_ISBLANK
+   { "blank",  5,  isspace }, /* was isblank */
+#else
{ "blank",  5,  isblank },
+#endif
{ "cntrl",  5,  iscntrl },
{ "digit",  5,  isdigit },
{ "graph",  5,  isgraph },

Modified: head/contrib/one-true-awk/lib.c
==
--- head/contrib/one-true-awk/lib.c Tue May  3 11:39:00 2011
(r221380)
+++ head/contrib/one-true-awk/lib.c Tue May  3 11:47:19 2011
(r221381)
@@ -256,6 +256,7 @@ void fldbld(void)   /* create fields from 
 {
/* this relies on having fields[] the same length as $0 */
/* the fields are all stored in this one array with \0's */
+   /* possibly with a final trailing \0 not associated with any field */
char *r, *fr, sep;
Cell *p;
int i, j, n;
@@ -268,7 +269,7 @@ void fldbld(void)   /* create fields from 
n = strlen(r);
if (n > fieldssize) {
xfree(fields);
-   if ((fields = (char *) malloc(n+1)) == NULL)
+   if ((fields = (char *) malloc(n+2)) == NULL) /* possibly 2 
final \0s */
FATAL("out of space for fields in fldbld %d", n);
fieldssize = n;
}

Modified: head/contrib/one-true-awk/main.c
=

svn commit: r221373 - head/contrib/bsnmp/snmp_mibII

[Ruslan Ermilov]

Author: ru
Date: Tue May  3 10:11:44 2011
New Revision: 221373
URL: http://svn.freebsd.org/changeset/base/221373

Log:
  Properly detect interface's state in the LINK_STATE_UNKNOWN case.
  
  MFC after:1 week

Modified:
  head/contrib/bsnmp/snmp_mibII/mibII_interfaces.c

Modified: head/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
==
--- head/contrib/bsnmp/snmp_mibII/mibII_interfaces.cTue May  3 10:08:11 
2011(r221372)
+++ head/contrib/bsnmp/snmp_mibII/mibII_interfaces.cTue May  3 10:11:44 
2011(r221373)
@@ -289,8 +289,7 @@ op_ifentry(struct snmp_context *ctx, str
 * cable) and hence return 'dormant'.
 */
if (ifp->mib.ifmd_flags & IFF_RUNNING) {
-   if (ifp->mib.ifmd_data.ifi_link_state ==
-   LINK_STATE_DOWN)
+   if (ifp->mib.ifmd_data.ifi_link_state != LINK_STATE_UP)
value->v.integer = 5;   /* state dormant */
else
value->v.integer = 1;   /* state up */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r221372 - head/bin/stty

[Ruslan Ermilov]

Author: ru
Date: Tue May  3 10:08:11 2011
New Revision: 221372
URL: http://svn.freebsd.org/changeset/base/221372

Log:
  Don't call -f option's argument "stdin".
  
  MFC after:3 days

Modified:
  head/bin/stty/stty.c

Modified: head/bin/stty/stty.c
==
--- head/bin/stty/stty.cTue May  3 10:01:08 2011(r221371)
+++ head/bin/stty/stty.cTue May  3 10:08:11 2011(r221372)
@@ -61,9 +61,11 @@ main(int argc, char *argv[])
struct info i;
enum FMT fmt;
int ch;
+   const char *file;
 
fmt = NOTSET;
i.fd = STDIN_FILENO;
+   file = "stdin";
 
opterr = 0;
while (optind < argc &&
@@ -79,6 +81,7 @@ main(int argc, char *argv[])
case 'f':
if ((i.fd = open(optarg, O_RDONLY | O_NONBLOCK)) < 0)
err(1, "%s", optarg);
+   file = optarg;
break;
case 'g':
fmt = GFLAG;
@@ -92,7 +95,7 @@ args: argc -= optind;
argv += optind;
 
if (tcgetattr(i.fd, &i.t) < 0)
-   errx(1, "stdin isn't a terminal");
+   errx(1, "%s isn't a terminal", file);
if (ioctl(i.fd, TIOCGETD, &i.ldisc) < 0)
err(1, "TIOCGETD");
if (ioctl(i.fd, TIOCGWINSZ, &i.win) < 0)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r220882 - head/contrib/bsnmp/snmpd

[Ruslan Ermilov]

Author: ru
Date: Wed Apr 20 08:38:25 2011
New Revision: 220882
URL: http://svn.freebsd.org/changeset/base/220882

Log:
  Don't spam syslog with "inet_ntop(): Address family not supported
  by protocol family" when processing requests received from the
  UNIX domain socket.
  
  MFC after:3 days

Modified:
  head/contrib/bsnmp/snmpd/main.c

Modified: head/contrib/bsnmp/snmpd/main.c
==
--- head/contrib/bsnmp/snmpd/main.c Wed Apr 20 08:05:23 2011
(r220881)
+++ head/contrib/bsnmp/snmpd/main.c Wed Apr 20 08:38:25 2011
(r220882)
@@ -1214,7 +1214,8 @@ snmpd_input(struct port_input *pi, struc
/*
 * In case of AF_INET{6} peer, do hosts_access(5) check.
 */
-   if (inet_ntop(pi->peer->sa_family,
+   if (pi->peer->sa_family != AF_LOCAL &&
+   inet_ntop(pi->peer->sa_family,
&((const struct sockaddr_in *)(const void *)pi->peer)->sin_addr,
client, sizeof(client)) != NULL) {
request_set(&req, RQ_CLIENT_ADDR, client, 0);
@@ -1223,7 +1224,7 @@ snmpd_input(struct port_input *pi, struc
eval_client(&req));
return (-1);
}
-   } else
+   } else if (pi->peer->sa_family != AF_LOCAL)
syslog(LOG_ERR, "inet_ntop(): %m");
 #endif
 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r220801 - head/sbin/conscontrol

[Ruslan Ermilov]

Author: ru
Date: Mon Apr 18 20:28:07 2011
New Revision: 220801
URL: http://svn.freebsd.org/changeset/base/220801

Log:
  Changed "conscontrol unset" to accept an existing virtual
  console device as an argument.  Unsetting virtual console
  using /dev/console seems to have never worked.
  
  MFC after:3 days

Modified:
  head/sbin/conscontrol/conscontrol.8
  head/sbin/conscontrol/conscontrol.c

Modified: head/sbin/conscontrol/conscontrol.8
==
--- head/sbin/conscontrol/conscontrol.8 Mon Apr 18 20:07:08 2011
(r220800)
+++ head/sbin/conscontrol/conscontrol.8 Mon Apr 18 20:28:07 2011
(r220801)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 23, 2001
+.Dd April 14, 2011
 .Dt CONSCONTROL 8
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Cm add | delete
 .Ar console
 .Nm
-.Cm set Ar console | Cm unset
+.Cm set | unset Ar console
 .Sh DESCRIPTION
 The
 .Nm
@@ -91,7 +91,7 @@ the name of the directory may be omitted
 Change the state of console muting.
 All console output is suppressed when console muting is
 .Cm on .
-.It Cm set Ar console | Cm unset
+.It Cm set | unset Ar console
 Set or unset the virtual console.
 When unset, output from the system, such as the kernel
 .Xr printf 9 ,

Modified: head/sbin/conscontrol/conscontrol.c
==
--- head/sbin/conscontrol/conscontrol.c Mon Apr 18 20:07:08 2011
(r220800)
+++ head/sbin/conscontrol/conscontrol.c Mon Apr 18 20:28:07 2011
(r220801)
@@ -50,7 +50,7 @@ usage(void)
"usage: conscontrol [list]",
"   conscontrol mute on | off",
"   conscontrol add | delete console",
-   "   conscontrol set console | unset");
+   "   conscontrol set | unset console");
exit(1);
 }
 
@@ -153,28 +153,16 @@ consdel(char *devnam)
 }
 
 static void
-consset(char *devnam)
+consset(char *devnam, int flag)
 {
-   int ttyfd, flag = 1;
+   int ttyfd;
 
ttyfd = open(devnam, O_RDONLY);
if (ttyfd == -1)
err(1, "opening %s", devnam);
if (ioctl(ttyfd, TIOCCONS, &flag) == -1)
-   err(1, "could not set %s as virtual console", devnam);
-   close(ttyfd);
-}
-
-static void
-consunset(void)
-{
-   int ttyfd, flag = 0;
-
-   ttyfd = open(DEVDIR "console", O_RDONLY);
-   if (ttyfd == -1)
-   err(1, "opening virtual console");
-   if (ioctl(ttyfd, TIOCCONS, &flag) == -1)
-   err(1, "could not unset virtual console");
+   err(1, "could not %s %s as virtual console",
+   flag ? "set" : "unset", devnam);
close(ttyfd);
 }
 
@@ -188,9 +176,7 @@ main(int argc, char **argv)
argv += optind;
 
if (argc > 0 && strcmp(argv[0], "list") != 0) {
-   if (argc == 1 && strcmp(argv[0], "unset") == 0)
-   consunset();
-   else if (argc != 2)
+   if (argc != 2)
usage();
else if (strcmp(argv[0], "mute") == 0)
consmute(argv[1]);
@@ -199,7 +185,9 @@ main(int argc, char **argv)
else if (strcmp(argv[0], "delete") == 0)
consdel(argv[1]);
else if (strcmp(argv[0], "set") == 0)
-   consset(argv[1]);
+   consset(argv[1], 1);
+   else if (strcmp(argv[0], "unset") == 0)
+   consset(argv[1], 0);
else
usage();
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r220614 - head/sys/dev/ipmi

[Ruslan Ermilov]

Author: ru
Date: Thu Apr 14 07:14:22 2011
New Revision: 220614
URL: http://svn.freebsd.org/changeset/base/220614

Log:
  Fixed firmware revision decoding:
  - the major is 7-bit binary encoded
  - the minor is BCD encoded
  
  PR:   kern/151586
  MFC after:3 days

Modified:
  head/sys/dev/ipmi/ipmi.c

Modified: head/sys/dev/ipmi/ipmi.c
==
--- head/sys/dev/ipmi/ipmi.cThu Apr 14 00:07:08 2011(r220613)
+++ head/sys/dev/ipmi/ipmi.cThu Apr 14 07:14:22 2011(r220614)
@@ -713,10 +713,10 @@ ipmi_startup(void *arg)
return;
}
 
-   device_printf(dev, "IPMI device rev. %d, firmware rev. %d.%d, "
+   device_printf(dev, "IPMI device rev. %d, firmware rev. %d.%d%d, "
"version %d.%d\n",
 req->ir_reply[1] & 0x0f,
-req->ir_reply[2] & 0x0f, req->ir_reply[4],
+req->ir_reply[2] & 0x7f, req->ir_reply[3] >> 4, req->ir_reply[3] & 
0x0f,
 req->ir_reply[4] & 0x0f, req->ir_reply[4] >> 4);
 
ipmi_free_request(req);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r220596 - head/usr.bin/nfsstat

[Ruslan Ermilov]

Author: ru
Date: Wed Apr 13 13:05:48 2011
New Revision: 220596
URL: http://svn.freebsd.org/changeset/base/220596

Log:
  Show client's access cache statistics.

Modified:
  head/usr.bin/nfsstat/nfsstat.c

Modified: head/usr.bin/nfsstat/nfsstat.c
==
--- head/usr.bin/nfsstat/nfsstat.c  Wed Apr 13 12:46:25 2011
(r220595)
+++ head/usr.bin/nfsstat/nfsstat.c  Wed Apr 13 13:05:48 2011
(r220596)
@@ -321,14 +321,15 @@ intpr(int clientOnly, int serverOnly)
nfsstats.write_bios);
printf("%9.9s %9.9s %9.9s %9.9s",
"BioRLHits", "Misses", "BioD Hits", "Misses");
-   printf(" %9.9s %9.9s\n", "DirE Hits", "Misses");
+   printf(" %9.9s %9.9s %9.9s %9.9s\n", "DirE Hits", "Misses", 
"Accs Hits", "Misses");
printf("%9d %9d %9d %9d",
nfsstats.biocache_readlinks-nfsstats.readlink_bios,
nfsstats.readlink_bios,
nfsstats.biocache_readdirs-nfsstats.readdir_bios,
nfsstats.readdir_bios);
-   printf(" %9d %9d\n",
-   nfsstats.direofcache_hits, nfsstats.direofcache_misses);
+   printf(" %9d %9d %9d %9d\n",
+   nfsstats.direofcache_hits, nfsstats.direofcache_misses,
+   nfsstats.accesscache_hits, nfsstats.accesscache_misses);
}
if (serverOnly && !nfsrvstatsp) {
printf("Server not present!\n");
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r220595 - head/sys/nfsclient

[Ruslan Ermilov]

Author: ru
Date: Wed Apr 13 12:46:25 2011
New Revision: 220595
URL: http://svn.freebsd.org/changeset/base/220595

Log:
  - Fixed nfs_printf() to use vprintf().
  - Fixed vfs.nfs.acdebug sysctl's description.
  - Fixed panic when compiled with NFS_ACDEBUG.
  
  MFC after:3 days

Modified:
  head/sys/nfsclient/nfs_subs.c

Modified: head/sys/nfsclient/nfs_subs.c
==
--- head/sys/nfsclient/nfs_subs.c   Wed Apr 13 12:19:03 2011
(r220594)
+++ head/sys/nfsclient/nfs_subs.c   Wed Apr 13 12:46:25 2011
(r220595)
@@ -442,7 +442,7 @@ nfs_printf(const char *fmt, ...)
 
mtx_lock(&Giant);
va_start(ap, fmt);
-   printf(fmt, ap);
+   vprintf(fmt, ap);
va_end(ap);
mtx_unlock(&Giant);
 }
@@ -656,7 +656,7 @@ out:
 SYSCTL_DECL(_vfs_nfs);
 static int nfs_acdebug;
 SYSCTL_INT(_vfs_nfs, OID_AUTO, acdebug, CTLFLAG_RW, &nfs_acdebug, 0,
-"Toggle acdebug (access cache debug) flag");
+"Toggle acdebug (attribute cache debug) flag");
 #endif
 
 /*
@@ -713,6 +713,9 @@ nfs_getattrcache(struct vnode *vp, struc
if ((time_second - np->n_attrstamp) >= timeo) {
nfsstats.attrcache_misses++;
mtx_unlock(&np->n_mtx);
+#ifdef NFS_ACDEBUG
+   mtx_unlock(&Giant); /* nfs_printf() */
+#endif
KDTRACE_NFS_ATTRCACHE_GET_MISS(vp);
return (ENOENT);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r220041 - head/usr.bin/netstat

[Ruslan Ermilov]

Author: ru
Date: Sat Mar 26 19:09:28 2011
New Revision: 220041
URL: http://svn.freebsd.org/changeset/base/220041

Log:
  Fixed sockets display somewhat (-L, -T, -x, -Lx, with and without -A).
  (I didn't try to fix negative TCP timers with -x.)
  
  MFC after:3 days

Modified:
  head/usr.bin/netstat/inet.c

Modified: head/usr.bin/netstat/inet.c
==
--- head/usr.bin/netstat/inet.c Sat Mar 26 17:17:24 2011(r220040)
+++ head/usr.bin/netstat/inet.c Sat Mar 26 19:09:28 2011(r220041)
@@ -411,44 +411,47 @@ protopr(u_long off, const char *name, in
"Current listen queue sizes (qlen/incqlen/maxqlen)");
putchar('\n');
if (Aflag)
-   printf("%-8.8s ", "Tcpcb");
+   printf("%-*s ", 2 * (int)sizeof(void *), 
"Tcpcb");
if (Lflag)
-   printf("%-5.5s %-14.14s %-22.22s\n",
+   printf((Aflag && !Wflag) ?
+   "%-5.5s %-14.14s %-18.18s" :
+   "%-5.5s %-14.14s %-22.22s",
"Proto", "Listen", "Local Address");
-   if (Tflag) 
+   else if (Tflag)
printf((Aflag && !Wflag) ?
-   "%-5.5s %-6.6s %-6.6s %-6.6s %-18.18s %s\n" :
-   "%-5.5s %-6.6s %-6.6s %-6.6s %-22.22s %s\n",
+   "%-5.5s %-6.6s %-6.6s %-6.6s %-18.18s %s" :
+   "%-5.5s %-6.6s %-6.6s %-6.6s %-22.22s %s",
"Proto", "Rexmit", "OOORcv", "0-win",
"Local Address", "Foreign Address");
+   else {
+   printf((Aflag && !Wflag) ? 
+  "%-5.5s %-6.6s %-6.6s %-18.18s %-18.18s" 
:
+  "%-5.5s %-6.6s %-6.6s %-22.22s %-22.22s",
+  "Proto", "Recv-Q", "Send-Q",
+  "Local Address", "Foreign Address");
+   if (!xflag)
+   printf(" (state)");
+   }
if (xflag) {
-   printf("%-6.6s %-6.6s %-6.6s %-6.6s %-6.6s 
%-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s ",
+   printf(" %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s 
%-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s %-6.6s",
   "R-MBUF", "S-MBUF", "R-CLUS", 
   "S-CLUS", "R-HIWA", "S-HIWA", 
   "R-LOWA", "S-LOWA", "R-BCNT", 
   "S-BCNT", "R-BMAX", "S-BMAX");
-   printf("%7.7s %7.7s %7.7s %7.7s %7.7s %7.7s 
%s\n",
+   printf(" %7.7s %7.7s %7.7s %7.7s %7.7s %7.7s",
   "rexmt", "persist", "keep",
-  "2msl", "delack", "rcvtime",
-  "(state)");
-   }
-   if (!xflag && !Tflag) {
-   printf((Aflag && !Wflag) ? 
-  "%-5.5s %-6.6s %-6.6s  %-18.18s 
%-18.18s" :
-  "%-5.5s %-6.6s %-6.6s  %-22.22s 
%-22.22s",
-  "Proto", "Recv-Q", "Send-Q",
-  "Local Address", "Foreign Address");
-   printf("(state)\n");
+  "2msl", "delack", "rcvtime");
}
+   putchar('\n');
first = 0;
}
if (Lflag && so->so_qlimit == 0)
continue;
if (Aflag) {
if (istcp)
-   printf("%8lx ", (u_long)inp->inp_ppcb);
+   printf("%*lx ", 2 * (int)sizeof(void *), 
(u_long)inp->inp_ppcb);
else
-   printf("%8lx ", (u_long)so->so_pcb);
+   printf("%*lx ", 2 * (int)sizeof(void *), 
(u_long)so->so_pcb);
}
 #ifdef INET6
if ((inp->inp_vflag & INP_IPV6) != 0)
@@ -527,32 +530,21 @@ protopr(u_long off, const char *name, in
 #endif /* INET6 */
}
if (xflag) {
-   if (Lflag)
-   printf("%21s %6u %6u %6u %6u %6u %6u %6u %6u 
%6u %6u %6u %6u ",
-  " ",
-  so->so_rcv.sb_mcnt, so->so_snd.sb_mcnt,
-   

svn commit: r219958 - head/usr.bin/xargs

[Ruslan Ermilov]

Author: ru
Date: Thu Mar 24 13:52:59 2011
New Revision: 219958
URL: http://svn.freebsd.org/changeset/base/219958

Log:
  Discourage from using "cp -r".

Modified:
  head/usr.bin/xargs/xargs.1

Modified: head/usr.bin/xargs/xargs.1
==
--- head/usr.bin/xargs/xargs.1  Thu Mar 24 13:18:09 2011(r219957)
+++ head/usr.bin/xargs/xargs.1  Thu Mar 24 13:52:59 2011(r219958)
@@ -33,7 +33,7 @@
 .\" $FreeBSD$
 .\" $xMach: xargs.1,v 1.2 2002/02/23 05:23:37 tim Exp $
 .\"
-.Dd January 26, 2008
+.Dd March 24, 2011
 .Dt XARGS 1
 .Os
 .Sh NAME
@@ -163,7 +163,7 @@ directories which start with an uppercas
 directory to
 .Pa destdir :
 .Pp
-.Dl /bin/ls -1d [A-Z]* | xargs -J % cp -rp % destdir
+.Dl /bin/ls -1d [A-Z]* | xargs -J % cp -Rp % destdir
 .Pp
 .It Fl L Ar number
 Call
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r219955 - head/sbin/umount

[Ruslan Ermilov]

Author: ru
Date: Thu Mar 24 12:35:09 2011
New Revision: 219955
URL: http://svn.freebsd.org/changeset/base/219955

Log:
  It's possible to unmount multiple items at once, make it clear.

Modified:
  head/sbin/umount/umount.8
  head/sbin/umount/umount.c

Modified: head/sbin/umount/umount.8
==
--- head/sbin/umount/umount.8   Thu Mar 24 12:04:42 2011(r219954)
+++ head/sbin/umount/umount.8   Thu Mar 24 12:35:09 2011(r219955)
@@ -37,7 +37,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl fv
-.Ar special | node | fsid
+.Ar special ... | node ... | fsid ...
 .Nm
 .Fl a | A
 .Op Fl F Ar fstab

Modified: head/sbin/umount/umount.c
==
--- head/sbin/umount/umount.c   Thu Mar 24 12:04:42 2011(r219954)
+++ head/sbin/umount/umount.c   Thu Mar 24 12:35:09 2011(r219955)
@@ -599,7 +599,7 @@ usage(void)
 {
 
(void)fprintf(stderr, "%s\n%s\n",
-   "usage: umount [-fv] special | node | fsid",
+   "usage: umount [-fv] special ... | node ... | fsid ...",
"   umount -a | -A [-F fstab] [-fv] [-h host] [-t type]");
exit(1);
 }
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r219434 - head/usr.sbin/newsyslog

[Ruslan Ermilov]

Author: ru
Date: Wed Mar  9 17:07:36 2011
New Revision: 219434
URL: http://svn.freebsd.org/changeset/base/219434

Log:
  Sync manpage's SYNOPSIS with program's usage.

Modified:
  head/usr.sbin/newsyslog/newsyslog.8
  head/usr.sbin/newsyslog/newsyslog.c

Modified: head/usr.sbin/newsyslog/newsyslog.8
==
--- head/usr.sbin/newsyslog/newsyslog.8 Wed Mar  9 16:56:51 2011
(r219433)
+++ head/usr.sbin/newsyslog/newsyslog.8 Wed Mar  9 17:07:36 2011
(r219434)
@@ -26,13 +26,12 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl CFNPnrsv
-.Op Fl R Ar tagname
-.Op Fl S Ar pidfile
 .Op Fl a Ar directory
 .Op Fl d Ar directory
 .Op Fl f Ar config_file
+.Op Fl S Ar pidfile
 .Op Fl t Ar timefmt
-.Op Ar
+.Op Oo Fl R Ar tagname Oc Ar
 .Sh DESCRIPTION
 The
 .Nm

Modified: head/usr.sbin/newsyslog/newsyslog.c
==
--- head/usr.sbin/newsyslog/newsyslog.c Wed Mar  9 16:56:51 2011
(r219433)
+++ head/usr.sbin/newsyslog/newsyslog.c Wed Mar  9 17:07:36 2011
(r219434)
@@ -775,8 +775,8 @@ usage(void)
 {
 
fprintf(stderr,
-   "usage: newsyslog [-CFNnrsv] [-a directory] [-d directory] [-f 
config-file]\n"
-   " [-S pidfile] [-t timefmt ] [ [-R requestor] 
filename ... ]\n");
+   "usage: newsyslog [-CFNPnrsv] [-a directory] [-d directory] [-f 
config_file]\n"
+   " [-S pidfile] [-t timefmt] [[-R tagname] file 
...]\n");
exit(1);
 }
 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r219125 - head/usr.sbin/mountd

[Ruslan Ermilov]

Author: ru
Date: Tue Mar  1 11:47:16 2011
New Revision: 219125
URL: http://svn.freebsd.org/changeset/base/219125

Log:
  Fixed conversion of prefix length to a netmask.

Modified:
  head/usr.sbin/mountd/mountd.c

Modified: head/usr.sbin/mountd/mountd.c
==
--- head/usr.sbin/mountd/mountd.c   Tue Mar  1 11:04:30 2011
(r219124)
+++ head/usr.sbin/mountd/mountd.c   Tue Mar  1 11:47:16 2011
(r219125)
@@ -2875,7 +2875,7 @@ makemask(struct sockaddr_storage *ssp, i
 
for (i = 0; i < len; i++) {
bits = (bitlen > CHAR_BIT) ? CHAR_BIT : bitlen;
-   *p++ = (1 << bits) - 1;
+   *p++ = (u_char)~0 << (CHAR_BIT - bits);
bitlen -= bits;
}
return 0;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r216349 - head/share/man/man4

[Ruslan Ermilov]

Author: ru
Date: Fri Dec 10 07:55:38 2010
New Revision: 216349
URL: http://svn.freebsd.org/changeset/base/216349

Log:
  Document this driver supports the converter I just bought.

Modified:
  head/share/man/man4/uplcom.4

Modified: head/share/man/man4/uplcom.4
==
--- head/share/man/man4/uplcom.4Fri Dec 10 05:18:37 2010
(r216348)
+++ head/share/man/man4/uplcom.4Fri Dec 10 07:55:38 2010
(r216349)
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 22, 2006
+.Dd December 10, 2010
 .Dt UPLCOM 4
 .Os
 .Sh NAME
@@ -105,6 +105,8 @@ SOURCENEXT KeikaiDenwa 8 (with and witho
 .It
 Sony Ericsson USB Cable (Susteen USB Data Cable)
 .It
+TRENDnet USB to Serial Converter (TU-S9)
+.It
 Willcom W-SIM DD PHS terminal.(WS002IN)
 .El
 .Sh SEE ALSO
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r214974 - head/usr.bin/calendar/calendars

[Ruslan Ermilov]

Author: ru
Date: Mon Nov  8 09:50:47 2010
New Revision: 214974
URL: http://svn.freebsd.org/changeset/base/214974

Log:
  Add/expand country/state.

Modified:
  head/usr.bin/calendar/calendars/calendar.freebsd

Modified: head/usr.bin/calendar/calendars/calendar.freebsd
==
--- head/usr.bin/calendar/calendars/calendar.freebsdMon Nov  8 09:26:56 
2010(r214973)
+++ head/usr.bin/calendar/calendars/calendar.freebsdMon Nov  8 09:50:47 
2010(r214974)
@@ -41,7 +41,7 @@
 02/01  Paul Saab  born in Champaign-Urbana, Illinois, United 
States, 1978
 02/01  Martin Wilke  born in Ludwigsfelde, Brandenburg, 
Germany, 1980
 02/01  Christian Brueffer  born in Gronau, 
Nordrhein-Westfalen, Germany, 1982
-02/01  Steven Kreuzer  born in Oceanside, New York, 1982
+02/01  Steven Kreuzer  born in Oceanside, New York, 
United States, 1982
 02/01  Juli Mallett  born in Washington, Pennsylvania, 
United States, 1985
 02/02  Diomidis D. Spinellis  born in Athens, Greece, 1967
 02/02  Michael W Lucas  born in Detroit, Michigan, United 
States, 1967
@@ -151,7 +151,7 @@
 05/19  Ian Dowse  born in Dublin, Ireland, 1975
 05/21  Kris Kennaway  born in Winnipeg, Manitoba, Canada, 
1978
 05/22  Clive Tong-I Lin  born in Changhua, Taiwan, Republic 
of China, 1978
-05/22  Michael Bushkov  born in Rostov-on-Don, Russia, 
1985
+05/22  Michael Bushkov  born in Rostov-on-Don, Russian 
Federation, 1985
 05/22  Rui Paulo  born in Evora, Portugal, 1986
 05/23  Munechika Sumikawa  born in Osaka, Osaka, Japan, 
1972
 05/24  Duncan McLennan Barclay  born in London, Middlesex, 
United Kingdom, 1970
@@ -164,9 +164,9 @@
 05/29  Seigo Tanimura  born in Kitakyushu, Fukuoka, 
Japan, 1976
 05/31  Ville Skytta  born in Helsinki, Finland, 1974
 06/02  Jean-Marc Zucconi  born in Pontarlier, France, 1954
-06/02  Alexander Botero-Lowry  born in Austin, TX, USA, 
1986
+06/02  Alexander Botero-Lowry  born in Austin, Texas, 
United States, 1986
 06/03  CHOI Junho  born in Seoul, Korea, 1974
-06/03  Wesley Shields  born in Binghamton, NY, USA, 1981
+06/03  Wesley Shields  born in Binghamton, New York, United 
States, 1981
 06/04  Julian Elischer  born in Perth, Australia, 1959
 06/04  Justin Gibbs  born in San Pedro, California, United 
States, 1973
 06/04  Jason Evans  born in Greeley, Colorado, United 
States, 1973
@@ -229,7 +229,7 @@
 08/07  Jonathan Mini  born in San Mateo, California, United 
States, 1979
 08/10  Peter Pentchev  born in Sofia, Bulgaria, 1977
 08/12  Joe Marcus Clarke  born in Lakeland, Florida, 
United States, 1976
-08/12  Max Brazhnikov  born in Leningradskaya, Russia, 1979
+08/12  Max Brazhnikov  born in Leningradskaya, Russian 
Federation, 1979
 08/14  Stefan Esser  born in Cologne, Nordrhein-Westfalen, 
Germany, 1961
 08/17  Olivier Houchard  born in Nancy, France, 1980
 08/19  Chin-San Huang  born in Yi-Lan, Taiwan, Republic 
of China, 1979
@@ -272,7 +272,7 @@
 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
-10/09  Stefan Walter  born in Werne, Nordrhein-Westfalen, 
1978
+10/09  Stefan Walter  born in Werne, Nordrhein-Westfalen, 
Germany, 1978
 10/12  Pawel Jakub Dawidek  born in Radzyn Podlaski, Poland, 
1980
 10/15  Maxim Konovalov  born in Khabarovsk, USSR, 1973
 10/16  Remko Lodder  born in Rotterdam, the Netherlands, 
1983
@@ -290,7 +290,7 @@
 10/26  Philip M. Gollucci  born in Silver Spring, 
Maryland, United States, 1979
 10/27  Takanori Watanabe  born in Numazu, Shizuoka, 
Japan, 1972
 11/05  M. Warner Losh  born in Kansas City, Kansas, United 
States, 1966
-11/09  Coleman Kane  born in Cincinnati, OH, United 
States, 1980
+11/09  Coleman Kane  born in Cincinnati, Ohio, United 
States, 1980
 11/09  Antoine Brodin  born in Bagnolet, France, 1981
 11/10  Gregory Neil Shapiro  born in Providence, Rhode 
Island, United States, 1970
 11/13  John Baldwin  born in Stuart, Virginia, United 
States, 1977
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r214973 - head/usr.bin/calendar/calendars

[Ruslan Ermilov]

Author: ru
Date: Mon Nov  8 09:26:56 2010
New Revision: 214973
URL: http://svn.freebsd.org/changeset/base/214973

Log:
  A traditional (once per three years) sort by month/day/year/login.
  While here, fixed badly formatted lines.

Modified:
  head/usr.bin/calendar/calendars/calendar.freebsd

Modified: head/usr.bin/calendar/calendars/calendar.freebsd
==
--- head/usr.bin/calendar/calendars/calendar.freebsdMon Nov  8 07:54:24 
2010(r214972)
+++ head/usr.bin/calendar/calendars/calendar.freebsdMon Nov  8 09:26:56 
2010(r214973)
@@ -7,8 +7,8 @@
 #ifndef _calendar_freebsd_
 #define _calendar_freebsd_
 
-01/01  Alexander Langer  born in Duesseldorf, 
Nordrhein-Westfalen, Germany, 1981
 01/01  Dimitry Andric  born in Utrecht, the Netherlands, 1969
+01/01  Alexander Langer  born in Duesseldorf, 
Nordrhein-Westfalen, Germany, 1981
 01/02  Ion-Mihai "IOnut" Tetcu  born in Bucharest, 
Romania, 1980
 01/02  Patrick Li  born in Beijing, People's Republic of 
China, 1985
 01/03  Tetsurou Okazaki  born in Mobara, Chiba, Japan, 
1972
@@ -24,13 +24,13 @@
 01/16  Vanilla I. Shu  born in Taipei, Taiwan, Republic 
of China, 1978
 01/18  Dejan Lesjak  born in Ljubljana, Slovenia, 
Yugoslavia, 1977
 01/19  Marshall Kirk McKusick  born in Wilmington, 
Delaware, United States, 1954
-01/19  Marcelo S. Araujo  born in Joinville, Santa 
Catarina, Brazil, 1981
 01/19  Ruslan Ermilov  born in Simferopol, USSR, 1974
+01/19  Marcelo S. Araujo  born in Joinville, Santa 
Catarina, Brazil, 1981
 01/20  Poul-Henning Kamp  born in Korsoer, Denmark, 1966
 01/22  Johann Visagie  born in Cape Town, South Africa, 1970
 01/23  Hideyuki KURASHINA  born in Niigata, Japan, 1982
-01/24  Matteo Riondato  born in Padova, Italy, 1986
 01/24  Fabien Thomas  born in Avignon, France, 1971
+01/24  Matteo Riondato  born in Padova, Italy, 1986
 01/25  Bernd Walter  born in Moers, Nordrhein-Westfalen, 
Germany, 1974
 01/26  Andrew Gallatin  born in Buffalo, New York, 
United States, 1970
 01/27  Nick Sayer  born in San Diego, California, United 
States, 1968
@@ -43,19 +43,19 @@
 02/01  Christian Brueffer  born in Gronau, 
Nordrhein-Westfalen, Germany, 1982
 02/01  Steven Kreuzer  born in Oceanside, New York, 1982
 02/01  Juli Mallett  born in Washington, Pennsylvania, 
United States, 1985
-02/02   Michael W Lucas  born in Detroit, Michigan, 
United States, 1967
 02/02  Diomidis D. Spinellis  born in Athens, Greece, 1967
+02/02  Michael W Lucas  born in Detroit, Michigan, United 
States, 1967
 02/02  Yoichi Nakayama  born in Tsu, Mie, Japan, 1976
 02/05  Frank Laszlo  born in Howell, Michigan, United 
States, 1983
 02/10  David Greenman  born in Portland, Oregon, United 
States, 1968
 02/10  Paul Richards  born in Ammanford, Carmarthenshire, 
United Kingdom, 1968
 02/10  Simon Barner  born in Rosenheim, Bayern, Germany, 
1980
 02/13  Jesper Skriver  born in Aarhus, Denmark, 1975
+02/13  Steve Wills  born in Lynchburg, Virginia, United 
States, 1975
 02/13  Andrey Slusar  born in Odessa, USSR, 1979
 02/13  David W. Chapman Jr.  born in Bethel, Connecticut, 
United States, 1981
-02/13  Steve Wills  born in Lynchburg, Virginia, United 
States, 1975
-02/14  Erwin Lansing  born in 's-Hertogenbosch, the 
Netherlands, 1975
 02/14  Manolis Kiagias  born in Chania, Greece, 1970
+02/14  Erwin Lansing  born in 's-Hertogenbosch, the 
Netherlands, 1975
 02/14  Martin Blapp  born in Olten, Switzerland, 1976
 02/19  Murray Stokely  born in Jacksonville, Florida, 
United States, 1979
 02/20  Anders Nordby  born in Oslo, Norway, 1976
@@ -92,10 +92,10 @@
 03/17  Alexander Motin  born in Simferopol, Ukraine, 1979
 03/18  Koop Mast  born in Dokkum, the Netherlands, 1981
 03/19  Mikhail Teterin  born in Kyiv, Ukraine, 1972
+03/20  Joseph S. Atkinson  born in Batesville, Arkansas, 
United States, 1977
+03/20  Henrik Brix Andersen  born in Aarhus, Denmark, 1978
 03/20  MANTANI Nobutaka  born in Hiroshima, Japan, 1978
 03/20  Cameron Grant  died in Hemel Hempstead, United 
Kingdom, 2005
-03/20  Henrik Brix Andersen  born in Aarhus, Denmark, 1978
-03/20  Joseph S. Atkinson  born in Batesville, Arkansas, 
United States, 1977
 03/22  Brad Davis  born in Farmington, New Mexico, United 
States, 1983
 03/23  Daniel C. Sobral  born in Brasilia, Distrito Federal, 
Brazil, 1971
 03/23  Benno Rice  born in Adelaide, South Australia, 
Australia, 1977
@@ -112,7 +112,7 @@
 04/03  Hellmuth Michaelis  born in Kiel, Schleswig-Holstein, 
Germany, 1958
 04/03  Tong Liu  born in Beijing, People's Republic of 
China, 1981
 04/03  Gabor Pali  born in Kunhegyes, Hungary, 1982
-04/05  Stacey Son  born in Burley, Idaho, United States. 1967
+04/05  Stacey Son  born in Burley, Idaho, United States, 1967
 04/07  Edward Tomasz Napierala  born in Wolsztyn, Poland, 
1981
 04/08  Jordan K. Hubbard  born in Honolulu, Hawaii, United 
States, 1963
 04/09  Ceri Davies  born in Haverfo

svn commit: r213442 - head/usr.sbin/services_mkdb

[Ruslan Ermilov]

Author: ru
Date: Tue Oct  5 06:31:11 2010
New Revision: 213442
URL: http://svn.freebsd.org/changeset/base/213442

Log:
  Revise markup, mainly.

Modified:
  head/usr.sbin/services_mkdb/services_mkdb.8

Modified: head/usr.sbin/services_mkdb/services_mkdb.8
==
--- head/usr.sbin/services_mkdb/services_mkdb.8 Tue Oct  5 05:49:38 2010
(r213441)
+++ head/usr.sbin/services_mkdb/services_mkdb.8 Tue Oct  5 06:31:11 2010
(r213442)
@@ -34,20 +34,23 @@
 .Os
 .Sh NAME
 .Nm services_mkdb
-.Nd generate the services databases
+.Nd generate the services database
 .Sh SYNOPSIS
 .Nm
 .Op Fl q
 .Op Fl o Ar database
-.Op file
+.Op Ar file
 .Nm
 .Fl u
-.Op file
+.Op Ar file
 .Sh DESCRIPTION
+The
 .Nm
+utility
 creates a
 .Xr db 3
-database for the specified file.
+database for the specified
+.Ar file .
 If no file is specified, then
 .Pa /etc/services
 is used.
@@ -68,11 +71,8 @@ Print the services file to stdout, omitt
 .Pp
 The databases are used by the C library services routines (see
 .Xr getservent 3 ) .
-.Pp
-.Nm
-exits zero on success, non-zero on failure.
 .Sh FILES
-.Bl -tag -width 24n -compact
+.Bl -tag -width ".Pa /var/db/services.db.tmp" -compact
 .It Pa /var/db/services.db
 The current services database.
 .It Pa /var/db/services.db.tmp
@@ -80,6 +80,8 @@ A temporary file.
 .It Pa /etc/services
 The current services file.
 .El
+.Sh EXIT STATUS
+.Ex -std
 .Sh SEE ALSO
 .Xr db 3 ,
 .Xr getservent 3 ,
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r213440 - head/usr.bin/netstat

[Ruslan Ermilov]

Author: ru
Date: Tue Oct  5 05:15:27 2010
New Revision: 213440
URL: http://svn.freebsd.org/changeset/base/213440

Log:
  Show hostcache statistics.
  
  Submitted by: Maxim Dounin

Modified:
  head/usr.bin/netstat/inet.c

Modified: head/usr.bin/netstat/inet.c
==
--- head/usr.bin/netstat/inet.c Mon Oct  4 23:30:44 2010(r213439)
+++ head/usr.bin/netstat/inet.c Tue Oct  5 05:15:27 2010(r213440)
@@ -690,6 +690,9 @@ tcp_stats(u_long off, const char *name, 
p(tcps_sc_sendcookie, "\t%lu cookie%s sent\n");
p(tcps_sc_recvcookie, "\t%lu cookie%s received\n");
 
+   p(tcps_hc_added, "\t%lu hostcache entrie%s added\n");
+   p1a(tcps_hc_bucketoverflow, "\t\t%lu bucket overflow\n");
+
p(tcps_sack_recovery_episode, "\t%lu SACK recovery episode%s\n");
p(tcps_sack_rexmits,
"\t%lu segment rexmit%s in SACK recovery episodes\n");
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r210046 - head/sys/geom/cache

[Ruslan Ermilov]

Author: ru
Date: Wed Jul 14 08:22:00 2010
New Revision: 210046
URL: http://svn.freebsd.org/changeset/base/210046

Log:
  Fixed cache size decoding read from a label.
  
  PR:   kern/144732
  Submitted by: Eugene Grosbein
  MFC after:3 days

Modified:
  head/sys/geom/cache/g_cache.h

Modified: head/sys/geom/cache/g_cache.h
==
--- head/sys/geom/cache/g_cache.h   Wed Jul 14 08:08:43 2010
(r210045)
+++ head/sys/geom/cache/g_cache.h   Wed Jul 14 08:22:00 2010
(r210046)
@@ -139,7 +139,7 @@ cache_metadata_decode(const u_char *data
md->md_version = le32dec(data + 16);
bcopy(data + 20, md->md_name, sizeof(md->md_name));
md->md_bsize = le32dec(data + 36);
-   md->md_size = le16dec(data + 40);
+   md->md_size = le32dec(data + 40);
md->md_provsize = le64dec(data + 44);
 }
 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r207849 - in head: . lib/libarchive rescue/rescue usr.bin/ar usr.bin/cpio usr.bin/cpio/test usr.bin/tar usr.bin/tar/test

[Ruslan Ermilov]

On Tue, May 11, 2010 at 04:22:02PM -0700, Xin LI wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
> 
> Hi,
> 
> Please try this patch:
> 
> http://people.freebsd.org/~delphij/for_review/patch-lzmabuild.diff
> 
> I'm not quite satisfied with this patch though.
> 
> The problem was:
> 
>  - ar, libarchive now unconditionally depends on LZMA library;
>  - When building on old system, /usr/lib/liblzma.a would not exist;
>  - ar is bootstrap tool and thus will be built in BMAKE stage;
>  - The build fails here since no liblzma is pre-built.

How about bootstrapping liblzma instead?  NB: Completely untested.

%%%
Index: Makefile.inc1
===
--- Makefile.inc1   (revision 207959)
+++ Makefile.inc1   (working copy)
@@ -931,7 +931,7 @@
 .endif
 
 .if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022
-_ar=   usr.bin/ar
+_ar=   lib/liblzma usr.bin/ar
 .endif
 
 .if ${BOOTSTRAPPING} < 800013
%%%


Cheers,
-- 
Ruslan Ermilov
r...@freebsd.org
FreeBSD committer
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r205880 - head/usr.sbin/config

[Ruslan Ermilov]

Author: ru
Date: Tue Mar 30 13:46:40 2010
New Revision: 205880
URL: http://svn.freebsd.org/changeset/base/205880

Log:
  - Handle calloc() allocation failures.
  - Fixed a comment.
  - 2 -> EXIT_FAILURE in some places.
  - errx() -> err() where appropriate.
  
  PR:   144644
  Submitted by: Garrett Cooper

Modified:
  head/usr.sbin/config/config.y
  head/usr.sbin/config/lang.l
  head/usr.sbin/config/main.c
  head/usr.sbin/config/mkmakefile.c
  head/usr.sbin/config/mkoptions.c

Modified: head/usr.sbin/config/config.y
==
--- head/usr.sbin/config/config.y   Tue Mar 30 12:08:00 2010
(r205879)
+++ head/usr.sbin/config/config.y   Tue Mar 30 13:46:40 2010
(r205880)
@@ -166,6 +166,8 @@ Config_spec:
CPU Save_id {
struct cputype *cp =
(struct cputype *)calloc(1, sizeof (struct cputype));
+   if (cp == NULL)
+   err(EXIT_FAILURE, "calloc");
cp->cpu_name = $2;
SLIST_INSERT_HEAD(&cputype, cp, cpu_next);
  } |
@@ -197,6 +199,8 @@ Config_spec:
struct hint *hint;
 
hint = (struct hint *)calloc(1, sizeof (struct hint));
+   if (hint == NULL)
+   err(EXIT_FAILURE, "calloc");
hint->hint_name = $2;
STAILQ_INSERT_TAIL(&hints, hint, hint_next);
hintmode = 1;
@@ -331,6 +335,8 @@ newfile(char *name)
struct files_name *nl;

nl = (struct files_name *) calloc(1, sizeof *nl);
+   if (nl == NULL)
+   err(EXIT_FAILURE, "calloc");
nl->f_name = name;
STAILQ_INSERT_TAIL(&fntab, nl, f_next);
 }
@@ -364,6 +370,8 @@ newdev(char *name)
}
 
np = (struct device *) calloc(1, sizeof *np);
+   if (np == NULL)
+   err(EXIT_FAILURE, "calloc");
np->d_name = name;
STAILQ_INSERT_TAIL(&dtab, np, d_next);
 }
@@ -422,6 +430,8 @@ newopt(struct opt_head *list, char *name
}
 
op = (struct opt *)calloc(1, sizeof (struct opt));
+   if (op == NULL)
+   err(EXIT_FAILURE, "calloc");
op->op_name = name;
op->op_ownfile = 0;
op->op_value = value;

Modified: head/usr.sbin/config/lang.l
==
--- head/usr.sbin/config/lang.l Tue Mar 30 12:08:00 2010(r205879)
+++ head/usr.sbin/config/lang.l Tue Mar 30 13:46:40 2010(r205880)
@@ -33,6 +33,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include "y.tab.h"
 #include "config.h"
@@ -220,6 +221,8 @@ cfgfile_add(const char *fname)
struct cfgfile *cf;
 
cf = calloc(1, sizeof(*cf));
+   if (cf == NULL)
+   err(EXIT_FAILURE, "calloc");
assert(cf != NULL);
asprintf(&cf->cfg_path, "%s", fname);
STAILQ_INSERT_TAIL(&cfgfiles, cf, cfg_next);

Modified: head/usr.sbin/config/main.c
==
--- head/usr.sbin/config/main.c Tue Mar 30 12:08:00 2010(r205879)
+++ head/usr.sbin/config/main.c Tue Mar 30 13:46:40 2010(r205880)
@@ -120,7 +120,7 @@ main(int argc, char **argv)
if (*destdir == '\0')
strlcpy(destdir, optarg, sizeof(destdir));
else
-   errx(2, "directory already set");
+   errx(EXIT_FAILURE, "directory already set");
break;
case 'g':
debugging++;
@@ -175,7 +175,7 @@ main(int argc, char **argv)
if (mkdir(p, 0777))
err(2, "%s", p);
} else if (!S_ISDIR(buf.st_mode))
-   errx(2, "%s isn't a directory", p);
+   errx(EXIT_FAILURE, "%s isn't a directory", p);
 
SLIST_INIT(&cputype);
SLIST_INIT(&mkopt);
@@ -256,7 +256,7 @@ get_srcdir(void)
int i;
 
if (realpath("../..", srcdir) == NULL)
-   errx(2, "Unable to find root of source tree");
+   err(EXIT_FAILURE, "Unable to find root of source tree");
if ((pwd = getenv("PWD")) != NULL && *pwd == '/' &&
(pwd = strdup(pwd)) != NULL) {
/* Remove the last two path components. */
@@ -513,7 +513,7 @@ configfile(void)
}
sbuf_finish(sb);
/* 
-* We print first part of the tamplate, replace our tag with
+* We print first part of the template, replace our tag with
 * configuration files content and later continue writing our
 * template.
 */
@@ -650,6 +650,8 @@ remember(const char *file)
}
}
hl = calloc(1, sizeof(*hl));
+   if (hl == NULL)
+   err(EXIT_FAILURE, "calloc");
hl->h_name = s;
hl->h_next =

Re: svn commit: r204697 - head/usr.bin/ncal

[Ruslan Ermilov]

Edwin,

On Thu, Mar 04, 2010 at 07:04:27AM +, Edwin Groothuis wrote:
> Author: edwin
> Date: Thu Mar  4 07:04:27 2010
> New Revision: 204697
> URL: http://svn.freebsd.org/changeset/base/204697
> 
> Log:
>   - Implement -3 option (show previous, this and next month) option.
>   - Add -A option (months after this month).
>   - Add -B option (months before this month).
>   - Fix highlighting of today in year overview.
>   - Fix aligning of "foreign" characters.
>   
>   MFC after:  2 weeks

- This breaks "cal -y".
- All of the above options are missing from usage().
- Options -b and -d are missing from the manpage's SYNOPSIS.
- "for debug the highlighting" can be spelled better.


Cheers,
-- 
Ruslan Ermilov
r...@freebsd.org
FreeBSD committer
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r204379 - head/tools/build/mk

[Ruslan Ermilov]

On Sat, Feb 27, 2010 at 11:36:56AM +0100, Antoine Brodin wrote:
> Ruslan Ermilov  wrote:
> > Picking up a random context...  This doesn't handle the NO_MANCOMPRESS
> > case where manpages are installed uncompressed.
> 
> What about the following patch.

Still doesn't catch some cases,

grep /man ObsoleteFiles.inc | grep -v usr/share/man

shows which (and some bugs).


-- 
Ruslan Ermilov
r...@freebsd.org
FreeBSD committer
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r204383 - head/share/man/man9

[Ruslan Ermilov]

On Sat, Feb 27, 2010 at 01:17:44AM +, Xin LI wrote:
> Author: delphij
> Date: Sat Feb 27 01:17:44 2010
> New Revision: 204383
> URL: http://svn.freebsd.org/changeset/base/204383
> 
> Log:
>   Add several necessary .El's.
>   
>   MFC after:  2 weeks
> 
> Modified:
>   head/share/man/man9/BUF_ISLOCKED.9
>   head/share/man/man9/BUF_RECURSED.9
>   head/share/man/man9/DEVICE_PROBE.9
>   head/share/man/man9/VOP_LOCK.9
>   head/share/man/man9/devfs_set_cdevpriv.9

"make manlint" is your friend.


Cheers,
-- 
Ruslan Ermilov
r...@freebsd.org
FreeBSD committer
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r204379 - head/tools/build/mk

[Ruslan Ermilov]

On Fri, Feb 26, 2010 at 11:26:15PM +, Antoine Brodin wrote:
> Author: antoine
> Date: Fri Feb 26 23:26:15 2010
> New Revision: 204379
> URL: http://svn.freebsd.org/changeset/base/204379
> 
> Log:
>   Do not remove fmt.1 when MK_MAIL=no.
>   
>   X-MFC-With: r203584
> 
> Modified:
>   head/tools/build/mk/OptionalObsoleteFiles.inc
> 
> Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
> ==
> --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Feb 26 22:46:36 
> 2010(r204378)
> +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Feb 26 23:26:15 
> 2010(r204379)
> @@ -1547,7 +1547,6 @@ OLD_FILES+=usr/libexec/comsat
>  OLD_FILES+=usr/share/examples/etc/mail.rc
>  OLD_FILES+=usr/share/man/man1/Mail.1.gz
>  OLD_FILES+=usr/share/man/man1/biff.1.gz
> -OLD_FILES+=usr/share/man/man1/fmt.1.gz
>  OLD_FILES+=usr/share/man/man1/from.1.gz
>  OLD_FILES+=usr/share/man/man1/mail.1.gz
>  OLD_FILES+=usr/share/man/man1/mailx.1.gz

Picking up a random context...  This doesn't handle the NO_MANCOMPRESS
case where manpages are installed uncompressed.


Cheers,
-- 
Ruslan Ermilov
r...@freebsd.org
FreeBSD committer
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

libgssapi.a and libgssapi_krb5.a cannot both be used

[Ruslan Ermilov]

Doug,

The libgssapi.a and libgssapi_krb5.a libraries both define the
same symbols that makes static linkage using them impossible in
some cases, e.g. when trying to link sshd(8) statically.  Details
are below.

On Fri, Feb 26, 2010 at 12:12:54PM +, Ruslan Ermilov wrote:
> Author: ru
> Date: Fri Feb 26 12:12:54 2010
> New Revision: 204355
> URL: http://svn.freebsd.org/changeset/base/204355
> 
> Log:
>   (Almost) fixed static linkage.  The remaining problem is with
>   libgssapi.a and libgssapi_krb5.a libraries that define the
>   same symbols.

After this fix, the static build still fails like this:

%%%
Script started on Fri Feb 26 15:15:30 2010
# pwd
/usr/src/secure/usr.sbin/sshd
# make -DNO_SHARED
cc -O2 -pipe  -I/usr/src/secure/usr.sbin/sshd/../../../crypto/openssh -include 
ssh_namespace.h -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR -DGSSAPI 
-DHAVE_GSSAPI_GSSAPI_H=1 -DHAVE_GSSAPI_GSSAPI_KRB5_H=1 -DKRB5 -DHEIMDAL 
-DNO_IDEA -std=gnu99 -fstack-protector -Wno-pointer-sign  -static -o sshd 
sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o sshpty.o sshlogin.o 
servconf.o serverloop.o auth.o auth1.o auth2.o auth-options.o session.o 
auth-chall.o auth2-chall.o groupaccess.o auth-skey.o auth-bsdauth.o 
auth2-hostbased.o auth2-kbdint.o auth2-none.o auth2-passwd.o auth2-pubkey.o 
auth2-jpake.o monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o 
auth-krb5.o auth2-gss.o gss-serv.o gss-serv-krb5.o loginrec.o auth-pam.o 
auth-shadow.o auth-sia.o md5crypt.o audit.o audit-bsm.o platform.o 
sftp-server.o sftp-common.o roaming_common.o gss-genr.o -lssh -lutil -lz -lwrap 
-lpam -lkrb5 -lhx509 -lasn1 -lcrypto -lcrypt -lroken -lcom_err -lradius 
-ltacplus -lcrypt  -lutil -lopie -lmd -lssh -lcrypto -lcrypt -lypclnt -lbsm 
-lgssapi_krb5 -lgssapi -lkrb5 -lasn1 -lcrypto -lcrypt
/usr/lib/libgssapi.a(gss_names.o)(.data+0x0): multiple definition of 
`GSS_C_NT_USER_NAME'
/usr/lib/libgssapi_krb5.a(external.o)(.data+0x0): first defined here
/usr/lib/libgssapi.a(gss_names.o)(.data+0x4): multiple definition of 
`GSS_C_NT_MACHINE_UID_NAME'
/usr/lib/libgssapi_krb5.a(external.o)(.data+0x4): first defined here
/usr/lib/libgssapi.a(gss_names.o)(.data+0x8): multiple definition of 
`GSS_C_NT_STRING_UID_NAME'
/usr/lib/libgssapi_krb5.a(external.o)(.data+0x8): first defined here
/usr/lib/libgssapi.a(gss_names.o)(.data+0xc): multiple definition of 
`GSS_C_NT_HOSTBASED_SERVICE_X'
/usr/lib/libgssapi_krb5.a(external.o)(.data+0xc): first defined here
/usr/lib/libgssapi.a(gss_names.o)(.data+0x10): multiple definition of 
`GSS_C_NT_HOSTBASED_SERVICE'
/usr/lib/libgssapi_krb5.a(external.o)(.data+0x10): first defined here
/usr/lib/libgssapi.a(gss_names.o)(.data+0x14): multiple definition of 
`GSS_C_NT_ANONYMOUS'
/usr/lib/libgssapi_krb5.a(external.o)(.data+0x14): first defined here
/usr/lib/libgssapi.a(gss_names.o)(.data+0x18): multiple definition of 
`GSS_C_NT_EXPORT_NAME'
/usr/lib/libgssapi_krb5.a(external.o)(.data+0x18): first defined here
/usr/lib/libgssapi.a(gss_names.o)(.data+0x1c): multiple definition of 
`GSS_KRB5_NT_PRINCIPAL_NAME'
/usr/lib/libgssapi_krb5.a(external.o)(.data+0x1c): first defined here
/usr/lib/libgssapi.a(gss_names.o)(.data+0x20): multiple definition of 
`GSS_KRB5_NT_USER_NAME'
/usr/lib/libgssapi_krb5.a(external.o)(.data+0x20): first defined here
/usr/lib/libgssapi.a(gss_names.o)(.data+0x24): multiple definition of 
`GSS_KRB5_NT_MACHINE_UID_NAME'
/usr/lib/libgssapi_krb5.a(external.o)(.data+0x24): first defined here
/usr/lib/libgssapi.a(gss_names.o)(.data+0x28): multiple definition of 
`GSS_KRB5_NT_STRING_UID_NAME'
/usr/lib/libgssapi_krb5.a(external.o)(.data+0x28): first defined here
*** Error code 1

Stop in /usr/src/secure/usr.sbin/sshd.
# 
%%%

Can you please fix this problem within libgss* libraries?


Thanks,
-- 
Ruslan Ermilov
r...@freebsd.org
FreeBSD committer
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r204355 - head/secure/usr.sbin/sshd

[Ruslan Ermilov]

Author: ru
Date: Fri Feb 26 12:12:54 2010
New Revision: 204355
URL: http://svn.freebsd.org/changeset/base/204355

Log:
  (Almost) fixed static linkage.  The remaining problem is with
  libgssapi.a and libgssapi_krb5.a libraries that define the
  same symbols.

Modified:
  head/secure/usr.sbin/sshd/Makefile

Modified: head/secure/usr.sbin/sshd/Makefile
==
--- head/secure/usr.sbin/sshd/Makefile  Fri Feb 26 10:42:46 2010
(r204354)
+++ head/secure/usr.sbin/sshd/Makefile  Fri Feb 26 12:12:54 2010
(r204355)
@@ -34,8 +34,8 @@ LDADD+=  -lbsm
 
 .if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DHAVE_GSSAPI_GSSAPI_KRB5_H=1 
-DKRB5 -DHEIMDAL
-DPADD+= ${LIBGSSAPI} ${LIBGSSAPI_KRB5}
-LDADD+= -lgssapi -lgssapi_krb5
+DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1}
+LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lasn1
 .endif
 
 .if defined(X11BASE)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r204352 - in head: libexec/rpc.rstatd libexec/ulog-helper sbin/hastd usr.bin/fetch usr.bin/unzip usr.sbin/auditd usr.sbin/boot0cfg usr.sbin/mptutil

[Ruslan Ermilov]

Author: ru
Date: Fri Feb 26 09:41:16 2010
New Revision: 204352
URL: http://svn.freebsd.org/changeset/base/204352

Log:
  Fixed static linkage.

Modified:
  head/libexec/rpc.rstatd/Makefile
  head/libexec/ulog-helper/Makefile
  head/sbin/hastd/Makefile
  head/usr.bin/fetch/Makefile
  head/usr.bin/unzip/Makefile
  head/usr.sbin/auditd/Makefile
  head/usr.sbin/boot0cfg/Makefile
  head/usr.sbin/mptutil/Makefile

Modified: head/libexec/rpc.rstatd/Makefile
==
--- head/libexec/rpc.rstatd/MakefileFri Feb 26 09:31:50 2010
(r204351)
+++ head/libexec/rpc.rstatd/MakefileFri Feb 26 09:41:16 2010
(r204352)
@@ -4,8 +4,8 @@ PROG =  rpc.rstatd
 SRCS = rstatd.c rstat_proc.c
 MAN =  rpc.rstatd.8
 
-DPADD= ${LIBRPCSVC} ${LIBUTIL} ${LIBDEVSTAT}
-LDADD= -lrpcsvc -lutil -ldevstat
+DPADD= ${LIBRPCSVC} ${LIBUTIL} ${LIBDEVSTAT} ${LIBKVM}
+LDADD= -lrpcsvc -lutil -ldevstat -lkvm
 
 WARNS?=1
 

Modified: head/libexec/ulog-helper/Makefile
==
--- head/libexec/ulog-helper/Makefile   Fri Feb 26 09:31:50 2010
(r204351)
+++ head/libexec/ulog-helper/Makefile   Fri Feb 26 09:41:16 2010
(r204352)
@@ -5,7 +5,7 @@ BINOWN= root
 BINMODE=4555
 NO_MAN=
 
-DPADD= ${LIBULOG}
-LDADD= -lulog
+DPADD= ${LIBULOG} ${LIBMD}
+LDADD= -lulog -lmd
 
 .include 

Modified: head/sbin/hastd/Makefile
==
--- head/sbin/hastd/MakefileFri Feb 26 09:31:50 2010(r204351)
+++ head/sbin/hastd/MakefileFri Feb 26 09:41:16 2010(r204352)
@@ -27,8 +27,9 @@ CFLAGS+=-DINET6
 # This is needed to have WARNS > 1.
 CFLAGS+=-DYY_NO_UNPUT
 
-DPADD= ${LIBCRYPTO} ${LIBGEOM} ${LIBL} ${LIBPTHREAD} ${LIBUTIL}
-LDADD= -lcrypto -lgeom -ll -lpthread -lutil
+DPADD= ${LIBCRYPTO} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBL} \
+   ${LIBPTHREAD} ${LIBUTIL}
+LDADD= -lcrypto -lgeom -lbsdxml -lsbuf -ll -lpthread -lutil
 
 YFLAGS+=-v
 

Modified: head/usr.bin/fetch/Makefile
==
--- head/usr.bin/fetch/Makefile Fri Feb 26 09:31:50 2010(r204351)
+++ head/usr.bin/fetch/Makefile Fri Feb 26 09:41:16 2010(r204352)
@@ -4,8 +4,8 @@
 
 PROG=  fetch
 CSTD?= c99
-DPADD= ${LIBFETCH}
-LDADD= -lfetch
+DPADD= ${LIBFETCH} ${LIBMD}
+LDADD= -lfetch -lmd
 .if ${MK_OPENSSL} != "no"
 DPADD+=${LIBSSL} ${LIBCRYPTO}
 LDADD+=-lssl -lcrypto

Modified: head/usr.bin/unzip/Makefile
==
--- head/usr.bin/unzip/Makefile Fri Feb 26 09:31:50 2010(r204351)
+++ head/usr.bin/unzip/Makefile Fri Feb 26 09:41:16 2010(r204352)
@@ -2,7 +2,7 @@
 
 PROG = unzip
 CSTD = c99
-DPADD = ${LIBARCHIVE}
-LDADD = -larchive
+DPADD = ${LIBARCHIVE} ${LIBZ}
+LDADD = -larchive -lz
 
 .include 

Modified: head/usr.sbin/auditd/Makefile
==
--- head/usr.sbin/auditd/Makefile   Fri Feb 26 09:31:50 2010
(r204351)
+++ head/usr.sbin/auditd/Makefile   Fri Feb 26 09:41:16 2010
(r204352)
@@ -11,8 +11,8 @@ PROG= auditd
 SRCS=  auditd.c audit_warn.c auditd_fbsd.c
 MAN=   auditd.8
 
-DPADD= ${LIBBSM} ${LIBAUDITD}
-LDADD= -lbsm -lauditd
+DPADD= ${LIBAUDITD} ${LIBBSM}
+LDADD= -lauditd -lbsm
 
 WARNS?=3
 

Modified: head/usr.sbin/boot0cfg/Makefile
==
--- head/usr.sbin/boot0cfg/Makefile Fri Feb 26 09:31:50 2010
(r204351)
+++ head/usr.sbin/boot0cfg/Makefile Fri Feb 26 09:41:16 2010
(r204352)
@@ -3,7 +3,7 @@
 PROG=  boot0cfg
 MAN=   boot0cfg.8
 
-DPADD= ${LIBGEOM}
-LDADD= -lgeom
+DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
+LDADD= -lgeom -lbsdxml -lsbuf
 
 .include 

Modified: head/usr.sbin/mptutil/Makefile
==
--- head/usr.sbin/mptutil/Makefile  Fri Feb 26 09:31:50 2010
(r204351)
+++ head/usr.sbin/mptutil/Makefile  Fri Feb 26 09:41:16 2010
(r204352)
@@ -8,8 +8,8 @@ MAN=mptutil.8
 
 WARNS?= 3
 
-DPADD+=${LIBCAM} ${LIBUTIL}
-LDADD+=-lcam -lutil
+DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL}
+LDADD= -lcam -lsbuf -lutil
 
 # Here be dragons
 .ifdef DEBUG
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r204339 - in head/cddl: usr.bin/ctfconvert usr.bin/ctfdump usr.bin/ctfmerge usr.bin/zinject usr.sbin/dtrace usr.sbin/lockstat

[Ruslan Ermilov]

Author: ru
Date: Thu Feb 25 22:18:35 2010
New Revision: 204339
URL: http://svn.freebsd.org/changeset/base/204339

Log:
  Fixed dependencies (make checkdpadd).

Modified:
  head/cddl/usr.bin/ctfconvert/Makefile
  head/cddl/usr.bin/ctfdump/Makefile
  head/cddl/usr.bin/ctfmerge/Makefile
  head/cddl/usr.bin/zinject/Makefile
  head/cddl/usr.sbin/dtrace/Makefile
  head/cddl/usr.sbin/lockstat/Makefile

Modified: head/cddl/usr.bin/ctfconvert/Makefile
==
--- head/cddl/usr.bin/ctfconvert/Makefile   Thu Feb 25 22:16:30 2010
(r204338)
+++ head/cddl/usr.bin/ctfconvert/Makefile   Thu Feb 25 22:18:35 2010
(r204339)
@@ -40,7 +40,8 @@ CFLAGS+=  -I${.CURDIR}/../../../sys/cddl/
-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDADD+=-lctf -ldwarf -lelf -lz -lthr
+DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
+LDADD= -lctf -ldwarf -lelf -lz -lpthread
 
 .PATH: ${.CURDIR}
 .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common

Modified: head/cddl/usr.bin/ctfdump/Makefile
==
--- head/cddl/usr.bin/ctfdump/Makefile  Thu Feb 25 22:16:30 2010
(r204338)
+++ head/cddl/usr.bin/ctfdump/Makefile  Thu Feb 25 22:18:35 2010
(r204339)
@@ -19,9 +19,8 @@ CFLAGS+=  -I${OPENSOLARIS_USR_DISTDIR} \
-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDFLAGS+=  -pthread
-
-LDADD+=-lelf -lz
+DPADD= ${LIBPTHREAD} ${LIBELF} ${LIBZ}
+LDADD= -lpthread -lelf -lz
 
 .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump

Modified: head/cddl/usr.bin/ctfmerge/Makefile
==
--- head/cddl/usr.bin/ctfmerge/Makefile Thu Feb 25 22:16:30 2010
(r204338)
+++ head/cddl/usr.bin/ctfmerge/Makefile Thu Feb 25 22:18:35 2010
(r204339)
@@ -37,7 +37,8 @@ CFLAGS+=  -I${.CURDIR}/../../../sys/cddl/
-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDADD+=-lctf -ldwarf -lelf -lz -lthr
+DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
+LDADD= -lctf -ldwarf -lelf -lz -lpthread
 
 .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt

Modified: head/cddl/usr.bin/zinject/Makefile
==
--- head/cddl/usr.bin/zinject/Makefile  Thu Feb 25 22:16:30 2010
(r204338)
+++ head/cddl/usr.bin/zinject/Makefile  Thu Feb 25 22:18:35 2010
(r204339)
@@ -19,7 +19,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/open
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
 DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
-   ${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
+   ${LIBZFS} ${LIBZPOOL}
 LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
 
 .include 

Modified: head/cddl/usr.sbin/dtrace/Makefile
==
--- head/cddl/usr.sbin/dtrace/Makefile  Thu Feb 25 22:16:30 2010
(r204338)
+++ head/cddl/usr.sbin/dtrace/Makefile  Thu Feb 25 22:18:35 2010
(r204339)
@@ -24,14 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
 #CFLAGS+=  -DNEED_ERRLOC
 #YFLAGS+=  -d
 
-LDFLAGS+=  -pthread \
-   -L${.OBJDIR}/../../lib/libdtrace \
-   -L${.OBJDIR}/../../lib/libproc \
-   -L${.OBJDIR}/../../lib/libctf \
-   -L${.OBJDIR}/../../../lib/libelf
-
-LDADD+=-ldtrace -ly -ll -lproc -lctf -lelf -lz
-
-DPADD+= ${LIBDTRACE} ${LIBCTF} ${LIBELF} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ}
+DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF} 
${LIBELF} ${LIBZ}
+LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz
 
 .include 

Modified: head/cddl/usr.sbin/lockstat/Makefile
==
--- head/cddl/usr.sbin/lockstat/MakefileThu Feb 25 22:16:30 2010
(r204338)
+++ head/cddl/usr.sbin/lockstat/MakefileThu Feb 25 22:18:35 2010
(r204339)
@@ -25,15 +25,8 @@ CFLAGS+= -DNEED_ERRLOC -g
 
 #YFLAGS+=  -d
 
-LDFLAGS+=  -pthread \
-   -L${.OBJDIR}/../../lib/libdtrace \
-   -L${.OBJDIR}/../../lib/libproc \
-   -L${.OBJDIR}/../../lib/libctf \
-   -L${.OBJDIR}/../../../lib/libelf
-
-LDADD+=-ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt
-
-#DPADD+= ${LIBDTRACE} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ}
+DPADD= ${LIBPTHR

svn commit: r204338 - in head/lib: libdwarf libproc

[Ruslan Ermilov]

Author: ru
Date: Thu Feb 25 22:16:30 2010
New Revision: 204338
URL: http://svn.freebsd.org/changeset/base/204338

Log:
  Removed redundant -I. from CFLAGS and "yes" from WITHOUT_MAN.

Modified:
  head/lib/libdwarf/Makefile
  head/lib/libproc/Makefile

Modified: head/lib/libdwarf/Makefile
==
--- head/lib/libdwarf/Makefile  Thu Feb 25 21:38:56 2010(r204337)
+++ head/lib/libdwarf/Makefile  Thu Feb 25 22:16:30 2010(r204338)
@@ -19,10 +19,10 @@ SRCS=   \
 
 INCS=  dwarf.h libdwarf.h
 
-CFLAGS+=   -I. -I${.CURDIR}
+CFLAGS+=   -I${.CURDIR}
 
 SHLIB_MAJOR=   2
 
-WITHOUT_MAN=   yes
+WITHOUT_MAN=
 
 .include 

Modified: head/lib/libproc/Makefile
==
--- head/lib/libproc/Makefile   Thu Feb 25 21:38:56 2010(r204337)
+++ head/lib/libproc/Makefile   Thu Feb 25 22:16:30 2010(r204338)
@@ -9,10 +9,10 @@ SRCS= \
 
 INCS=  libproc.h
 
-CFLAGS+=   -I. -I${.CURDIR}
+CFLAGS+=   -I${.CURDIR}
 
 SHLIB_MAJOR=   2
 
-WITHOUT_MAN=   yes
+WITHOUT_MAN=
 
 .include 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r204329 - in head: lib/librt sbin/geom/class/part sbin/ifconfig sbin/ipfw usr.bin/cpio usr.bin/gcore usr.bin/systat usr.bin/tar usr.sbin/mfiutil usr.sbin/pmcstat

[Ruslan Ermilov]

Author: ru
Date: Thu Feb 25 20:24:19 2010
New Revision: 204329
URL: http://svn.freebsd.org/changeset/base/204329

Log:
  Fixed dependencies (make checkdpadd).

Modified:
  head/lib/librt/Makefile
  head/sbin/geom/class/part/Makefile
  head/sbin/ifconfig/Makefile
  head/sbin/ipfw/Makefile
  head/usr.bin/cpio/Makefile
  head/usr.bin/gcore/Makefile
  head/usr.bin/systat/Makefile
  head/usr.bin/tar/Makefile
  head/usr.sbin/mfiutil/Makefile
  head/usr.sbin/pmcstat/Makefile

Modified: head/lib/librt/Makefile
==
--- head/lib/librt/Makefile Thu Feb 25 19:47:47 2010(r204328)
+++ head/lib/librt/Makefile Thu Feb 25 20:24:19 2010(r204329)
@@ -4,7 +4,8 @@ LIB=rt
 SHLIB_MAJOR= 1
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}
 CFLAGS+=-Winline -Wall -g
-LDADD+=-lpthread
+DPADD= ${LIBPTHREAD}
+LDADD= -lpthread
 
 WARNS?=2
 

Modified: head/sbin/geom/class/part/Makefile
==
--- head/sbin/geom/class/part/Makefile  Thu Feb 25 19:47:47 2010
(r204328)
+++ head/sbin/geom/class/part/Makefile  Thu Feb 25 20:24:19 2010
(r204329)
@@ -4,6 +4,7 @@
 
 CLASS= part
 
+DPADD= ${LIBUTIL}
 LDADD= -lutil
 
 .include 

Modified: head/sbin/ifconfig/Makefile
==
--- head/sbin/ifconfig/Makefile Thu Feb 25 19:47:47 2010(r204328)
+++ head/sbin/ifconfig/Makefile Thu Feb 25 20:24:19 2010(r204329)
@@ -28,7 +28,7 @@ SRCS+=ifgre.c # GRE keys etc
 SRCS+= ifgif.c # GIF reversed header workaround
 
 SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
-DPADD+=${LIBBSDXML} ${LIBSBUF} ${LIBJAIL}
+DPADD+=${LIBBSDXML} ${LIBJAIL} ${LIBSBUF}
 LDADD+=-lbsdxml -ljail -lsbuf
 
 SRCS+= ifcarp.c# SIOC[GS]VH support

Modified: head/sbin/ipfw/Makefile
==
--- head/sbin/ipfw/Makefile Thu Feb 25 19:47:47 2010(r204328)
+++ head/sbin/ipfw/Makefile Thu Feb 25 20:24:19 2010(r204329)
@@ -3,6 +3,7 @@
 PROG=  ipfw
 SRCS=  ipfw2.c dummynet.c ipv6.c main.c nat.c altq.c
 WARNS?=2
+DPADD= ${LIBUTIL}
 LDADD= -lutil
 MAN=   ipfw.8
 

Modified: head/usr.bin/cpio/Makefile
==
--- head/usr.bin/cpio/Makefile  Thu Feb 25 19:47:47 2010(r204328)
+++ head/usr.bin/cpio/Makefile  Thu Feb 25 20:24:19 2010(r204329)
@@ -5,7 +5,6 @@
 PROG=  bsdcpio
 BSDCPIO_VERSION_STRING=2.7.0
 SRCS=  cpio.c cmdline.c err.c matching.c pathmatch.c
-DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
 CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
 CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
 .ifdef RELEASE_CRUNCH
@@ -13,8 +12,10 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"config_fr
 # statically linked, cannot use -lcrypto, and are size sensitive.
 CFLAGS+= -DSMALLER
 .endif
-LDADD+=-larchive -lz -lbz2 -lmd
+DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBMD}
+LDADD= -larchive -lz -lbz2 -lmd
 .if ${MK_OPENSSL} != "no"
+DPADD+=${LIBCRYPTO}
 LDADD+= -lcrypto
 .endif
 

Modified: head/usr.bin/gcore/Makefile
==
--- head/usr.bin/gcore/Makefile Thu Feb 25 19:47:47 2010(r204328)
+++ head/usr.bin/gcore/Makefile Thu Feb 25 20:24:19 2010(r204329)
@@ -1,9 +1,10 @@
 #  @(#)Makefile8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
-LDADD+=-lutil
 PROG=  gcore
 SRCS=  elfcore.c gcore.c
+DPADD= ${LIBUTIL}
+LDADD= -lutil
 
 WARNS?=1
 

Modified: head/usr.bin/systat/Makefile
==
--- head/usr.bin/systat/MakefileThu Feb 25 19:47:47 2010
(r204328)
+++ head/usr.bin/systat/MakefileThu Feb 25 20:24:19 2010
(r204329)
@@ -16,7 +16,7 @@ CFLAGS+= -DINET6
 
 WARNS?=0
 
-DPADD= ${LIBCURSES} ${LIBM} ${LIBDEVSTAT} ${LIBKVM}
-LDADD= -lcursesw -lm -ldevstat -lkvm
+DPADD= ${LIBNCURSESW} ${LIBM} ${LIBDEVSTAT} ${LIBKVM}
+LDADD= -lncursesw -lm -ldevstat -lkvm
 
 .include 

Modified: head/usr.bin/tar/Makefile
==
--- head/usr.bin/tar/Makefile   Thu Feb 25 19:47:47 2010(r204328)
+++ head/usr.bin/tar/Makefile   Thu Feb 25 20:24:19 2010(r204329)
@@ -15,9 +15,10 @@ SRCS=bsdtar.c\
tree.c  \
util.c  \
write.c
-DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
+DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBMD}
 LDADD= -larchive -lbz2 -lz -lmd
 .if ${MK_OPENSSL} != "no"
+DPADD+=${LIBCRYPTO}
 LDADD+= -lcrypto
 .endif
 CFLAGS+=   -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"

Modified: head/usr.sbin/mfiutil/Makefil

svn commit: r204311 - in head: share/mk tools/regression/file/closefrom tools/regression/file/flock tools/regression/gaithrstress tools/regression/kgssapi tools/regression/mqueue/mqtest1 tools/regr...

[Ruslan Ermilov]

Author: ru
Date: Thu Feb 25 14:42:26 2010
New Revision: 204311
URL: http://svn.freebsd.org/changeset/base/204311

Log:
  Fixed missing or broken library dependencies.

Modified:
  head/share/mk/bsd.libnames.mk
  head/tools/regression/file/closefrom/Makefile
  head/tools/regression/file/flock/Makefile
  head/tools/regression/gaithrstress/Makefile
  head/tools/regression/kgssapi/Makefile
  head/tools/regression/mqueue/mqtest1/Makefile
  head/tools/regression/mqueue/mqtest2/Makefile
  head/tools/regression/mqueue/mqtest3/Makefile
  head/tools/regression/mqueue/mqtest4/Makefile
  head/tools/regression/mqueue/mqtest5/Makefile
  head/tools/regression/netipx/ipxdgramloopback/Makefile
  head/tools/regression/netipx/spxabort/Makefile
  head/tools/regression/netipx/spxloopback/Makefile
  head/tools/regression/pthread/cv_cancel1/Makefile
  head/tools/regression/pthread/mutex_isowned_np/Makefile
  head/tools/regression/rpcsec_gss/Makefile
  head/tools/regression/sigqueue/sigqtest1/Makefile
  head/tools/regression/sigqueue/sigqtest2/Makefile
  head/tools/regression/sockets/sendfile/Makefile
  head/tools/regression/tls/libxx/Makefile
  head/tools/regression/tls/libyy/Makefile
  head/tools/regression/tls/ttls1/Makefile
  head/tools/regression/tls/ttls2/Makefile
  head/tools/regression/tls/ttls4/Makefile
  head/tools/tools/ether_reflect/Makefile
  head/tools/tools/net80211/stumbler/Makefile
  head/tools/tools/net80211/w00t/Makefile.inc

Modified: head/share/mk/bsd.libnames.mk
==
--- head/share/mk/bsd.libnames.mk   Thu Feb 25 14:36:50 2010
(r204310)
+++ head/share/mk/bsd.libnames.mk   Thu Feb 25 14:42:26 2010
(r204311)
@@ -135,6 +135,8 @@ LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradiu
 LIBREADLINE?=  ${DESTDIR}${LIBDIR}/libreadline.a
 LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a
 LIBRPCSVC?=${DESTDIR}${LIBDIR}/librpcsvc.a
+LIBRPCSEC_GSS?=${DESTDIR}${LIBDIR}/librpcsec_gss.a
+LIBRT?=${DESTDIR}${LIBDIR}/librt.a
 LIBSBUF?=  ${DESTDIR}${LIBDIR}/libsbuf.a
 LIBSDP?=   ${DESTDIR}${LIBDIR}/libsdp.a
 LIBSMB?=   ${DESTDIR}${LIBDIR}/libsmb.a

Modified: head/tools/regression/file/closefrom/Makefile
==
--- head/tools/regression/file/closefrom/Makefile   Thu Feb 25 14:36:50 
2010(r204310)
+++ head/tools/regression/file/closefrom/Makefile   Thu Feb 25 14:42:26 
2010(r204311)
@@ -3,7 +3,7 @@
 PROG=  closefrom
 MAN=
 WARNS?=6
-
+DPADD= ${LIBUTIL}
 LDADD= -lutil
 
 .include 

Modified: head/tools/regression/file/flock/Makefile
==
--- head/tools/regression/file/flock/Makefile   Thu Feb 25 14:36:50 2010
(r204310)
+++ head/tools/regression/file/flock/Makefile   Thu Feb 25 14:42:26 2010
(r204311)
@@ -3,7 +3,7 @@
 PROG=  flock
 NO_MAN=
 WARNS?=6
-
-LDADD+=-lpthread
+DPADD= ${LIBPTHREAD}
+LDADD= -lpthread
 
 .include 

Modified: head/tools/regression/gaithrstress/Makefile
==
--- head/tools/regression/gaithrstress/Makefile Thu Feb 25 14:36:50 2010
(r204310)
+++ head/tools/regression/gaithrstress/Makefile Thu Feb 25 14:42:26 2010
(r204311)
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PROG=  gaithrstress
-LDADD+=-pthread
+DPADD= ${LIBPTHREAD}
+LDADD= -lpthread
 
 NO_MAN=
 .include 

Modified: head/tools/regression/kgssapi/Makefile
==
--- head/tools/regression/kgssapi/Makefile  Thu Feb 25 14:36:50 2010
(r204310)
+++ head/tools/regression/kgssapi/Makefile  Thu Feb 25 14:42:26 2010
(r204311)
@@ -3,6 +3,7 @@
 PROG=  gsstest
 NO_MAN=
 WARNS?=2
+DPADD= ${LIBGSSAPI} ${LIBGSSAPI_KRB5}
 LDADD= -lgssapi -lgssapi_krb5
 DEBUG_FLAGS= -g -O0
 

Modified: head/tools/regression/mqueue/mqtest1/Makefile
==
--- head/tools/regression/mqueue/mqtest1/Makefile   Thu Feb 25 14:36:50 
2010(r204310)
+++ head/tools/regression/mqueue/mqtest1/Makefile   Thu Feb 25 14:42:26 
2010(r204311)
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PROG=mqtest1
-LDADD+=-lrt
+DPADD= ${LIBRT}
+LDADD= -lrt
 NO_MAN=
 DEBUG_FLAGS=-g
 

Modified: head/tools/regression/mqueue/mqtest2/Makefile
==
--- head/tools/regression/mqueue/mqtest2/Makefile   Thu Feb 25 14:36:50 
2010(r204310)
+++ head/tools/regression/mqueue/mqtest2/Makefile   Thu Feb 25 14:42:26 
2010(r204311)
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PROG=mqtest2
-LDADD+=-lrt
+DPADD= ${LIBRT}
+LDADD= -lrt
 NO_MAN=
 DEBUG_FLAGS=-g
 

Modified: head/tools/regression/mqueue/mqtest3/Makefile
=

svn commit: r204310 - in head/tools/tools: mcgrab mctest

[Ruslan Ermilov]

Author: ru
Date: Thu Feb 25 14:36:50 2010
New Revision: 204310
URL: http://svn.freebsd.org/changeset/base/204310

Log:
  Moved mcgrab(1) into a separate directory -- our .mk infrastructure
  doesn't currently have support for building multiple programs in a
  single makefile.
  
  While here, fixed manpages and makefiles (missing dependencies).

Added:
  head/tools/tools/mcgrab/
  head/tools/tools/mcgrab/Makefile   (contents, props changed)
  head/tools/tools/mcgrab/mcgrab.1
 - copied, changed from r204302, head/tools/tools/mctest/mcgrab.1
  head/tools/tools/mcgrab/mcgrab.cc
 - copied unchanged from r204302, head/tools/tools/mctest/mcgrab.cc
Deleted:
  head/tools/tools/mctest/mcgrab.1
  head/tools/tools/mctest/mcgrab.cc
Modified:
  head/tools/tools/mctest/Makefile
  head/tools/tools/mctest/mctest.1

Added: head/tools/tools/mcgrab/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/tools/tools/mcgrab/MakefileThu Feb 25 14:36:50 2010
(r204310)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+PROG_CXX=  mcgrab
+CFLAGS+=   -I${.CURDIR}/../mctest
+
+.include 

Copied and modified: head/tools/tools/mcgrab/mcgrab.1 (from r204302, 
head/tools/tools/mctest/mcgrab.1)
==
--- head/tools/tools/mctest/mcgrab.1Thu Feb 25 06:53:46 2010
(r204302, copy source)
+++ head/tools/tools/mcgrab/mcgrab.1Thu Feb 25 14:36:50 2010
(r204310)
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 9, 2008
-.Dt mcgrab 1
+.Dt MCGRAB 1
 .Os
 .Sh NAME
 .Nm mcgrab
@@ -36,23 +36,27 @@
 .Op Fl g Ar group
 .Op Fl n Ar number
 .Sh DESCRIPTION
-The 
+The
 .Nm
 command implements a multicast test which grabs and holds
-N multicast addresses.  The purpose of the test is to see what
+N multicast addresses.
+The purpose of the test is to see what
 happens when a network interface is no longer able to filter
-multicasts in hardware and has to switch to promiscious or
-multicast promiscious mode.  A successful test does not have any
+multicasts in hardware and has to switch to promiscuous or
+multicast promiscuous mode.
+A successful test does not have any
 result, but an unsuccessful test will have deleterious side effects.
 Packet size in bytes.
 The options are as follows:
-.Bl -tag -width ".Fl d Ar argument"
+.Bl -tag -width ".Fl i Ar interface"
 .It Fl i Ar interface
-Network interface, which can be found with ifconfig(1).
-.It Fl i Ar group
-Multicast group
+Network interface, which can be found with
+.Xr ifconfig 8 .
+.It Fl g Ar group
+Multicast group.
 .It Fl n Ar number
 Number of groups to join.
+.El
 .Sh EXAMPLES
 The following is an example of a typical usage
 of the
@@ -62,9 +66,9 @@ command:
 .Dl "mcgrab -i em0 -g 239.255.255.1 -n 1024"
 .Sh SEE ALSO
 .Xr mctest 1 ,
-.Xr ifconfig 8 ,
 .Xr netstat 1 ,
-.Xr nanosleep 2 .
+.Xr nanosleep 2 ,
+.Xr ifconfig 8
 .Sh HISTORY
 The
 .Nm
@@ -75,4 +79,5 @@ This
 manual page was written by
 .An George V. Neville-Neil Aq g...@freebsd.org .
 .Sh BUGS
-Should be reported to the author or to n...@freebsd.org.
+Should be reported to the author or to
+.Aq n...@freebsd.org .

Copied: head/tools/tools/mcgrab/mcgrab.cc (from r204302, 
head/tools/tools/mctest/mcgrab.cc)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/tools/tools/mcgrab/mcgrab.cc   Thu Feb 25 14:36:50 2010
(r204310, copy of r204302, head/tools/tools/mctest/mcgrab.cc)
@@ -0,0 +1,189 @@
+// 
+//  Copyright (c) 2008, Neville-Neil Consulting
+//  All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//notice, this list of conditions and the following disclaimer in the
+//documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POS

svn commit: r204008 - head/lib/libjail

[Ruslan Ermilov]

Author: ru
Date: Wed Feb 17 16:45:03 2010
New Revision: 204008
URL: http://svn.freebsd.org/changeset/base/204008

Log:
  realloc() with a proper amount of memory.
  
  MFC after:3 days

Modified:
  head/lib/libjail/jail.c

Modified: head/lib/libjail/jail.c
==
--- head/lib/libjail/jail.c Wed Feb 17 15:44:01 2010(r204007)
+++ head/lib/libjail/jail.c Wed Feb 17 16:45:03 2010(r204008)
@@ -191,7 +191,7 @@ jailparam_all(struct jailparam **jpp)
/* Add the parameter to the list */
if (njp >= nlist) {
nlist *= 2;
-   jp = realloc(jp, nlist * sizeof(jp));
+   jp = realloc(jp, nlist * sizeof(*jp));
if (jp == NULL) {
jailparam_free(jp, njp);
return (-1);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r203958 - in head/lib: libc/stdio libc/stdtime libpam/modules/pam_echo

[Ruslan Ermilov]

Author: ru
Date: Tue Feb 16 12:29:02 2010
New Revision: 203958
URL: http://svn.freebsd.org/changeset/base/203958

Log:
  %U was macroized in mdoc(7), escape.

Modified:
  head/lib/libc/stdio/printf.3
  head/lib/libc/stdtime/strptime.3
  head/lib/libpam/modules/pam_echo/pam_echo.8

Modified: head/lib/libc/stdio/printf.3
==
--- head/lib/libc/stdio/printf.3Tue Feb 16 11:35:50 2010
(r203957)
+++ head/lib/libc/stdio/printf.3Tue Feb 16 12:29:02 2010
(r203958)
@@ -812,7 +812,7 @@ available.
 The conversion formats
 .Cm \&%D , \&%O ,
 and
-.Cm %U
+.Cm \&%U
 are not standard and
 are provided only for backward compatibility.
 The effect of padding the

Modified: head/lib/libc/stdtime/strptime.3
==
--- head/lib/libc/stdtime/strptime.3Tue Feb 16 11:35:50 2010
(r203957)
+++ head/lib/libc/stdtime/strptime.3Tue Feb 16 12:29:02 2010
(r203958)
@@ -149,7 +149,7 @@ and 12PM
 is taken as noon.
 .Pp
 The
-.Fa %U
+.Fa \&%U
 and
 .Fa %W
 format specifiers accept any value within the range 00 to 53

Modified: head/lib/libpam/modules/pam_echo/pam_echo.8
==
--- head/lib/libpam/modules/pam_echo/pam_echo.8 Tue Feb 16 11:35:50 2010
(r203957)
+++ head/lib/libpam/modules/pam_echo/pam_echo.8 Tue Feb 16 12:29:02 2010
(r203958)
@@ -65,7 +65,7 @@ The current service name
 .It Cm %t
 The name of the controlling tty
 .Pq Dv PAM_TTY .
-.It Cm %U
+.It Cm \&%U
 The applicant's user name
 .Pq Dv PAM_RUSER .
 .It Cm %u
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"