summaryrefslogtreecommitdiff
path: root/manual/pattern.texi
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-12-20 01:39:50 +0000
committerUlrich Drepper <drepper@redhat.com>1996-12-20 01:39:50 +0000
commit6d52618b15cbe25ed4822ac51321db292f28ccda (patch)
treebafef072c0f5cb67c09d7c1789888d4310ac568f /manual/pattern.texi
parent10dc2a90b7f86d9bc1be9d1b9305a781882f7ac5 (diff)
Update from main archive 961219cvs/libc-961220
Thu Dec 19 23:28:33 1996 Ulrich Drepper <drepper@cygnus.com> * resolv/resolv.h: Update from BIND 4.9.5-P1. * resolv/res_comp.c: Likewise. * resolv/res_debug.c: Likewise. * resolv/Banner: Update version number. Thu Dec 19 20:58:53 1996 Ulrich Drepper <drepper@cygnus.com> * elf/dlfcn.h: Add extern "C" wrapper. * io/utime.h: Don't define NULL since this isn't allowed in POSIX. * io/sys/stat.h: Declare `lstat' only if __USE_BSD || __USE_XOPEN_EXTENDED. * locale/locale.h: Define NULL. * math/math.c: Don't include <errno.h> to define math errors. * stdlib/stdlib.h: Likewise. * posix/unistd.h: Don't declare environ. * posix/sys/utsname.h (struct utsname): Declare member domainname as __domainname is !__USE_GNU. * signal/signal.h: Declare size_t only if __USE_BSD || __USE_XOPEN_EXTENDED. * stdio/stdio.h: Don't declare cuserid when __USE_POSIX, but instead when __USE_XOPEN. * string/string.h: Define strndup only if __USE_GNU. * sysdeps/unix/sysv/linux/clock.c: New file. * sysdeps/unix/sysv/linux/timebits.h: Define CLOCKS_PER_SEC as 1000000 per X/Open standard. * features.h: Add code to recognize _POSIX_C_SOURCE value 199309. Define __USE_POSIX199309. * posix/unistd.h: Declare fdatasync only if __USE_POSIX199309. * time/time.c: Declare nanosleep only if __USE_POSIX199309. Patches by Rüdiger Helsch <rh@unifix.de>. * locale/locale.h: Add declaration of newlocale and freelocale. * new-malloc/Makefile (distibute): Add mtrace.awk. (dist-routines): Add mcheck and mtrace. (install-lib, non-lib.a): Define as libmcheck.a. * new-malloc/malloc.h: Add declaration of __malloc_initialized. * new-malloc/mcheck.c: New file. * new-malloc/mcheck.h: New file. * new-malloc/mtrace.c: New file. * new-malloc/mtrace.awk: New file. * posix/unistd.h: Correct prototype for usleep. * sysdeps/unix/bsd/usleep.c: De-ANSI-declfy. Correct return type. * sysdeps/unix/sysv/linux/usleep.c: Real implementation based on nanosleep. * signal/signal.h: Change protoype of __sigpause to take two arguments. Remove prototype for sigpause. Add two different macros named sigpause selected when __USE_BSD or __USE_XOPEN are defined. This is necessary since the old BSD definition of theis function collides with the X/Open definition. * sysdeps/posix/sigpause.c: Change function definition to also fit X/Open definition. * sysdeps/libm-i387/e_exp.S: Make sure stack is empty when the function is left. * sysdeps/libm-i387/e_expl.S: Likewise. Patch by HJ Lu. 1996-12-17 Paul Eggert <eggert@twinsun.com> * many, many files: Spelling corrections. * catgets/catgetsinfo.h (mmapped): Renamed from mmaped (in struct catalog_info.status). * mach/err_kern.sub (err_codes_unix), string/stratcliff.c (main): Fix spelling in message. * po/libc.pot: Fix spelling in message for `zic'; this anticipates a fix in the tzcode distribution. Wed Dec 18 15:48:02 1996 Ulrich Drepper <drepper@cygnus.com> * time/strftime.c: Implement ^ flag to cause output be converted to use upper case characters. * time/zic.c: Update from ADO tzcode1996n. Wed Dec 18 14:29:24 1996 Erik Naggum <erik@naggum.no> * time/strftime.c (add): Don't change global `i' until all is over. Define NULL is not already defined. Tue Dec 17 09:49:03 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/iovsprintf.c (_IO_vsprintf): Change `&sf' to `&sf._sbf._f' to avoid the need for a cast. * libio/iovsscanf.c (_IO_vsscanf): Likewise. * sunrpc/rpc/xdr.h: Add prototype for xdr_free.
Diffstat (limited to 'manual/pattern.texi')
-rw-r--r--manual/pattern.texi22
1 files changed, 11 insertions, 11 deletions
diff --git a/manual/pattern.texi b/manual/pattern.texi
index 903aa48073..b1e7206b58 100644
--- a/manual/pattern.texi
+++ b/manual/pattern.texi
@@ -178,7 +178,7 @@ To return this vector, @code{glob} stores both its address and its
length (number of elements, not counting the terminating null pointer)
into @code{*@var{vector-ptr}}.
-Normally, @code{glob} sorts the file names alphabetically before
+Normally, @code{glob} sorts the file names alphabetically before
returning them. You can turn this off with the flag @code{GLOB_NOSORT}
if you want to get the information as fast as possible. Usually it's
a good idea to let @code{glob} sort them---if you process the files in
@@ -224,7 +224,7 @@ In the event of an error, @code{glob} stores information in
@node Flags for Globbing
@subsection Flags for Globbing
-This section describes the flags that you can specify in the
+This section describes the flags that you can specify in the
@var{flags} argument to @code{glob}. Choose the flags you want,
and combine them with the C bitwise OR operator @code{|}.
@@ -483,7 +483,7 @@ One of the endpoints in a range expression was invalid.
These are the bit flags that you can use in the @var{cflags} operand when
compiling a regular expression with @code{regcomp}.
-
+
@table @code
@comment regex.h
@comment POSIX.2
@@ -530,7 +530,7 @@ This function tries to match the compiled regular expression
@code{regexec} returns @code{0} if the regular expression matches;
otherwise, it returns a nonzero value. See the table below for
what nonzero values mean. You can use @code{regerror} to produce an
-error message string describing the reason for a nonzero value;
+error message string describing the reason for a nonzero value;
see @ref{Regexp Cleanup}.
The argument @var{eflags} is a word of bit flags that enable various
@@ -538,7 +538,7 @@ options.
If you want to get information about what part of @var{string} actually
matched the regular expression or its subexpressions, use the arguments
-@var{matchptr} and @var{nmatch}. Otherwise, pass @code{0} for
+@var{matchptr} and @var{nmatch}. Otherwise, pass @code{0} for
@var{nmatch}, and @code{NULL} for @var{matchptr}. @xref{Regexp
Subexpressions}.
@end deftypefun
@@ -549,7 +549,7 @@ locales that were in effect when you compiled the regular expression.
The function @code{regexec} accepts the following flags in the
@var{eflags} argument:
-@table @code
+@table @code
@comment regex.h
@comment POSIX.2
@item REG_NOTBOL
@@ -594,7 +594,7 @@ subexpression.
@comment POSIX.2
@deftp {Data Type} regmatch_t
This is the data type of the @var{matcharray} array that you pass to
-@code{regexec}. It containes two structure fields, as follows:
+@code{regexec}. It contains two structure fields, as follows:
@table @code
@item rm_so
@@ -661,7 +661,7 @@ appears within another, then the results reported for the inner
subexpression reflect whatever happened on the last match of the outer
subexpression. For an example, consider @samp{\(ba\(na\)*s \)*} matching
the string @samp{bananas bas }. The last time the inner expression
-actually matches is near the end of the first word. But it is
+actually matches is near the end of the first word. But it is
@emph{considered} again in the second word, and fails to match there.
@code{regexec} reports nonuse of the ``na'' subexpression.
@@ -738,7 +738,7 @@ char *get_regerror (int errcode, regex_t *compiled)
@cindex word expansion
@cindex expansion of shell words
-@dfn{Word expansion} means the process of splitting a string into
+@dfn{Word expansion} means the process of splitting a string into
@dfn{words} and substituting for variables, commands, and wildcards
just as the shell does.
@@ -936,7 +936,7 @@ data it points to.
@node Flags for Wordexp
@subsection Flags for Word Expansion
-This section describes the flags that you can specify in the
+This section describes the flags that you can specify in the
@var{flags} argument to @code{wordexp}. Choose the flags you want,
and combine them with the C operator @code{|}.
@@ -1139,7 +1139,7 @@ characters in the value of @var{variable}. @samp{$@{#foo@}} stands for
@end table
These variants of variable substitution let you remove part of the
-variable's value before substituting it. The @var{prefix} and
+variable's value before substituting it. The @var{prefix} and
@var{suffix} are not mere strings; they are wildcard patterns, just
like the patterns that you use to match multiple file names. But
in this context, they match against parts of the variable value