diff options
Diffstat (limited to 'gdbsupport/common-inferior.cc')
-rw-r--r-- | gdbsupport/common-inferior.cc | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/gdbsupport/common-inferior.cc b/gdbsupport/common-inferior.cc index 55149ec..4f9c0e6 100644 --- a/gdbsupport/common-inferior.cc +++ b/gdbsupport/common-inferior.cc @@ -28,7 +28,7 @@ bool startup_with_shell = true; /* See common-inferior.h. */ std::string -construct_inferior_arguments (gdb::array_view<char * const> argv) +construct_inferior_arguments (gdb::array_view<char *const> argv) { std::string result; @@ -47,78 +47,78 @@ construct_inferior_arguments (gdb::array_view<char * const> argv) static const char quote = '\''; #endif for (int i = 0; i < argv.size (); ++i) - { - if (i > 0) - result += ' '; + { + if (i > 0) + result += ' '; - /* Need to handle empty arguments specially. */ - if (argv[i][0] == '\0') - { - result += quote; - result += quote; - } - else - { + /* Need to handle empty arguments specially. */ + if (argv[i][0] == '\0') + { + result += quote; + result += quote; + } + else + { #ifdef __MINGW32__ - bool quoted = false; + bool quoted = false; - if (strpbrk (argv[i], special)) - { - quoted = true; - result += quote; - } + if (strpbrk (argv[i], special)) + { + quoted = true; + result += quote; + } #endif - for (char *cp = argv[i]; *cp; ++cp) - { - if (*cp == '\n') - { - /* A newline cannot be quoted with a backslash (it + for (char *cp = argv[i]; *cp; ++cp) + { + if (*cp == '\n') + { + /* A newline cannot be quoted with a backslash (it just disappears), only by putting it inside quotes. */ - result += quote; - result += '\n'; - result += quote; - } - else - { + result += quote; + result += '\n'; + result += quote; + } + else + { #ifdef __MINGW32__ - if (*cp == quote) + if (*cp == quote) #else - if (strchr (special, *cp) != NULL) + if (strchr (special, *cp) != NULL) #endif - result += '\\'; - result += *cp; - } - } + result += '\\'; + result += *cp; + } + } #ifdef __MINGW32__ - if (quoted) - result += quote; + if (quoted) + result += quote; #endif - } - } + } + } } else { /* In this case we can't handle arguments that contain spaces, tabs, or newlines -- see breakup_args(). */ for (char *arg : argv) - { - char *cp = strchr (arg, ' '); - if (cp == NULL) - cp = strchr (arg, '\t'); - if (cp == NULL) - cp = strchr (arg, '\n'); - if (cp != NULL) - error (_("can't handle command-line " - "argument containing whitespace")); - } + { + char *cp = strchr (arg, ' '); + if (cp == NULL) + cp = strchr (arg, '\t'); + if (cp == NULL) + cp = strchr (arg, '\n'); + if (cp != NULL) + error (_ ("can't handle command-line " + "argument containing whitespace")); + } for (int i = 0; i < argv.size (); ++i) - { - if (i > 0) - result += " "; - result += argv[i]; - } + { + if (i > 0) + result += " "; + result += argv[i]; + } } return result; |