Smack: add the execute lable to ldconfig

[platform/upstream/glibc.git] / posix / globtest.c

diff --git a/posix/globtest.c b/posix/globtest.c
index 970d90a..d5e77d3 100644 (file)
--- a/posix/globtest.c
+++ b/posix/globtest.c
@@ -1,23 +1,23 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <getopt.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <glob.h>
 
@@ -29,7 +29,9 @@ main (int argc, char *argv[])
   glob_t g;
   int quotes = 1;
 
-  while ((i = getopt (argc, argv, "bcdegmopqstT")) != -1)
+  g.gl_offs = 0;
+
+  while ((i = getopt (argc, argv, "bcdeEgmopqstT")) != -1)
     switch(i)
       {
       case 'b':
@@ -44,6 +46,9 @@ main (int argc, char *argv[])
       case 'e':
        glob_flags |= GLOB_NOESCAPE;
        break;
+      case 'E':
+       glob_flags |= GLOB_ERR;
+       break;
       case 'g':
        glob_flags |= GLOB_NOMAGIC;
        break;
@@ -96,15 +101,17 @@ main (int argc, char *argv[])
   else if (i == GLOB_NOMATCH)
     puts ("GLOB_NOMATCH");
 
-  /* If we set an offset, fill in the first field.  */
-  if (glob_flags & GLOB_DOOFFS)
+  /* If we set an offset, fill in the first field.
+     (Unless glob() has filled it in already - which is an error) */
+  if ((glob_flags & GLOB_DOOFFS) && g.gl_pathv[0] == NULL)
     g.gl_pathv[0] = (char *) "abc";
 
   /* Print out the names.  Unless otherwise specified, qoute them.  */
   if (g.gl_pathv)
     {
-      for (i = 0; i < g.gl_pathc; ++i)
-        printf ("%s%s%s\n", quotes ? "`" : "", g.gl_pathv[i],
+      for (i = 0; i < g.gl_offs + g.gl_pathc; ++i)
+        printf ("%s%s%s\n", quotes ? "`" : "",
+               g.gl_pathv[i] ? g.gl_pathv[i] : "(null)",
                quotes ? "'" : "");
     }
   return 0;