Some raw string changes from N3077

[pf3gnuchains/gcc-fork.git] / libiberty / argv.c

diff --git a/libiberty/argv.c b/libiberty/argv.c
index 71f164a..3084248 100644 (file)
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -119,6 +119,24 @@ void freeargv (char **vector)
     }
 }
 
+static void
+consume_whitespace (const char **input)
+{
+  while (ISSPACE (**input))
+    {
+      (*input)++;
+    }
+}
+
+static int
+only_whitespace (const char* input)
+{
+  while (*input != EOS && ISSPACE (*input))
+    input++;
+
+  return (*input == EOS);
+}
+
 /*
 
 @deftypefn Extension char** buildargv (char *@var{sp})
@@ -179,10 +197,8 @@ char **buildargv (const char *input)
       do
        {
          /* Pick off argv[argc] */
-         while (ISBLANK (*input))
-           {
-             input++;
-           }
+         consume_whitespace (&input);
+
          if ((maxargc == 0) || (argc >= (maxargc - 1)))
            {
              /* argv needs initialization, or expansion */
@@ -278,10 +294,7 @@ char **buildargv (const char *input)
          argc++;
          argv[argc] = NULL;
 
-         while (ISSPACE (*input))
-           {
-             input++;
-           }
+         consume_whitespace (&input);
        }
       while (*input != EOS);
     }
@@ -290,6 +303,61 @@ char **buildargv (const char *input)
 
 /*
 
+@deftypefn Extension int writeargv (const char **@var{argv}, FILE *@var{file})
+
+Write each member of ARGV, handling all necessary quoting, to the file
+named by FILE, separated by whitespace.  Return 0 on success, non-zero
+if an error occurred while writing to FILE.
+
+@end deftypefn
+
+*/
+
+int
+writeargv (char **argv, FILE *f)
+{
+  int status = 0;
+
+  if (f == NULL)
+    return 1;
+
+  while (*argv != NULL)
+    {
+      const char *arg = *argv;
+
+      while (*arg != EOS)
+        {
+          char c = *arg;
+
+          if (ISSPACE(c) || c == '\\' || c == '\'' || c == '"')
+            if (EOF == fputc ('\\', f))
+              {
+                status = 1;
+                goto done;
+              }
+
+          if (EOF == fputc (c, f))
+            {
+              status = 1;
+              goto done;
+            }
+          arg++;
+        }
+
+      if (EOF == fputc ('\n', f))
+        {
+          status = 1;
+          goto done;
+        }
+      argv++;
+    }
+
+ done:
+  return status;
+}
+
+/*
+
 @deftypefn Extension void expandargv (int *@var{argcp}, char ***@var{argvp})
 
 The @var{argcp} and @code{argvp} arguments are pointers to the usual
@@ -312,9 +380,7 @@ operating system to free the memory when the program exits.
 */
 
 void
-expandargv (argcp, argvp)
-     int *argcp;
-     char ***argvp;
+expandargv (int *argcp, char ***argvp)
 {
   /* The argument we are currently processing.  */
   int i = 0;
@@ -328,8 +394,12 @@ expandargv (argcp, argvp)
       const char *filename;
       /* The response file.  */
       FILE *f;
-      /* The number of characters in the response file.  */
+      /* An upper bound on the number of characters in the response
+        file.  */
       long pos;
+      /* The number of characters in the response file, when actually
+        read.  */
+      size_t len;
       /* A dynamically allocated buffer used to hold options read from a
         response file.  */
       char *buffer;
@@ -337,7 +407,7 @@ expandargv (argcp, argvp)
         response file.  */
       char **file_argv;
       /* The number of options read from the response file, if any.  */
-     size_t file_argc;
+      size_t file_argc;
       /* We are only interested in options of the form "@file".  */
       filename = (*argvp)[i];
       if (filename[0] != '@')
@@ -354,24 +424,39 @@ expandargv (argcp, argvp)
       if (fseek (f, 0L, SEEK_SET) == -1)
        goto error;
       buffer = (char *) xmalloc (pos * sizeof (char) + 1);
-      if (fread (buffer, sizeof (char), pos, f) != (size_t) pos)
+      len = fread (buffer, sizeof (char), pos, f);
+      if (len != (size_t) pos
+         /* On Windows, fread may return a value smaller than POS,
+            due to CR/LF->CR translation when reading text files.
+            That does not in-and-of itself indicate failure.  */
+         && ferror (f))
        goto error;
       /* Add a NUL terminator.  */
-      buffer[pos] = '\0';
-      /* Parse the string.  */
-      file_argv = buildargv (buffer);
+      buffer[len] = '\0';
+      /* If the file is empty or contains only whitespace, buildargv would
+        return a single empty argument.  In this context we want no arguments,
+        instead.  */
+      if (only_whitespace (buffer))
+       {
+         file_argv = (char **) xmalloc (sizeof (char *));
+         file_argv[0] = NULL;
+       }
+      else
+       /* Parse the string.  */
+       file_argv = buildargv (buffer);
       /* If *ARGVP is not already dynamically allocated, copy it.  */
       if (!argv_dynamic)
        {
          *argvp = dupargv (*argvp);
          if (!*argvp)
-           /* We do not know exactly many bytes dupargv tried to
-              allocate, so make a guess.  */
-           xmalloc_failed (*argcp * 32);
+           {
+             fputs ("\nout of memory\n", stderr);
+             xexit (1);
+           }
        }
       /* Count the number of arguments.  */
       file_argc = 0;
-      while (file_argv[file_argc] && *file_argv[file_argc])
+      while (file_argv[file_argc])
        ++file_argc;
       /* Now, insert FILE_ARGV into ARGV.  The "+1" below handles the
         NULL terminator at the end of ARGV.  */