diff options
Diffstat (limited to 'gdb/cli/cli-utils.c')
| -rw-r--r-- | gdb/cli/cli-utils.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/gdb/cli/cli-utils.c b/gdb/cli/cli-utils.c index f74e6b1..316cf4f 100644 --- a/gdb/cli/cli-utils.c +++ b/gdb/cli/cli-utils.c @@ -261,30 +261,39 @@ remove_trailing_whitespace (const char *start, char *s) /* See documentation in cli-utils.h. */ char * -extract_arg (char **arg) +extract_arg_const (const char **arg) { - char *result, *copy; + const char *result; if (!*arg) return NULL; /* Find the start of the argument. */ - *arg = skip_spaces (*arg); + *arg = skip_spaces_const (*arg); if (!**arg) return NULL; result = *arg; /* Find the end of the argument. */ - *arg = skip_to_space (*arg + 1); + *arg = skip_to_space_const (*arg + 1); if (result == *arg) return NULL; - copy = xmalloc (*arg - result + 1); - memcpy (copy, result, *arg - result); - copy[*arg - result] = '\0'; + return savestring (result, *arg - result); +} + +/* See documentation in cli-utils.h. */ + +char * +extract_arg (char **arg) +{ + const char *arg_const = *arg; + char *result; - return copy; + result = extract_arg_const (&arg_const); + *arg += arg_const - *arg; + return result; } /* See documentation in cli-utils.h. */ |