Date: Thu, 28 Dec 2006 22:06:30 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 112248 for review Message-ID: <200612282206.kBSM6Uwp035524@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=112248 Change 112248 by kmacy@kmacy_storage:kmacy_wifi on 2006/12/28 22:05:46 IFC Affected files ... .. //depot/projects/kmacy_wifi/bin/mkdir/mkdir.1#2 integrate .. //depot/projects/kmacy_wifi/bin/rm/rm.1#3 integrate .. //depot/projects/kmacy_wifi/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/kmacy_wifi/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/kmacy_wifi/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/kmacy_wifi/etc/rc.subr#3 integrate .. //depot/projects/kmacy_wifi/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/kmacy_wifi/gnu/usr.bin/man/man/man.man#2 integrate .. //depot/projects/kmacy_wifi/gnu/usr.bin/man/manpath/manpath.man#2 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive_read_support_compression_bzip2.c#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/libarchive.3#3 integrate .. //depot/projects/kmacy_wifi/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate .. //depot/projects/kmacy_wifi/lib/libc/sys/recv.2#3 integrate .. //depot/projects/kmacy_wifi/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/kmacy_wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/kmacy_wifi/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/kmacy_wifi/share/man/man1/builtin.1#3 integrate .. //depot/projects/kmacy_wifi/share/man/man1/intro.1#2 integrate .. //depot/projects/kmacy_wifi/share/man/man8/rc.subr.8#3 integrate .. //depot/projects/kmacy_wifi/share/man/man9/kqueue.9#2 integrate .. //depot/projects/kmacy_wifi/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/kmacy_wifi/sys/conf/files#3 integrate .. //depot/projects/kmacy_wifi/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/kmacy_wifi/sys/dev/pci/pci.c#3 integrate .. //depot/projects/kmacy_wifi/sys/kern/kern_mac.c#3 delete .. //depot/projects/kmacy_wifi/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/kmacy_wifi/sys/netgraph/ng_deflate.c#1 branch .. //depot/projects/kmacy_wifi/sys/netgraph/ng_deflate.h#1 branch .. //depot/projects/kmacy_wifi/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/kmacy_wifi/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_framework.c#1 branch .. //depot/projects/kmacy_wifi/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_syscalls.c#1 branch .. //depot/projects/kmacy_wifi/usr.bin/biff/biff.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/kmacy_wifi/usr.bin/enigma/enigma.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/hexdump/od.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/logname/logname.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/nfsstat/nfsstat.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/printenv/printenv.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/tail/tail.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/tsort/tsort.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/ypwhich/ypwhich.1#2 integrate .. //depot/projects/kmacy_wifi/usr.sbin/ckdist/ckdist.1#2 integrate .. //depot/projects/kmacy_wifi/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/kmacy_wifi/usr.sbin/kbdmap/kbdmap.1#2 integrate Differences ... ==== //depot/projects/kmacy_wifi/bin/mkdir/mkdir.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mkdir.1 8.2 (Berkeley) 1/25/94 -.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.21 2005/01/16 16:41:57 ru Exp $ +.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.23 2006/12/27 11:28:00 ru Exp $ .\" .Dd January 25, 1994 .Dt MKDIR 1 @@ -48,13 +48,13 @@ .Nm utility creates the directories named as operands, in the order specified, using mode -.Li rwxrwxrwx (\&0777) +.Dq Li rwxrwxrwx +(0777) as modified by the current .Xr umask 2 . .Pp The options are as follows: -.Pp -.Bl -tag -width indent +.Bl -tag -width ".Fl m Ar mode" .It Fl m Ar mode Set the file permission bits of the final created directory to the specified mode. @@ -64,11 +64,11 @@ .Xr chmod 1 command. If a symbolic mode is specified, the operation characters -.Dq + +.Ql + and -.Dq - +.Ql - are interpreted relative to an initial mode of -.Dq a=rwx . +.Dq Li a=rwx . .It Fl p Create intermediate directories as required. If this option is not specified, the full path prefix of each @@ -76,7 +76,8 @@ On the other hand, with this option specified, no error will be reported if a directory given as an operand already exists. Intermediate directories are created with permission bits of -.Li rwxrwxrwx (\&0777) +.Dq Li rwxrwxrwx +(0777) as modified by the current umask, plus write and search permission for the owner. .It Fl v ==== //depot/projects/kmacy_wifi/bin/rm/rm.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.41 2006/10/31 02:22:36 delphij Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.43 2006/12/26 13:57:40 ru Exp $ .\" -.Dd October 30, 2006 +.Dd December 26, 2006 .Dt RM 1 .Os .Sh NAME @@ -56,7 +56,7 @@ output) for confirmation. .Pp The options are as follows: -.Bl -tag -width Fl +.Bl -tag -width indent .It Fl d Attempt to remove directories as well as other types of files. .It Fl f @@ -97,7 +97,9 @@ to generate an error message and exit. The file will not be removed or overwritten. .It Fl R -Attempt to remove the file hierarchy rooted in each file argument. +Attempt to remove the file hierarchy rooted in each +.Ar file +argument. The .Fl R option implies the @@ -119,7 +121,8 @@ .It Fl W Attempt to undelete the named files. Currently, this option can only be used to recover -files covered by whiteouts. +files covered by whiteouts in a union file system (see +.Xr undelete 2 ) . .El .Pp The @@ -141,7 +144,7 @@ which performs an .Xr unlink 2 operation on the passed argument. -.Pp +.Sh EXIT STATUS The .Nm utility exits 0 if all of the named files or file hierarchies were removed, @@ -152,7 +155,7 @@ If an error occurs, .Nm exits with a value >0. -.Sh NOTE +.Sh NOTES The .Nm command uses @@ -166,12 +169,15 @@ with a dash .Pq Sq - . For example: -.Dl rm -- -filename +.Pp +.Dl "rm -- -filename" +.Pp The same behavior can be obtained by using an absolute or relative path reference. For example: -.Dl rm /home/user/-filename -.Dl rm ./-filename +.Pp +.Dl "rm /home/user/-filename" +.Dl "rm ./-filename" .Pp When .Fl P ==== //depot/projects/kmacy_wifi/bin/rmdir/rmdir.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.14 2005/05/31 12:57:44 tjr Exp $ +.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.15 2006/12/27 12:14:56 ru Exp $ .\" .Dd March 21, 2004 .Dt RMDIR 1 @@ -76,12 +76,14 @@ The .Nm utility exits with one of the following values: -.Bl -tag -width Ds -.It Li \&0 -Each directory entry specified by a dir operand +.Bl -tag -width indent +.It Li 0 +Each directory entry specified by a +.Ar directory +operand referred to an empty directory and was removed successfully. -.It Li \&>\&0 +.It Li >0 An error occurred. .El .Sh SEE ALSO @@ -89,7 +91,7 @@ .Sh STANDARDS The .Nm -command is expected to be +utility is expected to be .St -p1003.2 compatible. .Sh HISTORY ==== //depot/projects/kmacy_wifi/contrib/groff/tmac/doc-common#2 (text+ko) ==== @@ -431,11 +431,13 @@ .ds doc-operating-system-NetBSD-1.6 1.6 .ds doc-operating-system-NetBSD-1.6.1 1.6.1 .ds doc-operating-system-NetBSD-1.6.2 1.6.2 +.ds doc-operating-system-NetBSD-1.6.3 1.6.3 .ds doc-operating-system-NetBSD-2.0 2.0 .ds doc-operating-system-NetBSD-2.0.1 2.0.1 .ds doc-operating-system-NetBSD-2.0.2 2.0.2 .ds doc-operating-system-NetBSD-2.1 2.1 .ds doc-operating-system-NetBSD-3.0 3.0 +.ds doc-operating-system-NetBSD-4.0 4.0 . .ds doc-operating-system-FreeBSD-1.0 1.0 .ds doc-operating-system-FreeBSD-1.1 1.1 @@ -480,13 +482,24 @@ .ds doc-operating-system-FreeBSD-5.2.1 5.2.1 .ds doc-operating-system-FreeBSD-5.3 5.3 .ds doc-operating-system-FreeBSD-5.4 5.4 +.ds doc-operating-system-FreeBSD-5.5 5.5 .ds doc-operating-system-FreeBSD-6.0 6.0 .ds doc-operating-system-FreeBSD-6.1 6.1 +.ds doc-operating-system-FreeBSD-7.0 7.0 . .ds doc-operating-system-Darwin-8.0.0 8.0.0 .ds doc-operating-system-Darwin-8.1.0 8.1.0 .ds doc-operating-system-Darwin-8.2.0 8.2.0 .ds doc-operating-system-Darwin-8.3.0 8.3.0 +.ds doc-operating-system-Darwin-8.4.0 8.4.0 +.ds doc-operating-system-Darwin-8.5.0 8.5.0 +. +.ds doc-operating-system-DragonFly-1.0 1.0 +.ds doc-operating-system-DragonFly-1.1 1.1 +.ds doc-operating-system-DragonFly-1.2 1.2 +.ds doc-operating-system-DragonFly-1.3 1.3 +.ds doc-operating-system-DragonFly-1.4 1.4 +.ds doc-operating-system-DragonFly-1.5 1.5 . .de Os . ie "\$1"" \ ==== //depot/projects/kmacy_wifi/contrib/groff/tmac/doc-syms#2 (text+ko) ==== @@ -260,6 +260,70 @@ .. . . +.\" NS Dx user macro +.\" NS print DragonFly +.\" NS +.\" NS modifies: +.\" NS doc-arg-ptr +.\" NS doc-curr-font +.\" NS doc-curr-size +.\" NS doc-macro-name +.\" NS +.\" NS local variable: +.\" NS doc-str-Dx +.\" NS doc-str-Dx1 +.\" NS +.\" NS width register `Dx' defined in doc-common +. +.\" we use the doc-operating-system-DragonFly-* strings defined in doc-common +. +.de Dx +. nr doc-curr-font \n[.f] +. nr doc-curr-size \n[.ps] +. ds doc-str-Dx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +. +. \" default value if no argument +. ds doc-str-Dx1 \*[doc-Tn-font-size]\%DragonFly\*[doc-str-Dx] +. +. if !\n[doc-arg-limit] \ +. if \n[.$] \{\ +. ds doc-macro-name Dx +. doc-parse-args \$@ +. \} +. +. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +. nr doc-arg-ptr +1 +. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ +. ie d doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]] \ +. as doc-str-Dx1 \~\*[doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]]] +. el \{\ +. tmc mdoc warning: .Dx: Unknown DragonFly version +. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) +. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]] +. \}\} +. el \ +. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]] +. \} +. el \ +. nr doc-arg-ptr -1 +. \} +. +. \" replace current argument with result +. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Dx1] +. nr doc-type\n[doc-arg-ptr] 2 +. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +. +. \" recompute space vector for remaining arguments +. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +. nr doc-arg-limit \n[doc-arg-ptr] +. if \n[doc-num-args] \ +. doc-parse-space-vector +. +. doc-print-recursive +.. +. +. .\" NS Fx user macro .\" NS print FreeBSD .\" NS @@ -543,6 +607,12 @@ .als doc-str-St--isoC-90 doc-str-St--isoC .ds doc-str-St--isoC-99 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1999 .as doc-str-St--isoC-99 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq]) +.ds doc-str-St--isoC-amd1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995 +.as doc-str-St--isoC-amd1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Amendment 1\*[Rq]) +.ds doc-str-St--isoC-tcor1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR1:1994 +.as doc-str-St--isoC-tcor1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 1\*[Rq]) +.ds doc-str-St--isoC-tcor2 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR2:1995 +.as doc-str-St--isoC-tcor2 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 2\*[Rq]) . .\" POSIX Part 1: System API .ds doc-str-St--p1003.1 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1 @@ -604,6 +674,8 @@ . .\" Miscellaneous .ds doc-str-St--ieee754 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 754-1985 +.ds doc-str-St--ieee1275-94 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1275-1994 +.as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) .ds doc-str-St--iso8802-3 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 8802-3:1989 . .de St ==== //depot/projects/kmacy_wifi/contrib/groff/tmac/groff_mdoc.man#2 (text+ko) ==== @@ -183,6 +183,7 @@ . It "BSD Macro" . It "NetBSD Macro" . It "FreeBSD Macro" +. It "DragonFly Macro" . It "OpenBSD Macro" . It "BSD/OS Macro" . It "UNIX Macro" @@ -869,8 +870,10 @@ 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1, 5.2, 5.2.1, 5.3, 5.4, 6.0, 6.1 +.It DragonFly +1.0, 1.1, 1.2, 1.3, 1.4, 1.5 .It Darwin -8.0.0, 8.1.0, 8.2.0, 8.3.0 +8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0 .El .Ed .Pp @@ -2169,6 +2172,25 @@ command above in section .Sx "TITLE MACROS" . . +.Ss "DragonFly Macro" +. +.Pp +.Dl Usage: .Dx Oo Ao version Ac Oc ... +.Pp +.Bl -tag -width ".Li .Dx\ 1.4\ ." -compact -offset 15n +.It Li .Dx +.Dx +.It Li ".Dx 1.4 ." +.Dx 1.4 . +.El +.Pp +For possible values of +.Ao version Ac +see the description of the +.Ql .Os +command above in section +.Sx "TITLE MACROS" . +. .Ss "OpenBSD Macro" . .Pp ==== //depot/projects/kmacy_wifi/etc/rc.subr#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.71 2006/11/26 22:02:09 flz Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.72 2006/12/27 13:15:33 yar Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -408,12 +408,25 @@ # returned a zero exit code. # # required_dirs n If set, check for the existence of the given -# directories before running the default -# (re)start command. +# directories before running a (re)start command. # # required_files n If set, check for the readability of the given -# files before running the default (re)start -# command. +# files before running a (re)start command. +# +# required_modules n If set, ensure the given kernel modules are +# loaded before running a (re)start command. +# The check and possible loads are actually +# done after start_precmd so that the modules +# aren't loaded in vain, should the precmd +# return a non-zero status to indicate a error. +# If a word in the list looks like "foo:bar", +# "foo" is the KLD file name and "bar" is the +# module name. If a word looks like "foo~bar", +# "foo" is the KLD file name and "bar" is a +# egrep(1) pattern matching the module name. +# Otherwise the module name is assumed to be +# the same as the KLD file name, which is most +# common. See load_kld(). # # required_vars n If set, perform checkyesno on each of the # listed variables before running the default @@ -562,49 +575,31 @@ if [ "$_elem" != "$rc_arg" ]; then continue fi - # if there's a custom ${XXX_cmd}, # run that instead of the default # - eval _cmd=\$${rc_arg}_cmd _precmd=\$${rc_arg}_precmd \ - _postcmd=\$${rc_arg}_postcmd + eval _cmd=\$${rc_arg}_cmd \ + _precmd=\$${rc_arg}_precmd \ + _postcmd=\$${rc_arg}_postcmd + if [ -n "$_cmd" ]; then - # if the precmd failed and force - # isn't set, exit - # - if [ -n "$_precmd" ]; then - debug "run_rc_command: evaluating ${_precmd}()." - eval $_precmd $rc_extra_args - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi - - if [ -n "$_cmd" ]; then - debug "run_rc_command: evaluating ${_cmd}()." - eval $_cmd $rc_extra_args - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi - - if [ -n "$_postcmd" ]; then - debug "run_rc_command: evaluating ${_postcmd}()." - eval $_postcmd $rc_extra_args - _return=$? - fi + _run_rc_precmd || return 1 + _run_rc_doit "$_cmd $rc_extra_args" || return 1 + _run_rc_postcmd return $_return fi case "$rc_arg" in # default operations... status) + _run_rc_precmd || return 1 if [ -n "$rc_pid" ]; then echo "${name} is running as pid $rc_pid." else echo "${name} is not running." return 1 fi + _run_rc_postcmd ;; start) @@ -618,45 +613,8 @@ return 1 fi - # check for required variables, - # directories, and files - # - for _f in $required_vars; do - if ! checkyesno $_f; then - warn "\$${_f} is not enabled." - if [ -z "$rc_force" ]; then - return 1 - fi - fi - done - for _f in $required_dirs; do - if [ ! -d "${_f}/." ]; then - warn "${_f} is not a directory." - if [ -z "$rc_force" ]; then - return 1 - fi - fi - done - for _f in $required_files; do - if [ ! -r "${_f}" ]; then - warn "${_f} is not readable." - if [ -z "$rc_force" ]; then - return 1 - fi - fi - done + _run_rc_precmd || return 1 - # if the precmd failed and force - # isn't set, exit - # - if [ -n "${_precmd}" ]; then - debug "run_rc_command: evaluating ${_precmd}()." - eval $_precmd - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi - # setup the full command to run # echo "Starting ${name}." @@ -680,106 +638,52 @@ fi fi - # run the full command; - # if the cmd failed and force - # isn't set, exit + # run the full command # - debug "run_rc_command: _doit: $_doit" - eval $_doit - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 + _run_rc_doit "$_doit" || return 1 # finally, run postcmd # - if [ -n "${_postcmd}" ]; then - debug "run_rc_command: evaluating ${_postcmd}()." - eval $_postcmd - fi + _run_rc_postcmd ;; stop) if [ -z "$rc_pid" ]; then [ -n "$rc_fast" ] && return 0 - if [ -n "$pidfile" ]; then - echo 1>&2 \ - "${name} not running? (check $pidfile)." - else - echo 1>&2 "${name} not running?" - fi + _run_rc_notrunning return 1 fi - # if the precmd failed and force - # isn't set, exit - # - if [ -n "$_precmd" ]; then - eval $_precmd - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi + _run_rc_precmd || return 1 # send the signal to stop # echo "Stopping ${name}." - _doit="kill -${sig_stop:-TERM} $rc_pid" - if [ -n "$_user" ]; then - _doit="su -m $_user -c 'sh -c \"$_doit\"'" - fi - - # if the stop cmd failed and force - # isn't set, exit - # - eval $_doit - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 + _doit=$(_run_rc_killcmd "${sig_stop:-TERM}") + _run_rc_doit "$_doit" || return 1 # wait for the command to exit, # and run postcmd. wait_for_pids $rc_pid - if [ -n "$_postcmd" ]; then - eval $_postcmd - _return=$? - fi + + _run_rc_postcmd ;; reload) if [ -z "$rc_pid" ]; then - if [ -n "$pidfile" ]; then - echo 1>&2 \ - "${name} not running? (check $pidfile)." - else - echo 1>&2 "${name} not running?" - fi + _run_rc_notrunning return 1 fi - echo "Reloading ${name} config files." - if [ -n "$_precmd" ]; then - eval $_precmd - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi - _doit="kill -${sig_reload:-HUP} $rc_pid" - if [ -n "$_user" ]; then - _doit="su -m $_user -c 'sh -c \"$_doit\"'" - fi - eval $_doit - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 - if [ -n "$_postcmd" ]; then - eval $_postcmd - _return=$? - fi + + _run_rc_precmd || return 1 + + _doit=$(_run_rc_killcmd "${sig_reload:-HUP}") + _run_rc_doit "$_doit" || return 1 + + _run_rc_postcmd ;; restart) - if [ -n "$_precmd" ]; then - eval $_precmd $rc_extra_args - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi # prevent restart being called more # than once by any given script # @@ -788,20 +692,23 @@ fi _rc_restart_done=true - # run stop in a subshell to keep variables for start + _run_rc_precmd || return 1 + + # run those in a subshell to keep global variables ( run_rc_command ${_rc_prefix}stop $rc_extra_args ) - run_rc_command ${_rc_prefix}start $rc_extra_args + ( run_rc_command ${_rc_prefix}start $rc_extra_args ) + _return=$? + [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 - if [ -n "$_postcmd" ]; then - eval $_postcmd $rc_extra_args - _return=$? - fi + _run_rc_postcmd ;; poll) + _run_rc_precmd || return 1 if [ -n "$rc_pid" ]; then wait_for_pids $rc_pid fi + _run_rc_postcmd ;; rcvar) @@ -829,6 +736,83 @@ } # +# Helper functions for run_rc_command: common code. +# They use such global variables besides the exported rc_* ones: +# +# name R/W +# ------------------ +# _precmd R +# _postcmd R +# _return W +# +_run_rc_precmd() +{ + check_required_before "$rc_arg" || return 1 + + if [ -n "$_precmd" ]; then + debug "run_rc_command: ${rc_arg}_precmd: $_precmd $rc_extra_args" + eval "$_precmd $rc_extra_args" + _return=$? + + # If precmd failed and force isn't set, request exit. + if [ $_return -ne 0 ] && [ -z "$rc_force" ]; then + return 1 + fi + fi + + check_required_after "$rc_arg" || return 1 + + return 0 +} + +_run_rc_postcmd() +{ + if [ -n "$_postcmd" ]; then + debug "run_rc_command: ${rc_arg}_postcmd: $_postcmd $rc_extra_args" + eval "$_postcmd $rc_extra_args" + _return=$? + fi + return 0 +} + +_run_rc_doit() +{ + debug "run_rc_command: doit: $*" + eval "$@" + _return=$? + + # If command failed and force isn't set, request exit. + if [ $_return -ne 0 ] && [ -z "$rc_force" ]; then + return 1 + fi + + return 0 +} + +_run_rc_notrunning() +{ + local _pidmsg + + if [ -n "$pidfile" ]; then + _pidmsg=" (check $pidfile)." + else + _pidmsg= + fi + echo 1>&2 "${name} not running?${_pidmsg}" +} + +_run_rc_killcmd() +{ + local _cmd + + _cmd="kill -$1 $rc_pid" + if [ -n "$_user" ]; then + _cmd="su -m ${_user} -c 'sh -c \"${_cmd}\"'" + fi + echo "$_cmd" +} + +# # run_rc_script file arg # Start the script `file' with `arg', and correctly handle the # return value from the script. If `file' ends with `.sh', it's @@ -1486,6 +1470,74 @@ done } +# check_required_{before|after} command +# Check for things required by the command before and after its precmd, +# respectively. The two separate functions are needed because some +# conditions should prevent precmd from being run while other things +# depend on precmd having already been run. +# +check_required_before() +{ + local _f + + case "$1" in + start) + for _f in $required_vars; do + if ! checkyesno $_f; then + warn "\$${_f} is not enabled." + if [ -z "$rc_force" ]; then + return 1 + fi + fi + done + + for _f in $required_dirs; do + if [ ! -d "${_f}/." ]; then + warn "${_f} is not a directory." + if [ -z "$rc_force" ]; then + return 1 + fi + fi + done + + for _f in $required_files; do + if [ ! -r "${_f}" ]; then + warn "${_f} is not readable." + if [ -z "$rc_force" ]; then + return 1 + fi + fi + done + ;; + esac + + return 0 +} + +check_required_after() +{ + local _f _args + + case "$1" in + start) + for _f in $required_modules; do + case "${_f}" in + *~*) _args="-e ${_f#*~} ${_f%%~*}" ;; + *:*) _args="-m ${_f#*:} ${_f%%:*}" ;; + *) _args="${_f}" ;; + esac + if ! load_kld ${_args}; then + if [ -z "$rc_force" ]; then + return 1 + fi + fi + done + ;; + esac + + return 0 +} + fi _rc_subr_loaded=: ==== //depot/projects/kmacy_wifi/gnu/usr.bin/groff/tmac/mdoc.local#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.56 2006/12/05 17:01:23 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.57 2006/12/25 09:09:47 ru Exp $ .\" .\" %beginstrip% . @@ -66,7 +66,6 @@ .ds doc-default-operating-system FreeBSD\~7.0 . .\" FreeBSD releases not found in doc-common -.ds doc-operating-system-FreeBSD-5.5 5.5 .ds doc-operating-system-FreeBSD-6.2 6.2 .ds doc-operating-system-FreeBSD-6.3 6.3 .ds doc-operating-system-FreeBSD-7.0 7.0 ==== //depot/projects/kmacy_wifi/gnu/usr.bin/man/man/man.man#2 (text+ko) ==== @@ -12,7 +12,7 @@ .\" The University of Texas at Austin .\" Austin, Texas 78712 .\" -.\" $FreeBSD: src/gnu/usr.bin/man/man/man.man,v 1.26 2005/12/05 14:22:11 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/man/man/man.man,v 1.27 2006/12/25 15:09:06 ru Exp $ .\" .Dd December 3, 2005 .Dt MAN 1 @@ -31,7 +31,9 @@ .Op Ar section .Ar name ... .Sh DESCRIPTION -.Nm Man +The +.Nm +utility formats and displays the on-line manual pages. This version knows about the @@ -41,7 +43,9 @@ environment variables, so you can have your own set(s) of personal man pages and choose whatever program you like to display the formatted pages. -If section is specified, +If +.Ar section +is specified, .Nm only looks in that section of the manual. You may also specify the @@ -49,11 +53,12 @@ run on the source files via command line options or environment variables. If enabled by the system administrator, formatted man -pages will also be compressed with the `%compress%' command to save -space. +pages will also be compressed with the +.Dq Li "%compress%" +command to save space. .Pp The options are as follows: -.Bl -tag -width Fl +.Bl -tag -width ".Fl P Ar pager" .It Fl M Ar path Specify an alternate manpath. By default, @@ -72,7 +77,7 @@ By default, .Nm uses -.Nm %pager% . +.Dq Li "%pager%" . This option overrides the .Ev PAGER environment variable. @@ -172,8 +177,8 @@ .Sm on .El .Pp -For example, for -.Dq de_DE.ISO8859-1 +For example, for the +.Dq Li de_DE.ISO8859-1 locale, .Nm will search in the following subdirectories of the @@ -195,10 +200,18 @@ .Pa /usr/share/man directory. .It Fl p Ar string -Specify the sequence of preprocessors to run before nroff or troff. +Specify the sequence of preprocessors to run before +.Xr nroff 1 +or +.Xr troff 1 . Not all installations will have a full set of preprocessors. Some of the preprocessors and the letters used to designate them are: -eqn (e), grap (g), pic (p), tbl (t), vgrind (v), refer (r). +.Nm eqn Pq e , +.Nm grap Pq g , +.Nm pic Pq p , +.Nm tbl Pq t , +.Nm vgrind Pq v , +.Nm refer Pq r . This option overrides the .Ev MANROFFSEQ environment variable. @@ -245,9 +258,15 @@ If .Ev MANROFFSEQ is set, its value is used to determine the set of preprocessors run >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612282206.kBSM6Uwp035524>