aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2007-05-08 01:29:33 +0000
committerDJ Delorie <dj@redhat.com>2007-05-08 01:29:33 +0000
commit0c18fee5b37f838c89b45c757deadfa81574e352 (patch)
tree84771eb0a6a707e0a63e712f7602dbc8d2d8cd0b
parentf453a23a5117037dd9f787e5cf8796cdf91d75d0 (diff)
downloadgdb-0c18fee5b37f838c89b45c757deadfa81574e352.zip
gdb-0c18fee5b37f838c89b45c757deadfa81574e352.tar.gz
gdb-0c18fee5b37f838c89b45c757deadfa81574e352.tar.bz2
merge from gcc
-rw-r--r--include/ChangeLog4
-rw-r--r--include/libiberty.h4
-rw-r--r--libiberty/ChangeLog4
-rw-r--r--libiberty/argv.c56
4 files changed, 68 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 64e016e..297e8b3 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-07 Nathan Froyd <froydnj@codesourcery.com>
+
+ * libiberty.h (writeargv): Declare.
+
2007-04-30 Alan Modra <amodra@bigpond.net.au>
* bfdlink.h (struct bfd_link_info): Add "info" and "minfo".
diff --git a/include/libiberty.h b/include/libiberty.h
index 7a58b71..4e69734 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -86,6 +86,10 @@ extern char **dupargv (char **) ATTRIBUTE_MALLOC;
extern void expandargv PARAMS ((int *, char ***));
+/* Write argv to an @-file, inserting necessary quoting. */
+
+extern int writeargv PARAMS ((char **, FILE *));
+
/* Return the last component of a path name. Note that we can't use a
prototype here because the parameter is declared inconsistently
across different systems, sometimes as "char *" and sometimes as
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index c4e7072..a421784 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-07 Nathan Froyd <froydnj@codesourcery.com>
+
+ * argv.c (writeargv): New function.
+
2007-05-05 Geoffrey Keating <geoffk@apple.com>
* cp-demangle.c (d_name): Detect local-source-name.
diff --git a/libiberty/argv.c b/libiberty/argv.c
index e76c1f8..a04f50d 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -290,6 +290,62 @@ char **buildargv (const char *input)
/*
+@deftypefn Extension int writeargv (const char **@var{argv}, FILE *@{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)
+ {
+ int ret;
+ 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