Date: Tue, 10 Dec 2002 14:10:00 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 22146 for review Message-ID: <200212102210.gBAMA0PY001178@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=22146 Change 22146 by marcel@marcel_vaio on 2002/12/10 14:09:18 IFC @22142 Affected files ... .. //depot/projects/ia64/lib/libc/stdio/wscanf.3#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/getopt_long.3#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/lsearch.3#2 integrate .. //depot/projects/ia64/lib/libc/string/wcscoll.3#2 integrate .. //depot/projects/ia64/lib/libc/string/wcswidth.3#2 integrate .. //depot/projects/ia64/lib/libc/string/wcsxfrm.3#2 integrate .. //depot/projects/ia64/lib/libc/uuid/uuid.3#2 integrate .. //depot/projects/ia64/lib/libc_r/man/pthread_attr_get_np.3#2 integrate .. //depot/projects/ia64/lib/libpthread/Makefile#3 integrate .. //depot/projects/ia64/lib/libpthread/test/Makefile#2 integrate .. //depot/projects/ia64/release/Makefile#28 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#8 integrate .. //depot/projects/ia64/release/scripts/driver-desc.awk#1 branch .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#20 integrate .. //depot/projects/ia64/sbin/devfs/devfs.8#4 integrate .. //depot/projects/ia64/share/examples/cvsup/ports-supfile#3 integrate .. //depot/projects/ia64/share/man/man4/Makefile#26 integrate .. //depot/projects/ia64/share/man/man4/ahd.4#2 integrate .. //depot/projects/ia64/share/man/man4/aio.4#2 integrate .. //depot/projects/ia64/share/man/man4/atapicam.4#3 integrate .. //depot/projects/ia64/share/man/man4/crypto.4#2 integrate .. //depot/projects/ia64/share/man/man4/firewire.4#2 integrate .. //depot/projects/ia64/share/man/man4/fwe.4#2 integrate .. //depot/projects/ia64/share/man/man4/fwohci.4#2 integrate .. //depot/projects/ia64/share/man/man4/gbde.4#4 integrate .. //depot/projects/ia64/share/man/man4/gre.4#2 integrate .. //depot/projects/ia64/share/man/man4/hifn.4#2 integrate .. //depot/projects/ia64/share/man/man4/mac_biba.4#2 integrate .. //depot/projects/ia64/share/man/man4/mac_bsdextended.4#2 integrate .. //depot/projects/ia64/share/man/man4/mac_mls.4#2 integrate .. //depot/projects/ia64/share/man/man4/mac_none.4#1 branch .. //depot/projects/ia64/share/man/man4/mac_seeotheruids.4#1 branch .. //depot/projects/ia64/share/man/man4/mac_test.4#1 branch .. //depot/projects/ia64/share/man/man4/pccbb.4#2 integrate .. //depot/projects/ia64/share/man/man4/pst.4#2 integrate .. //depot/projects/ia64/share/man/man4/sbp.4#2 integrate .. //depot/projects/ia64/share/man/man4/smp.4#3 integrate .. //depot/projects/ia64/share/man/man4/targ.4#2 integrate .. //depot/projects/ia64/share/man/man4/ubsa.4#2 integrate .. //depot/projects/ia64/share/man/man4/ubsec.4#2 integrate .. //depot/projects/ia64/share/man/man4/usb.4#6 integrate .. //depot/projects/ia64/share/man/man4/uvisor.4#2 integrate .. //depot/projects/ia64/share/man/man7/ffs.7#5 integrate .. //depot/projects/ia64/share/man/man9/thread_exit.9#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#13 integrate .. //depot/projects/ia64/sys/boot/efi/Makefile.inc#10 integrate .. //depot/projects/ia64/sys/boot/efi/include/efilib.h#4 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/arch/ia64/start.S#5 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/bootinfo.c#10 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/libefi.c#5 integrate .. //depot/projects/ia64/sys/boot/efi/loader/main.c#13 integrate .. //depot/projects/ia64/sys/boot/efi/loader/version#6 integrate .. //depot/projects/ia64/sys/conf/NOTES#31 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/ohci.c#13 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs.h#8 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_devs.c#7 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vfsops.c#8 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#18 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#15 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#18 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#28 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#21 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#13 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#10 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#9 integrate .. //depot/projects/ia64/sys/security/mac_none/mac_none.c#7 integrate .. //depot/projects/ia64/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#13 integrate .. //depot/projects/ia64/sys/sys/mac.h#12 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#10 integrate .. //depot/projects/ia64/sys/sys/pcpu.h#7 integrate .. //depot/projects/ia64/sys/sys/proc.h#40 integrate .. //depot/projects/ia64/usr.bin/gprof/gprof.h#6 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/param.h#3 integrate .. //depot/projects/ia64/usr.sbin/adduser/rmuser.sh#2 integrate .. //depot/projects/ia64/usr.sbin/rpcbind/rpcbind.c#6 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#20 integrate Differences ... ==== //depot/projects/ia64/lib/libc/stdio/wscanf.3#3 (text+ko) ==== @@ -35,7 +35,7 @@ .\" .\" @(#)scanf.3 8.2 (Berkeley) 12/11/93 .\" FreeBSD: src/lib/libc/stdio/scanf.3,v 1.17 2002/05/30 09:53:47 ru Exp -.\" $FreeBSD: src/lib/libc/stdio/wscanf.3,v 1.4 2002/12/04 18:57:45 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdio/wscanf.3,v 1.5 2002/12/09 14:11:37 ru Exp $ .\" .Dd September 22, 2002 .Dt WSCANF 3 @@ -403,11 +403,11 @@ some implementations of .Fn wscanf use -.Dq A-Z +.Dq Li A-Z to represent the range of characters between -.Dq A +.Ql A and -.Dq Z . +.Ql Z . The string ends with the appearance of a character not in the (or, with a circumflex, in) set or when the field width runs out. @@ -492,7 +492,7 @@ .Xr scanf 3 , .Fn wscanf does not support the -.Dq A-Z +.Dq Li A-Z notation for specifying character ranges with the character class conversion .Pq Sq Cm %[ . ==== //depot/projects/ia64/lib/libc/stdlib/getopt_long.3#2 (text+ko) ==== @@ -1,5 +1,4 @@ .\" $NetBSD: getopt_long.3,v 1.8 2002/06/03 12:01:43 wiz Exp $ -.\" $FreeBSD: src/lib/libc/stdlib/getopt_long.3,v 1.1 2002/09/29 04:14:37 eric Exp $ .\" .\" Copyright (c) 1988, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,6 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getopt.3 8.5 (Berkeley) 4/27/95 +.\" $FreeBSD: src/lib/libc/stdlib/getopt_long.3,v 1.2 2002/12/09 13:54:29 ru Exp $ .\" .Dd April 1, 2000 .Dt GETOPT_LONG 3 @@ -43,23 +43,29 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.Fd #include \*[Lt]getopt.h\*[Gt] +.In getopt.h .Ft int -.Fn getopt_long "int argc" "char * const *argv" "const char *optstring" "struct option *long options" "int *index" +.Fo getopt_long +.Fa "int argc" "char * const *argv" "const char *optstring" +.Fa "struct option *long options" "int *index" +.Fc .Sh DESCRIPTION The .Fn getopt_long function is similar to .Xr getopt 3 -but it accepts options in two forms: words and characters. The +but it accepts options in two forms: words and characters. +The .Fn getopt_long -function provides a superset of of the functionality of +function provides a superset of the functionality of .Xr getopt 3 . .Fn getopt_long -can be used in two ways. In the first way, every long option understood +can be used in two ways. +In the first way, every long option understood by the program has a corresponding short option, and the option structure is only used to translate from long options to short -options. When used in this fashion, +options. +When used in this fashion, .Fn getopt_long behaves identically to .Xr getopt 3 . @@ -67,32 +73,35 @@ with the minimum of rewriting. .Pp In the second mechanism, a long option sets a flag in the -.Fa option +.Vt option structure passed, or will store a pointer to the command line argument in the -.Fa option -structure passed to it for options that take arguments. Additionally, +.Vt option +structure passed to it for options that take arguments. +Additionally, the long option's argument may be specified as a single argument with -an equal sign, e.g. -.Bd -literal -myprogram --myoption=somevalue -.Ed +an equal sign, e.g., +.Pp +.Dl "myprogram --myoption=somevalue" .Pp -When a long option is processed the call to +When a long option is processed, the call to .Fn getopt_long -will return 0. For this reason, long option processing without +will return 0. +For this reason, long option processing without shortcuts is not backwards compatible with .Xr getopt 3 . .Pp It is possible to combine these methods, providing for long options -processing with short option equivalents for some options. Less +processing with short option equivalents for some options. +Less frequently used options would be processed as long options only. .Pp The .Fn getopt_long call requires a structure to be initialized describing the long -options. The structure is: -.Bd -literal +options. +The structure is: +.Bd -literal -offset indent struct option { char *name; int has_arg; @@ -102,34 +111,43 @@ .Ed .Pp The -.Fa name +.Va name field should contain the option name without the leading double dash. .Pp The -.Fa has_arg +.Va has_arg field should be one of: -.Bl -tag -width "optional_argument" -.It Li no_argument -no argument to the option is expect. -.It Li required_argument -an argument to the option is required. +.Pp +.Bl -tag -width ".Dv optional_argument" -offset indent -compact +.It Dv no_argument +no argument to the option is expect +.It Dv required_argument +an argument to the option is required .It Li optional_argument an argument to the option may be presented. .El .Pp If -.Fa flag -is non-NULL, then the integer pointed to by it will be set to the +.Va flag +is not +.Dv NULL , +then the integer pointed to by it will be set to the value in the -.Fa val -field. If the -.Fa flag -field is NULL, then the -.Fa val -field will be returned. Setting -.Fa flag -to NULL and setting -.Fa val +.Va val +field. +If the +.Va flag +field is +.Dv NULL , +then the +.Va val +field will be returned. +Setting +.Va flag +to +.Dv NULL +and setting +.Va val to the corresponding short option will make this function act just like .Xr getopt 3 . @@ -175,101 +193,206 @@ argv += optind; .Ed .Sh IMPLEMENTATION DIFFERENCES -This section describes differences to the GNU implementation +This section describes differences to the +.Tn GNU +implementation found in glibc-2.1.3: -.Bl -tag -width "xxx" -.It Li o -handling of - as first char of option string in presence of -environment variable POSIXLY_CORRECT: -.Bl -tag -width "NetBSD" -.It Li GNU -ignores POSIXLY_CORRECT and returns non-options as +.Bl -bullet +.It +Handling of +.Ql - +as first char of option string in presence of +environment variable +.Ev POSIXLY_CORRECT : +.Bl -tag -width ".Nx" +.It Tn GNU +ignores +.Ev POSIXLY_CORRECT +and returns non-options as arguments to option '\e1'. -.It Li NetBSD -honors POSIXLY_CORRECT and stops at the first non-option. +.It Nx +honors +.Ev POSIXLY_CORRECT +and stops at the first non-option. .El -.It Li o -handling of :: in options string in presence of POSIXLY_CORRECT: -.Bl -tag -width "NetBSD" -.It Li Both -GNU and NetBSD ignore POSIXLY_CORRECT here and take :: to +.It +Handling of +.Ql :: +in options string in presence of +.Ev POSIXLY_CORRECT : +.Bl -tag -width ".Nx" +.It Both +.Tn GNU +and +.Nx +ignore +.Ev POSIXLY_CORRECT +here and take +.Ql :: +to mean the preceding option takes an optional argument. .El -.It Li o -return value in case of missing argument if first character -(after + or -) in option string is not ':': -.Bl -tag -width "NetBSD" -.It Li GNU -returns '?' -.It NetBSD -returns ':' (since NetBSD's getopt does). +.It +Return value in case of missing argument if first character +(after +.Ql + +or +.Ql - ) +in option string is not +.Ql \&: : +.Bl -tag -width ".Nx" +.It Tn GNU +returns +.Ql \&? +.It Nx +returns +.Ql \&: +(since +.Nx Ns 's +.Fn getopt +does). .El -.It Li o -handling of --a in getopt: -.Bl -tag -width "NetBSD" -.It Li GNU -parses this as option '-', option 'a'. -.It Li NetBSD -parses this as '--', and returns -1 (ignoring the a). (Because -the original getopt does.) +.It +Handling of +.Ql --a +in getopt: +.Bl -tag -width ".Nx" +.It Tn GNU +parses this as option +.Ql - , +option +.Ql a . +.It Nx +parses this as +.Ql -- , +and returns \-1 (ignoring the +.Ql a ) . +(Because the original +.Fn getopt +does.) .El -.It Li o -setting of optopt for long options with flag != NULL: -.Bl -tag -width "NetBSD" -.It Li GNU -sets optopt to val. -.It Li NetBSD -sets optopt to 0 (since val would never be returned). +.It +Setting of +.Va optopt +for long options with +.Va flag +!= +.Dv NULL : +.Bl -tag -width ".Nx" +.It Tn GNU +sets +.Va optopt +to +.Va val . +.It Nx +sets +.Va optopt +to 0 (since +.Va val +would never be returned). .El -.It Li o -handling of -W with W; in option string in getopt (not getopt_long): -.Bl -tag -width "NetBSD" -.It Li GNU +.It +Handling of +.Ql -W +with +.Ql W ; +in option string in +.Fn getopt +(not +.Fn getopt_long ) : +.Bl -tag -width ".Nx" +.It Tn GNU causes a segfault. -.It Li NetBSD -returns -1, with optind pointing past the argument of -W -(as if `-W arg' were `--arg', and thus '--' had been found). +.It Nx +returns \-1, with +.Va optind +pointing past the argument of +.Ql -W +(as if +.Ql "-W arg" +were +.Ql --arg , +and thus +.Ql -- +had been found). .\" How should we treat W; in the option string when called via .\" getopt? Ignore the ';' or treat it as a ':'? Issue a warning? .El -.It Li o -setting of optarg for long options without an argument that are -invoked via -W (W; in option string): -.Bl -tag -width "NetBSD" -.It Li GNU -sets optarg to the option name (the argument of -W). -.It Li NetBSD -sets optarg to NULL (the argument of the long option). +.It +Setting of +.Va optarg +for long options without an argument that are +invoked via +.Ql -W +.Ql ( W ; +in option string): +.Bl -tag -width ".Nx" +.It Tn GNU +sets +.Va optarg +to the option name (the argument of +.Ql -W ) . +.It Nx +sets +.Va optarg +to +.Dv NULL +(the argument of the long option). .El -.It Li o -handling of -W with an argument that is not (a prefix to) a known -long option (W; in option string): -.Bl -tag -width "NetBSD" -.It Li GNU -returns -W with optarg set to the unknown option. -.It Li NetBSD -treats this as an error (unknown option) and returns '?' with -optopt set to 0 and optarg set to NULL (as GNU's man page -documents). +.It +Handling of +.Ql -W +with an argument that is not (a prefix to) a known +long option +.Ql ( W ; +in option string): +.Bl -tag -width ".Nx" +.It Tn GNU +returns +.Ql -W +with +.Va optarg +set to the unknown option. +.It Nx +treats this as an error (unknown option) and returns +.Ql \&? +with +.Va optopt +set to 0 and +.Va optarg +set to +.Dv NULL +(as +.Tn GNU Ns 's +man page documents). .El -.It Li o +.It The error messages are different. -.It Li o -NetBSD does not permute the argument vector at the same points in -the calling sequence as GNU does. The aspects normally used by -the caller (ordering after -1 is returned, value of optind relative -to current positions) are the same, though. (We do fewer variable -swaps.) +.It +.Nx +does not permute the argument vector at the same points in +the calling sequence as +.Tn GNU +does. +The aspects normally used by +the caller (ordering after \-1 is returned, value of +.Va optind +relative +to current positions) are the same, though. +(We do fewer variable swaps.) .El .Sh SEE ALSO .Xr getopt 3 .Sh HISTORY The .Fn getopt_long -function first appeared in GNU libiberty. The first +function first appeared in +.Tn GNU +libiberty. +The first .Nx implementation appeared in 1.5. .Sh BUGS -The implementation, can completelely replace +The implementation can completely replace .Xr getopt 3 , but right now we are using separate code. ==== //depot/projects/ia64/lib/libc/stdlib/lsearch.3#2 (text+ko) ==== @@ -4,9 +4,9 @@ .\" All rights reserved. .\" .\" As long as the above copyright statement and this notice remain -.\" unchanged, you can do what ever you want with this file. +.\" unchanged, you can do what ever you want with this file. .\" -.\" $FreeBSD: src/lib/libc/stdlib/lsearch.3,v 1.1 2002/10/16 14:29:22 robert Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/lsearch.3,v 1.2 2002/12/09 13:14:15 ru Exp $ .\" .Dd October 11, 2002 .Dt LSEARCH 3 @@ -19,14 +19,17 @@ .Lb libc .Sh SYNOPSIS .In search.h -.Ft void * -.Fn lsearch "const void *key" "void *base" "size_t *nelp" "size_t width" \ - "int (*compar)(const void *, const void *)" -.Ft void * -.Fn lfind "const void *key" "const void *base" "size_t *nelp" "size_t width" \ - "int (*compar)(const void *, const void *)" +.Ft "void *" +.Fo lsearch +.Fa "const void *key" "void *base" "size_t *nelp" "size_t width" +.Fa "int \*[lp]*compar\*[rp]\*[lp]const void *, const void *\*[rp]" +.Fc +.Ft "void *" +.Fo lfind +.Fa "const void *key" "const void *base" "size_t *nelp" "size_t width" +.Fa "int \*[lp]*compar\*[rp]\*[lp]const void *, const void *\*[rp]" +.Fc .Sh DESCRIPTION -.Pp The .Fn lsearch and @@ -36,13 +39,13 @@ .Pp .Fa key points to an element that matches the one that is searched. -The array's address in memory is denoted by the +The array's address in memory is denoted by the .Fa base argument. -The width of one element (i.e. the size as returned by +The width of one element (i.e., the size as returned by .Fn sizeof ) -is passed as the -.Fa width +is passed as the +.Fa width argument. The number of valid elements contained in the array (not the number of elements the array has space reserved for) is given in the integer pointed @@ -51,10 +54,10 @@ The .Fa compar argument points to a function which compares its two arguments and returns -zero if they are matching and non-zero otherwise. +zero if they are matching, and non-zero otherwise. .Pp -If no matching element was found in the array, -.Fn lsearch +If no matching element was found in the array, +.Fn lsearch copies .Fa key into the position after the last element and increments the ==== //depot/projects/ia64/lib/libc/string/wcscoll.3#2 (text+ko) ==== @@ -34,8 +34,8 @@ .\" SUCH DAMAGE. .\" .\" @(#)strcoll.3 8.1 (Berkeley) 6/4/93 -.\" FreeBSD: src/lib/libc/string/strcoll.3,v 1.11 2001/10/01 16:09:00 ru Exp -.\" $FreeBSD: src/lib/libc/string/wcscoll.3,v 1.1 2002/10/04 03:18:26 tjr Exp $ +.\" FreeBSD: src/lib/libc/string/strcoll.3,v 1.11 2001/10/01 16:09:00 ru Exp +.\" $FreeBSD: src/lib/libc/string/wcscoll.3,v 1.2 2002/12/09 14:04:05 ru Exp $ .\" .Dd October 4, 2002 .Dt WCSCOLL 3 ==== //depot/projects/ia64/lib/libc/string/wcswidth.3#2 (text+ko) ==== @@ -22,8 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/string/wcswidth.3,v 1.1 2002/08/20 03:40:45 tjr Exp $ -.Dd August 8, 1999 +.\" $FreeBSD: src/lib/libc/string/wcswidth.3,v 1.2 2002/12/09 14:04:05 ru Exp $ +.\" +.Dd August 20, 2002 .Dt WCSWIDTH 3 .Os .Sh NAME @@ -49,7 +50,7 @@ function returns 0 if .Fa pwcs is an empty string (L""), --1 if a non-printing wide character is encountered, +\-1 if a non-printing wide character is encountered, otherwise it returns the number of column positions occupied. .Sh SEE ALSO .Xr iswprint 3 , ==== //depot/projects/ia64/lib/libc/string/wcsxfrm.3#2 (text+ko) ==== @@ -34,8 +34,8 @@ .\" SUCH DAMAGE. .\" .\" @(#)strxfrm.3 8.1 (Berkeley) 6/4/93 -.\" FreeBSD: src/lib/libc/string/strxfrm.3,v 1.16 2002/09/06 11:24:06 tjr Exp -.\" $FreeBSD: src/lib/libc/string/wcsxfrm.3,v 1.1 2002/10/04 03:18:26 tjr Exp $ +.\" FreeBSD: src/lib/libc/string/strxfrm.3,v 1.16 2002/09/06 11:24:06 tjr Exp +.\" $FreeBSD: src/lib/libc/string/wcsxfrm.3,v 1.2 2002/12/09 14:04:05 ru Exp $ .\" .Dd October 4, 2002 .Dt WCSXFRM 3 @@ -69,7 +69,9 @@ (it helps to determine an actual size needed for transformation), .Fa dst -is permitted to be a NULL pointer. +is permitted to be a +.Dv NULL +pointer. .Pp Comparing two strings using .Fn wcscmp @@ -91,8 +93,8 @@ .Sh SEE ALSO .Xr setlocale 3 , .Xr strxfrm 3 , -.Xr wcscoll 3 , -.Xr wcscmp 3 +.Xr wcscmp 3 , +.Xr wcscoll 3 .Sh STANDARDS The .Fn wcsxfrm @@ -117,7 +119,7 @@ always equivalent to comparison with .Fn wcscoll ; .Fn wcsxfrm -only stores information about primary collation weights into +only stores information about primary collation weights into .Fa dst , whereas .Fn wcscoll ==== //depot/projects/ia64/lib/libc/uuid/uuid.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.1 2002/10/30 03:51:00 marcel Exp $ +.\" $FreeBSD: src/lib/libc/uuid/uuid.3,v 1.2 2002/12/09 12:47:18 ru Exp $ .\" .Dd October 29, 2002 .Dt UUID 3 @@ -77,9 +77,10 @@ The successful or unsuccessful completion of the function is returned in the .Fa status -parameter. Possible values are: +parameter. +Possible values are: .Pp -.Bl -tag -width uuid_s_invalid_string_uuid +.Bl -tag -width ".Dv uuid_s_invalid_string_uuid" .It Dv uuid_s_ok The function completed successfully. .It Dv uuid_s_bad_version ==== //depot/projects/ia64/lib/libc_r/man/pthread_attr_get_np.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .\" Copyright (c) 2002 Alexey Zelkin <phantom@FreeBSD.org> .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -9,7 +9,7 @@ .\" 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 @@ -22,7 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc_r/man/pthread_attr_get_np.3,v 1.1 2002/10/26 15:04:29 phantom Exp $ +.\" $FreeBSD: src/lib/libc_r/man/pthread_attr_get_np.3,v 1.2 2002/12/09 12:41:29 ru Exp $ +.\" .Dd October 26, 2002 .Dt PTHREAD_ATTR_GET_NP 3 .Os @@ -44,11 +45,12 @@ is supposed to be used in conjunction with .Fn pthread_attr_get* functions to retrive individual values from -.Ft pthread_attr_t -structure. Parameter +.Vt pthread_attr_t +structure. +Parameter .Fa dst should point to allocated memory area big enough to fit this structure. -It's HIGHLY RECOMENDED to use +It is HIGHLY RECOMMENDED to use .Xr pthread_attr_init 3 function to allocate attribute storage. .Sh EXAMPLES @@ -77,19 +79,17 @@ .Bl -tag -width Er .It Bq Er EINVAL Invalid value for one of given parameters. -.El -.Bl -tag -width Er -.It Bq Er ESRCH +.It Bq Er ESRC No thread could be found corresponding to that specified by the given thread ID. .El .Sh SEE ALSO -.Xr pthread_attr_init 3 , .Xr pthread_attr_destroy 3 , -.Xr pthread_attr_getstacksize 3 , -.Xr pthread_attr_getstackaddr 3 , .Xr pthread_attr_getdetachstate 3 , .Xr pthread_attr_getinheritsched 3 , .Xr pthread_attr_getschedparam 3 , .Xr pthread_attr_getschedpolicy 3 , -.Xr pthread_attr_getscope 3 +.Xr pthread_attr_getscope 3 , +.Xr pthread_attr_getstackaddr 3 , +.Xr pthread_attr_getstacksize 3 , +.Xr pthread_attr_init 3 ==== //depot/projects/ia64/lib/libpthread/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/Makefile,v 1.34 2002/09/28 00:25:31 peter Exp $ +# $FreeBSD: src/lib/libpthread/Makefile,v 1.35 2002/12/08 22:43:31 deischen Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -7,8 +7,8 @@ # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -LIB=pthread -SHLIB_MAJOR= 5 +LIB=kse +SHLIB_MAJOR= 1 CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include ==== //depot/projects/ia64/lib/libpthread/test/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libpthread/test/Makefile,v 1.10 2002/09/16 19:29:34 mini Exp $ +# $FreeBSD: src/lib/libpthread/test/Makefile,v 1.11 2002/12/08 22:43:31 deischen Exp $ # # Automated test suite for libpthread (pthreads). # @@ -26,7 +26,7 @@ LDFLAGS_A := -static LDFLAGS_P := -pg LDFLAGS_S := -LIBS := -lpthread +LIBS := -lkse # Flags passed to verify. "-v" or "-u" may be useful. VFLAGS := ==== //depot/projects/ia64/release/Makefile#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.732 2002/12/03 04:02:13 des Exp $ +# $FreeBSD: src/release/Makefile,v 1.735 2002/12/10 16:35:44 bmah Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \ # [ RELEASETAG=tag ] @@ -788,6 +788,10 @@ ${MNT} ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL} # Do our last minute floppies directory setup in a convenient place. .if !defined(NODOC) +.if ${TARGET} == "i386" + @(cd ${RD}/driversfd; awk -f ${.CURDIR}/scripts/driver-desc.awk \ + *.dsc >> ${RD}/floppies/DRIVERS.TXT) +.endif @cp ${RND}/${RELNOTES_LANG}/installation/${TARGET}/article.txt \ ${RD}/floppies/README.TXT @(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5) @@ -888,12 +892,12 @@ @if [ -r ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ]; then \ echo "Creating ISO images..."; \ sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ - fbsd_miniinst ${CD}/miniinst.iso ${CD_DISC1}; \ + fbsd_miniinst ${CD}/${BUILDNAME}-${TARGET}-miniinst.iso ${CD_DISC1}; \ sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ - fbsd_livefs ${CD}/disc2.iso ${CD_DISC2}; \ + fbsd_livefs ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2}; \ if [ "x${CD_EXTRA_BITS}" != "x" ]; then \ sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ - fbsd_boot ${CD}/disc1.iso ${CD_DISC1} ${CD_EXTRA_BITS} \ + fbsd_boot ${CD}/${BUILDNAME}-${TARGET}-disc1.iso ${CD_DISC1} ${CD_EXTRA_BITS} \ && false; \ fi \ else \ ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#8 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- -$FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/install.sgml,v 1.16 2002/11/15 17:57:51 bmah Exp $ +$FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/install.sgml,v 1.17 2002/12/09 16:11:56 murray Exp $ install.sgml @@ -134,10 +134,12 @@ supports bootable CDROMs, the steps outlined in this section will not be needed and can be skipped.</para> - <para arch="i386,alpha">For a normal CDROM or network installation, all you need to + <para arch="i386,alpha">For most CDROM or network installations, all you need to copy onto actual floppies from the <filename>floppies/</filename> directory are the <filename>kern.flp</filename> and <filename>mfsroot.flp</filename> - images (for 1.44MB floppies).</para> + images (for 1.44MB floppies). Depending on your hardware, you may + also need to make the third <filename>drivers.flp</filename> image + to provide necessary device drivers.</para> <para arch="pc98">For a normal CDROM or network installation, all you need to copy onto actual floppies from the <filename>floppies/</filename> @@ -147,9 +149,10 @@ <para arch="i386,alpha,pc98">Getting these images over the network is easy. Simply fetch the - <replaceable>release</replaceable><filename>/floppies/kern.flp</filename> + <replaceable>release</replaceable><filename>/floppies/kern.flp</filename>, + <replaceable>release</replaceable><filename>/floppies/mfsroot.flp</filename>, and - <replaceable>release</replaceable><filename>/floppies/mfsroot.flp</filename> + <replaceable>release</replaceable><filename>/floppies/drivers.flp</filename> files from <ulink url="&release.url;"></ulink> or one of the many mirrors listed at <ulink ==== //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#20 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.37 2002/12/01 18:03:42 bmah Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.38 2002/12/09 16:55:25 bmah Exp $ # # MAINTAINER: jkh # @@ -68,6 +68,7 @@ else CDROM_SET_1="${CDROM_SET_1} emulators/linux_base" fi +CDROM_SET_1="${CDROM_SET_1} lang/perl5" CDROM_SET_1="${CDROM_SET_1} net/pcnfsd" CDROM_SET_1="${CDROM_SET_1} net/rsync" CDROM_SET_1="${CDROM_SET_1} x11-fonts/XFree86-4-font100dpi" @@ -107,7 +108,6 @@ CDROM_SET_1="${CDROM_SET_1} graphics/xpdf" CDROM_SET_1="${CDROM_SET_1} graphics/xv" CDROM_SET_1="${CDROM_SET_1} irc/xchat" -CDROM_SET_1="${CDROM_SET_1} lang/perl5" CDROM_SET_1="${CDROM_SET_1} mail/exim" CDROM_SET_1="${CDROM_SET_1} mail/fetchmail" CDROM_SET_1="${CDROM_SET_1} mail/mutt" ==== //depot/projects/ia64/sbin/devfs/devfs.8#4 (text+ko) ==== @@ -23,10 +23,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.4 2002/10/08 04:21:54 dd Exp $ +.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.5 2002/12/09 13:06:34 ru Exp $ .\" +.Dd July 1, 2002 .Dt DEVFS 8 -.Dd July 1, 2002 .Os .Sh NAME .Nm devfs @@ -34,7 +34,7 @@ .Sh SYNOPSIS .Nm .Op Fl m Ar mount-point -.Cm keyword +.Ar keyword .Ar argument ... .Sh DESCRIPTION The @@ -106,17 +106,20 @@ .Ar rulenum if it is explicitly specified; otherwise, the rule number is automatically determined by the kernel. -.It Cm rule apply Ar rulenum | Ar rulespec +.It Cm rule apply Ar rulenum | rulespec Apply rule number .Ar rulenum or the rule described by .Ar rulespec to the mount-point. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212102210.gBAMA0PY001178>