[Commits] r22200 - in /fsf/trunk/libc: ChangeLog manual/pattern.texi

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon Jan 14 00:02:10 2013
New Revision: 22200

Log:
Import glibc-mainline for 2013-01-14

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/manual/pattern.texi

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Jan 14 00:02:10 2013
@@ -1,3 +1,17 @@
+2013-01-13  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* manual/pattern.texi (Flags for Globbing): Move GLOB_NOSORT after
+	GLOB_NOESCAPE.
+
+2013-01-13  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* manual/pattern.texi (Flags for Globbing): Highlight GNU extensions.
+
+2013-01-13  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* manual/pattern.texi (glob_t): Document gl_flags.
+	(glob64_t): Likewise.
+
 2013-01-11  David S. Miller  <davem@xxxxxxxxxxxxx>
 
 	* math/Makefile: Recognize gmp-sysdep_routines.

Modified: fsf/trunk/libc/manual/pattern.texi
==============================================================================
--- fsf/trunk/libc/manual/pattern.texi (original)
+++ fsf/trunk/libc/manual/pattern.texi Mon Jan 14 00:02:10 2013
@@ -234,6 +234,12 @@
 (*) (const char *,} @w{struct stat *)}}.
 
 This is a GNU extension.
+
+@item gl_flags
+The flags used when @code{glob} was called.  In addition, @code{GLOB_MAGCHAR}
+might be set.  See @ref{Flags for Globbing} for more details.
+
+This is a GNU extension.
 @end table
 @end deftp
 
@@ -310,6 +316,12 @@
 following symbolic links.  It is used if the @code{GLOB_ALTDIRFUNC} bit
 is set in the flag parameter.  The type of this field is @code{@w{int
 (*) (const char *,} @w{struct stat64 *)}}.
+
+This is a GNU extension.
+
+@item gl_flags
+The flags used when @code{glob} was called.  In addition, @code{GLOB_MAGCHAR}
+might be set.  See @ref{Flags for Globbing} for more details.
 
 This is a GNU extension.
 @end table
@@ -408,9 +420,11 @@
 @node Flags for Globbing
 @subsection Flags for Globbing
 
-This section describes the flags that you can specify in the
+This section describes the standard 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{|}.
+
+Note that there are @ref{More Flags for Globbing} available as GNU extensions.
 
 @vtable @code
 @comment glob.h
@@ -481,13 +495,6 @@
 
 @comment glob.h
 @comment POSIX.2
-@item GLOB_NOSORT
-Don't sort the file names; return them in no particular order.
-(In practice, the order will depend on the order of the entries in
-the directory.)  The only reason @emph{not} to sort is to save time.
-
-@comment glob.h
-@comment POSIX.2
 @item GLOB_NOESCAPE
 Don't treat the @samp{\} character specially in patterns.  Normally,
 @samp{\} quotes the following character, turning off its special meaning
@@ -500,6 +507,13 @@
 @code{glob} does its work by calling the function @code{fnmatch}
 repeatedly.  It handles the flag @code{GLOB_NOESCAPE} by turning on the
 @code{FNM_NOESCAPE} flag in calls to @code{fnmatch}.
+
+@comment glob.h
+@comment POSIX.2
+@item GLOB_NOSORT
+Don't sort the file names; return them in no particular order.
+(In practice, the order will depend on the order of the entries in
+the directory.)  The only reason @emph{not} to sort is to save time.
 @end vtable
 
 @node More Flags for Globbing

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits