PERFORCE change 32345 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sun Jun 1 17:46:45 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=32345
Change 32345 by marcel at marcel_nfs on 2003/06/01 17:46:11
IFC @32344
Affected files ...
.. //depot/projects/ia64/gnu/lib/csu/Makefile#13 integrate
.. //depot/projects/ia64/lib/libalias/alias.h#4 integrate
.. //depot/projects/ia64/lib/libalias/alias_db.c#6 integrate
.. //depot/projects/ia64/lib/libalias/libalias.3#3 integrate
.. //depot/projects/ia64/lib/libc/gen/dlinfo.3#5 integrate
.. //depot/projects/ia64/lib/libc/gen/fpclassify.3#3 integrate
.. //depot/projects/ia64/lib/libc/gen/fts.3#6 integrate
.. //depot/projects/ia64/lib/libc/gen/isgreater.3#2 integrate
.. //depot/projects/ia64/lib/libc/gen/wordexp.3#5 integrate
.. //depot/projects/ia64/lib/libc/ia64/gen/makecontext.c#4 integrate
.. //depot/projects/ia64/lib/libc/stdlib/grantpt.3#2 integrate
.. //depot/projects/ia64/lib/libc/sys/lio_listio.2#2 integrate
.. //depot/projects/ia64/lib/libc_r/test/Makefile#2 integrate
.. //depot/projects/ia64/lib/libc_r/test/guard_b.c#3 integrate
.. //depot/projects/ia64/lib/libugidfw/bsde_get_rule.3#2 integrate
.. //depot/projects/ia64/lib/libugidfw/bsde_get_rule_count.3#2 integrate
.. //depot/projects/ia64/lib/libugidfw/bsde_parse_rule.3#2 integrate
.. //depot/projects/ia64/lib/libugidfw/bsde_rule_to_string.3#2 integrate
.. //depot/projects/ia64/lib/libugidfw/libugidfw.3#2 integrate
.. //depot/projects/ia64/libexec/ftpd/ftpchroot.5#3 integrate
.. //depot/projects/ia64/release/alpha/drivers.conf#15 integrate
.. //depot/projects/ia64/release/i386/drivers.conf#20 integrate
.. //depot/projects/ia64/release/pc98/drivers.conf#10 integrate
.. //depot/projects/ia64/secure/lib/libcrypto/Makefile#19 integrate
.. //depot/projects/ia64/share/man/man4/mac.4#8 integrate
.. //depot/projects/ia64/share/man/man4/mac_biba.4#13 integrate
.. //depot/projects/ia64/share/man/man4/mac_bsdextended.4#9 integrate
.. //depot/projects/ia64/share/man/man4/mac_ifoff.4#6 integrate
.. //depot/projects/ia64/share/man/man4/mac_lomac.4#6 integrate
.. //depot/projects/ia64/share/man/man4/mac_mls.4#12 integrate
.. //depot/projects/ia64/share/man/man4/mac_none.4#7 integrate
.. //depot/projects/ia64/share/man/man4/mac_partition.4#7 integrate
.. //depot/projects/ia64/share/man/man4/mac_seeotheruids.4#7 integrate
.. //depot/projects/ia64/share/man/man4/mac_test.4#7 integrate
.. //depot/projects/ia64/share/mk/bsd.sys.mk#16 integrate
.. //depot/projects/ia64/share/mk/sys.mk#8 integrate
.. //depot/projects/ia64/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/ia64/sys/amd64/include/profile.h#2 integrate
.. //depot/projects/ia64/sys/boot/i386/boot0/boot0.s#2 integrate
.. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#15 integrate
.. //depot/projects/ia64/sys/conf/kern.post.mk#30 integrate
.. //depot/projects/ia64/sys/i386/conf/GENERIC#36 integrate
.. //depot/projects/ia64/sys/i386/include/profile.h#6 integrate
.. //depot/projects/ia64/sys/ia64/ia64/machdep.c#76 integrate
.. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#27 integrate
.. //depot/projects/ia64/sys/pci/if_dc.c#36 integrate
.. //depot/projects/ia64/sys/vm/vm_object.c#56 integrate
.. //depot/projects/ia64/sys/vm/vm_object.h#22 integrate
.. //depot/projects/ia64/usr.bin/lorder/lorder.sh#3 integrate
Differences ...
==== //depot/projects/ia64/gnu/lib/csu/Makefile#13 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.16 2003/02/27 09:19:31 ru Exp $
+# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.17 2003/06/01 22:18:05 obrien Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
CCDIR= ${.CURDIR}/../../usr.bin/cc
@@ -9,6 +9,7 @@
SRCS= crtstuff.c tconfig.h
OBJS= crtbegin.o crtend.o
SOBJS= crtbegin.So crtend.So
+CSTD= gnu89
CFLAGS+= -DIN_GCC -DHAVE_LD_EH_FRAME_HDR
CFLAGS+= -finhibit-size-directive -fno-inline-functions \
-fno-exceptions -fno-omit-frame-pointer
==== //depot/projects/ia64/lib/libalias/alias.h#4 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libalias/alias.h,v 1.23 2002/07/01 11:19:40 brian Exp $
+ * $FreeBSD: src/lib/libalias/alias.h,v 1.24 2003/06/01 23:15:00 ru Exp $
*/
/*-
@@ -69,6 +69,7 @@
struct alias_link *
PacketAliasRedirectAddr(struct in_addr _src_addr,
struct in_addr _alias_addr);
+int PacketAliasRedirectDynamic(struct alias_link *_link);
void PacketAliasRedirectDelete(struct alias_link *_link);
struct alias_link *
PacketAliasRedirectPort(struct in_addr _src_addr,
==== //depot/projects/ia64/lib/libalias/alias_db.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libalias/alias_db.c,v 1.51 2002/07/18 05:18:41 luigi Exp $");
+__FBSDID("$FreeBSD: src/lib/libalias/alias_db.c,v 1.53 2003/06/01 23:15:00 ru Exp $");
/*
Alias_db.c encapsulates all data structures used for storing
@@ -1239,7 +1239,7 @@
specified as using the default source address
(i.e. device interface address) without knowing
in advance what that address is. */
- if (aliasAddress.s_addr != 0 &&
+ if (aliasAddress.s_addr != INADDR_ANY &&
src_addr.s_addr == aliasAddress.s_addr)
{
link = _FindLinkOut(nullAddress, dst_addr, src_port, dst_port,
@@ -1395,7 +1395,7 @@
specified as using the default aliasing address
(i.e. device interface address) without knowing
in advance what that address is. */
- if (aliasAddress.s_addr != 0 &&
+ if (aliasAddress.s_addr != INADDR_ANY &&
alias_addr.s_addr == aliasAddress.s_addr)
{
link = _FindLinkIn(dst_addr, nullAddress, dst_port, alias_port,
@@ -1805,7 +1805,8 @@
if (targetAddress.s_addr == INADDR_ANY)
return alias_addr;
else if (targetAddress.s_addr == INADDR_NONE)
- return aliasAddress;
+ return (aliasAddress.s_addr != INADDR_ANY) ?
+ aliasAddress : alias_addr;
else
return targetAddress;
}
@@ -1818,7 +1819,8 @@
link->server = link->server->next;
return (src_addr);
} else if (link->src_addr.s_addr == INADDR_ANY)
- return aliasAddress;
+ return (aliasAddress.s_addr != INADDR_ANY) ?
+ aliasAddress : alias_addr;
else
return link->src_addr;
}
@@ -1834,12 +1836,14 @@
0, 0, LINK_ADDR, 0);
if (link == NULL)
{
- return aliasAddress;
+ return (aliasAddress.s_addr != INADDR_ANY) ?
+ aliasAddress : original_addr;
}
else
{
if (link->alias_addr.s_addr == INADDR_ANY)
- return aliasAddress;
+ return (aliasAddress.s_addr != INADDR_ANY) ?
+ aliasAddress : original_addr;
else
return link->alias_addr;
}
@@ -2354,6 +2358,7 @@
PacketAliasAddServer()
PacketAliasRedirectProto()
PacketAliasRedirectAddr()
+ PacketAliasRedirectDynamic()
PacketAliasRedirectDelete()
PacketAliasSetAddress()
PacketAliasInit()
@@ -2495,6 +2500,20 @@
}
+/* Mark the aliasing link dynamic */
+int
+PacketAliasRedirectDynamic(struct alias_link *link)
+{
+
+ if (link->flags & LINK_PARTIALLY_SPECIFIED)
+ return (-1);
+ else {
+ link->flags &= ~LINK_PERMANENT;
+ return (0);
+ }
+}
+
+
void
PacketAliasRedirectDelete(struct alias_link *link)
{
==== //depot/projects/ia64/lib/libalias/libalias.3#3 (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/libalias/libalias.3,v 1.41 2001/11/03 11:34:09 brian Exp $
+.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.43 2003/06/01 23:15:00 ru Exp $
.\"
.Dd April 13, 2000
.Dt LIBALIAS 3
@@ -66,11 +66,12 @@
of the kernel, without any access to private kernel data structure, but
the source code can also be ported to a kernel environment.
.Sh INITIALIZATION AND CONTROL
-Two special functions,
-.Fn PacketAliasInit
-and
-.Fn PacketAliasSetAddress ,
+One special function,
+.Fn PacketAliasInit ,
must always be called before any packet handling may be performed.
+Normally, the
+.Fn PacketAliasSetAddress
+function is called afterwards, to set the default aliasing address.
In addition, the operating mode of the packet aliasing engine can be
customized by calling
.Fn PacketAliasSetMode .
@@ -98,7 +99,7 @@
This function will always return the packet aliasing engine to the same
initial state.
.Fn PacketAliasSetAddress
-must be called afterwards, and any desired changes from the default mode
+is normally called afterwards, and any desired changes from the default mode
bits listed above require a call to
.Fn PacketAliasSetMode .
.Pp
@@ -130,6 +131,8 @@
All outgoing packets are re-mapped to this address unless overridden by a
static address mapping established by
.Fn PacketAliasRedirectAddr .
+If this function is not called, and no static rules match, an outgoing
+packet retains its source address.
.Pp
If the
.Dv PKT_ALIAS_RESET_ON_ADDR_CHANGE
@@ -542,7 +545,26 @@
.Fa port
argument is ignored and could have any value, e.g. htons(~0).
.Pp
-This function returns 0 on success, -1 otherwise.
+This function returns 0 on success, \-1 otherwise.
+.Ed
+.Pp
+.Ft int
+.Fn PacketAliasRedirectDynamic "struct alias_link *link"
+.Bd -ragged -offset indent
+This function marks the specified static redirect rule entered by
+.Fn PacketAliasRedirectPort
+as dynamic.
+This can be used to e.g. dynamically redirect a single TCP connection,
+after which the rule is removed.
+Only fully specified links can be made dynamic.
+(See the
+.Sx STATIC AND DYNAMIC LINKS
+and
+.Sx PARTIALLY SPECIFIED ALIASING LINKS
+sections below for a definition of static vs. dynamic,
+and partially vs. fully specified links.)
+.Pp
+This function returns 0 on success, \-1 otherwise.
.Ed
.Pp
.Ft void
==== //depot/projects/ia64/lib/libc/gen/dlinfo.3#5 (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/gen/dlinfo.3,v 1.5 2003/05/18 21:05:21 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.6 2003/06/01 19:19:59 ru Exp $
.\"
.Dd February 14, 2003
.Os
@@ -37,7 +37,7 @@
.In link.h
.In dlfcn.h
.Ft int
-.Fn dlinfo "void * __restrict handle" "int request" "void * __restrict p"
+.Fn dlinfo "void * restrict handle" "int request" "void * restrict p"
.Sh DESCRIPTION
The
.Fn dlinfo
@@ -50,154 +50,168 @@
.Fa request
argument provided by caller.
.Pp
-A
+The
.Fa handle
-argument is either the value returned from a
-.Fn dlopen
+argument is either the value returned from the
+.Xr dlopen 3
function call or special handle
.Dv RTLD_SELF .
-If handle is the value returned from
-.Fn dlopen
-call, the information returned by the
+If
+.Fa handle
+is the value returned from
+.Xr dlopen 3 ,
+the information returned by the
.Fn dlinfo
-function is pertains the specified object.
+function pertains to the specified object.
If handle is the special handle
.Dv RTLD_SELF ,
the information returned pertains to the caller itself.
.Pp
-The following are possible values for
+Possible values for the
.Fa request
-argument to be passed into
-.Fn dlinfo :
-.Bl -tag -width Ds
-.It RTLD_DI_LINKMAP
-Retrieve the Link_map (or
-.Ft struct link_map )
-structure pointer for
-.Fa handle
-specified.
-On successful return the
+argument are:
+.Bl -tag -width indent
+.It Dv RTLD_DI_LINKMAP
+Retrieve the
+.Vt Link_map
+.Pq Vt "struct link_map"
+structure pointer for the specified
+.Fa handle .
+On successful return, the
.Fa p
-argument is filled with pointer to Link_map structure
-.Ft ( Link_map **p )
-describing shared object specified by
+argument is filled with the pointer to the
+.Vt Link_map
+structure
+.Pq Fa "Link_map **p"
+describing a shared object specified by the
.Fa handle
argument.
-.Ft Link_map
-stuctures are maintained as double-linked list by
-.Xr ld.so 1
-in same order as
-.Fn dlopen
+The
+.Vt Link_map
+stuctures are maintained as a doubly linked list by
+.Xr ld.so 1 ,
+in the same order as
+.Xr dlopen 3
and
-.Fn dlclose
+.Xr dlclose 3
are called.
See
-.Sx EXAMPLES
-(Example 1.)
+.Sx EXAMPLES ,
+example 1.
.Pp
The
-.Ft Link_map
-structure is defined in <link.h> and have following members:
-.Pp
-.Bd -literal
- caddr_t l_addr; /* Base Address of library */
- const char *l_name; /* Absolute Path to Library */
- const void *l_ld; /* Pointer to .dynamic in memory */
- struct link_map *l_next, /* linked list of of mapped libs */
- *l_prev;
+.Vt Link_map
+structure is defined in
+.Aq Pa link.h
+and has the following members:
+.Bd -literal -offset indent
+caddr_t l_addr; /* Base Address of library */
+const char *l_name; /* Absolute Path to Library */
+const void *l_ld; /* Pointer to .dynamic in memory */
+struct link_map *l_next, /* linked list of mapped libs */
+ *l_prev;
.Ed
-.Bl -tag -width Ds
-.It l_addr
+.Bl -tag -width ".Va l_addr"
+.It Va l_addr
The base address of the object loaded into memory.
-.It l_name
-The full name of loaded shared object.
-.It l_ld
-The address of dynamic linking information segment
-.Dv ( PT_DYNAMIC )
+.It Va l_name
+The full name of the loaded shared object.
+.It Va l_ld
+The address of the dynamic linking information segment
+.Pq Dv PT_DYNAMIC
loaded into memory.
-.It l_next
-The next Link_map structure on the link-map list.
-.It l_prev
-The previous Link_map structure on the link-map list.
+.It Va l_next
+The next
+.Vt Link_map
+structure on the link-map list.
+.It Va l_prev
+The previous
+.Vt Link_map
+structure on the link-map list.
.El
-.It RTLD_DI_SERINFO
-Retrieve the library search paths associated with given
+.It Dv RTLD_DI_SERINFO
+Retrieve the library search paths associated with the given
.Fa handle
argument.
The
.Fa p
argument should point to
-.Ft Dl_serinfo
+.Vt Dl_serinfo
structure buffer
-.Fa ( Dl_serinfo *p ) .
-.Ft Dl_serinfo
-structure must be initialized first with a
+.Pq Fa "Dl_serinfo *p" .
+The
+.Vt Dl_serinfo
+structure must be initialized first with the
.Dv RTLD_DI_SERINFOSIZE
request.
.Pp
The returned
-.Ft Dl_serinfo
+.Vt Dl_serinfo
structure contains
-.Dv dls_cnt
-.Ft Dl_serpath
+.Va dls_cnt
+.Vt Dl_serpath
entries.
Each entry's
-.Dv dlp_name
+.Va dlp_name
field points to the search path.
The corresponding
-.Dv dlp_info
+.Va dlp_info
field contains one of more flags indicating the origin of the path (see the
.Dv LA_SER_*
-flags defined in <link.h> header file.)
+flags defined in the
+.Aq Pa link.h
+header file).
See
-.Sx EXAMPLES
-(Example 2) for usage example.
-.It RTLD_DI_SERINFOSIZE
+.Sx EXAMPLES ,
+example 2, for a usage example.
+.It Dv RTLD_DI_SERINFOSIZE
Initialize a
-.Ft Dl_serinfo
+.Vt Dl_serinfo
structure for use in a
.Dv RTLD_DI_SERINFO
request.
Both the
-.Dv dls_cnt
+.Va dls_cnt
and
-.Dv dls_size
+.Va dls_size
fields are returned to indicate the number of search paths applicable
to the handle, and the total size of a
-.Ft Dl_serinfo
+.Vt Dl_serinfo
buffer required to hold
-.Dv dls_cnt
-.Ft Dl_serpath
+.Va dls_cnt
+.Vt Dl_serpath
entries and the associated search path strings.
See
-.Sx EXAMPLES
-(Example 2) for usage example.
-.It RTLD_DI_ORIGIN
+.Sx EXAMPLES ,
+example 2, for a usage example.
+.It Va RTLD_DI_ORIGIN
Retrieve the origin of the dynamic object associated with the handle.
-On successful return
+On successful return,
.Fa p
-argument is filled with
-.Ft char
+argument is filled with the
+.Vt char
pointer
-.Ft ( char *p ) .
+.Pq Fa "char *p" .
.El
.Sh EXAMPLES
Example 1: Using
.Fn dlinfo
-to retrieve Link_map structure.
+to retrieve
+.Vt Link_map
+structure.
.Pp
The following example shows how dynamic library can detect the list
of shared libraries loaded after caller's one.
For simplicity, error checking has been omitted.
-.Bd -literal
- Link_map *map;
+.Bd -literal -offset indent
+Link_map *map;
- dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map);
+dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map);
- while (map != NULL) {
- printf("%p: %s\\n", map->l_addr, map->l_name);
- map = map->l_next;
- }
+while (map != NULL) {
+ printf("%p: %s\\n", map->l_addr, map->l_name);
+ map = map->l_next;
+}
.Ed
.Pp
Example 2: Using
@@ -206,37 +220,37 @@
.Pp
The following example shows how a dynamic object can inspect the library
search paths that would be used to locate a simple filename with
-.Fn dlopen .
+.Xr dlopen 3 .
For simplicity, error checking has been omitted.
-.Bd -literal
- Dl_serinfo _info, *info = &_info;
- Dl_serpath *path;
- unsigned int cnt;
+.Bd -literal -offset indent
+Dl_serinfo _info, *info = &_info;
+Dl_serpath *path;
+unsigned int cnt;
- /* determine search path count and required buffer size */
- dlinfo(RTLD_SELF, RTLD_DI_SERINFOSIZE, (void *)info);
+/* determine search path count and required buffer size */
+dlinfo(RTLD_SELF, RTLD_DI_SERINFOSIZE, (void *)info);
- /* allocate new buffer and initialize */
- info = malloc(_info.dls_size);
- info->dls_size = _info.dls_size;
- info->dls_cnt = _info.dls_cnt;
+/* allocate new buffer and initialize */
+info = malloc(_info.dls_size);
+info->dls_size = _info.dls_size;
+info->dls_cnt = _info.dls_cnt;
- /* obtain sarch path information */
- dlinfo(RTLD_SELF, RTLD_DI_SERINFO, (void *)info);
+/* obtain sarch path information */
+dlinfo(RTLD_SELF, RTLD_DI_SERINFO, (void *)info);
- path = &info->dls_serpath[0];
+path = &info->dls_serpath[0];
- for (cnt = 1; cnt <= info->dls_cnt; cnt++, path++) {
- (void) printf("%2d: %s\\n", cnt, path->dls_name);
- }
+for (cnt = 1; cnt <= info->dls_cnt; cnt++, path++) {
+ (void) printf("%2d: %s\\n", cnt, path->dls_name);
+}
.Ed
.Sh RETURN VALUES
The
.Fn dlinfo
-function returns 0 on success, or -1 if error occured.
+function returns 0 on success, or \-1 if an error occured.
Whenever an error has been detected, a message detailing it can
be retrieved via a call to
-.Fn dlerror .
+.Xr dlerror 3 .
.Sh SEE ALSO
.Xr rtld 1 ,
.Xr dladdr 3 ,
@@ -247,13 +261,14 @@
.Fn dlinfo
function first appeared in the Solaris operating system.
In
-.Fx
+.Fx ,
it first appeared in
.Fx 4.8 .
.Sh AUTHORS
+.An -nosplit
The
.Fx
-implementation of
+implementation of the
.Fn dlinfo
function was originally written by
.An Alexey Zelkin
==== //depot/projects/ia64/lib/libc/gen/fpclassify.3#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/lib/libc/gen/fpclassify.3,v 1.2 2003/02/12 20:03:40 mike Exp $
+.\" $FreeBSD: src/lib/libc/gen/fpclassify.3,v 1.3 2003/06/01 19:19:59 ru Exp $
.\"
.Dd February 12, 2003
.Dt FPCLASSIFY 3
@@ -48,41 +48,42 @@
The
.Fn fpclassify
macro takes an argument of
-.Va x
+.Fa x
and returns one of the following manifest constants.
.Bl -tag -width ".Dv FP_SUBNORMAL"
.It Dv FP_INFINITE
Indicates that
-.Va x
+.Fa x
is an infinite number.
.It Dv FP_NAN
Indicates that
-.Va x
+.Fa x
is not a number (NaN).
.It Dv FP_NORMAL
Indicates that
-.Va x
+.Fa x
is a normalized number.
.It Dv FP_SUBNORMAL
Indicates that
-.Va x
+.Fa x
is a denormalized number.
.It Dv FP_ZERO
Indicates that
-.Va x
-is zero (0 or -0).
+.Fa x
+is zero (0 or \-0).
.El
.Pp
The
.Fn isfinite
macro returns a non-zero value if and only if its argument has
-a finite (zero, subnormal, or normal) value. The
+a finite (zero, subnormal, or normal) value.
+The
.Fn isinf ,
.Fn isnan ,
and
.Fn isnormal
macros return non-zero if and only if
-.Va x
+.Fa x
is an infinity, NaN,
or a non-zero normalized number, respectively.
.Pp
@@ -121,7 +122,7 @@
and
.Fn isnan
functions, which accepted
-.Ft double
+.Vt double
arguments; these have been superseded by the macros
described above.
.Sh BUGS
==== //depot/projects/ia64/lib/libc/gen/fts.3#6 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fts.3 8.5 (Berkeley) 4/16/94
-.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.17 2003/06/01 06:43:39 jmallett Exp $
+.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.18 2003/06/01 21:35:27 jmallett Exp $
.\"
.Dd September 15, 2002
.Dt FTS 3
@@ -45,7 +45,7 @@
.In sys/stat.h
.In fts.h
.Ft FTS *
-.Fn fts_open "char * const *path_argv" "int options" "int (*compar)(const FTSENT *const *, const FTSENT *const *)"
+.Fn fts_open "char * const *path_argv" "int options" "int (*compar)(const FTSENT * const *, const FTSENT * const *)"
.Ft FTSENT *
.Fn fts_read "FTS *ftsp"
.Ft FTSENT *
==== //depot/projects/ia64/lib/libc/gen/isgreater.3#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/gen/isgreater.3,v 1.1 2003/02/12 20:03:40 mike Exp $
+.\" $FreeBSD: src/lib/libc/gen/isgreater.3,v 1.2 2003/06/01 19:19:59 ru Exp $
.\"
.Dd February 12, 2003
.Dt ISGREATER 3
@@ -56,29 +56,29 @@
and
.Fn islessgreater
take arguments
-.Va x
+.Fa x
and
-.Va y
+.Fa y
and return a non-zero value if and only if its nominal
relation on
-.Va x
+.Fa x
and
-.Va y
+.Fa y
is true.
These macros always return zero if either
-argument is a not a number (NaN), but unlike the corresponding C
+argument is not a number (NaN), but unlike the corresponding C
operators, they never raise a floating point exception.
.Pp
The
.Fn isunordered
macro takes arguments
-.Va x
+.Fa x
and
-.Va y
+.Fa y
and returns non-zero if and only if neither
-.Va x
+.Fa x
nor
-.Va y
+.Fa y
are NaNs.
For any pair of floating-point values, one
of the relationships (less, greater, equal, unordered) holds.
@@ -93,7 +93,7 @@
.Fn isless ,
.Fn islessequal ,
.Fn islessgreater ,
-and
+and
.Fn isunordered
macros conform to
.St -isoC-99 .
==== //depot/projects/ia64/lib/libc/gen/wordexp.3#5 (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/gen/wordexp.3,v 1.4 2003/03/13 11:18:53 tjr Exp $
+.\" $FreeBSD: src/lib/libc/gen/wordexp.3,v 1.5 2003/06/01 19:19:59 ru Exp $
.\"
.Dd December 27, 2002
.Dt WORDEXP 3
@@ -36,15 +36,9 @@
.Sh SYNOPSIS
.In wordexp.h
.Ft int
-.Fo wordexp
-.Fa "const char * restrict words"
-.Fa "wordexp_t * restrict we"
-.Fa "int flags"
-.Fc
+.Fn wordexp "const char * restrict words" "wordexp_t * restrict we" "int flags"
.Ft void
-.Fo wordfree
-.Fa "wordexp_t *we"
-.Fc
+.Fn wordfree "wordexp_t *we"
.Sh DESCRIPTION
The
.Fn wordexp
@@ -53,16 +47,16 @@
and places the list of words into the
.Va we_wordv
member of
-.Va we ,
+.Fa we ,
and the number of words into
.Va we_wordc .
.Pp
The
-.Va flags
+.Fa flags
argument is the bitwise inclusive OR of any of the following constants:
.Bl -tag -width ".Dv WRDE_SHOWERR"
.It Dv WRDE_APPEND
-Append the words to those generate by a previous call to
+Append the words to those generated by a previous call to
.Fn wordexp .
.It Dv WRDE_DOOFS
As many
@@ -70,7 +64,7 @@
pointers as are specified by the
.Va we_offs
member of
-.Va we
+.Fa we
are added to the front of
.Va we_wordv .
.It Dv WRDE_NOCMD
@@ -81,7 +75,7 @@
before using this.
.It Dv WRDE_REUSE
The
-.Va we
+.Fa we
argument was passed to a previous successful call to
.Fn wordexp
but has not been passed to
@@ -97,13 +91,13 @@
The
.Vt wordexp_t
structure is defined in
-.Pa wordexp.h
+.Aq Pa wordexp.h
as:
.Bd -literal -offset indent
typedef struct {
- size_t we_wordc; /* count of words matched */
- char **we_wordv; /* pointer to list of words */
- size_t we_offs; /* slots to reserve in we_wordv */
+ size_t we_wordc; /* count of words matched */
+ char **we_wordv; /* pointer to list of words */
+ size_t we_offs; /* slots to reserve in we_wordv */
} wordexp_t;
.Ed
.Pp
@@ -127,7 +121,7 @@
The
.Fa words
argument contains one of the following unquoted characters:
-<newline>,
+.Aq newline ,
.Ql | ,
.Ql & ,
.Ql \&; ,
@@ -164,8 +158,8 @@
.El
.Sh EXAMPLES
Invoke the editor on all
-.Dq Li \&.c
-files in the current directory,
+.Pa .c
+files in the current directory
and
.Pa /etc/motd
(error checking omitted):
==== //depot/projects/ia64/lib/libc/ia64/gen/makecontext.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/ia64/gen/makecontext.c,v 1.2 2003/06/02 00:16:39 marcel Exp $");
#include <sys/types.h>
#include <sys/ucontext.h>
@@ -113,9 +113,9 @@
memset(&ucp->uc_mcontext, 0, sizeof(ucp->uc_mcontext));
ucp->uc_mcontext.mc_special.sp = (intptr_t)args - 16;
ucp->uc_mcontext.mc_special.bspstore = (intptr_t)bsp;
- ucp->uc_mcontext.mc_special.pfs = 3;
+ ucp->uc_mcontext.mc_special.pfs = (3 << 7) | 3;
ucp->uc_mcontext.mc_special.rsc = 0xf;
ucp->uc_mcontext.mc_special.rp = ((struct fdesc*)ctx_wrapper)->ip;
- ucp->uc_mcontext.mc_special.rp = ((struct fdesc*)ctx_wrapper)->gp;
+ ucp->uc_mcontext.mc_special.gp = ((struct fdesc*)ctx_wrapper)->gp;
ucp->uc_mcontext.mc_special.fpsr = IA64_FPSR_DEFAULT;
}
==== //depot/projects/ia64/lib/libc/stdlib/grantpt.3#2 (text+ko) ====
@@ -29,7 +29,7 @@
.\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
.\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/stdlib/grantpt.3,v 1.1 2003/01/02 20:44:41 jmallett Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/grantpt.3,v 1.2 2003/06/01 19:19:59 ru Exp $
.\"
.Dd December 23, 2002
.Os
@@ -46,7 +46,7 @@
.In stdlib.h
.Ft int
.Fn grantpt "int fildes"
-.Ft char *
+.Ft "char *"
.Fn ptsname "int fildes"
.Ft int
.Fn unlockpt "int fildes"
@@ -71,19 +71,21 @@
function is used to establish ownership and permissions
of the slave device counterpart to the master device
specified with
-.Va fildes .
+.Fa fildes .
The slave device's ownership is set to the real user ID
of the calling process, and the permissions are set to
user readable-writable and group writable.
The group owner of the slave device is also set to the
-group "tty" if it exists on the system; otherwise, it
+group
+.Dq Li tty
+if it exists on the system; otherwise, it
is left untouched.
.Pp
The
.Fn ptsname
function returns the full pathname of the slave device
counterpart to the master device specified with
-.Va fildes .
+.Fa fildes .
This value can be used
to subsequently open the appropriate slave after
.Fn posix_openpt
@@ -95,15 +97,17 @@
.Fn unlockpt
function clears the lock held on the pseudo-terminal pair
for the master device specified with
-.Va fildes .
+.Fa fildes .
.Pp
The
.Fn posix_openpt
function opens the first available master pseudo-terminal
device and returns a descriptor to it.
-.Va mode
+The
+.Fa mode
+argument
specifies the flags used for opening the device:
-.Bl -tag -width O_NOCTTY
+.Bl -tag -width ".Dv O_NOCTTY"
.It Dv O_RDWR
Open for reading and writing.
.It Dv O_NOCTTY
@@ -111,19 +115,14 @@
the controlling terminal for the calling process.
.El
.Sh RETURN VALUES
-The
-.Fn grantpt
-and
-.Fn unlockpt
-functions return 0 on success; otherwise -1 is returned and
-.Va errno
-is set to indicate the error.
+.Rv -std grantpt unlockpt
.Pp
The
.Fn ptsname
function returns a pointer to the name
-of the slave device on success;
-otherwise a NULL pointer is returned and
+of the slave device on success; otherwise a
+.Dv NULL
+pointer is returned and the global variable
.Va errno
is set to indicate the error.
.Pp
@@ -131,7 +130,7 @@
.Fn posix_openpt
function returns a file descriptor to the first
available master pseudo-terminal device on success;
-otherwise -1 is returned and
+otherwise \-1 is returned and the global variable
.Va errno
is set to indicate the error.
.Sh ERRORS
@@ -144,8 +143,8 @@
.Va errno
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list