GDB 7.6.50

gdb/cli/cli-utils.c

 /* CLI utilities.
 
-   Copyright (c) 2011-2012 Free Software Foundation, Inc.
+   Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program 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 General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "cli/cli-utils.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "value.h"
 #include "gdb_assert.h"
 
 #include <ctype.h>
 
 /* *PP is a string denoting a number.  Get the number of the.  Advance
    *PP after the string and any trailing whitespace.
 
    Currently the string can either be a number, or "$" followed by the
    name of a convenience variable, or ("$" or "$$") followed by digits.
@@ skipping 197 matching lines @@
 {
   if (chp == NULL)
     return NULL;
   while (*chp && isspace (*chp))
     chp++;
   return chp;
 }
 
 /* See documentation in cli-utils.h.  */
 
-char *
-skip_to_space (char *chp)
+const char *
+skip_to_space_const (const char *chp)
 {
   if (chp == NULL)
     return NULL;
   while (*chp && !isspace (*chp))
     chp++;
   return chp;
 }
 
 /* See documentation in cli-utils.h.  */
 
 char *
 remove_trailing_whitespace (const char *start, char *s)
 {
   while (s > start && isspace (*(s - 1)))
     --s;
 
   return s;
 }
 
 /* See documentation in cli-utils.h.  */
 
 char *
+extract_arg_const (const char **arg)
+{
+  const char *result;
+
+  if (!*arg)
+    return NULL;
+
+  /* Find the start of the argument.  */
+  *arg = skip_spaces_const (*arg);
+  if (!**arg)
+    return NULL;
+  result = *arg;
+
+  /* Find the end of the argument.  */
+  *arg = skip_to_space_const (*arg + 1);
+
+  if (result == *arg)
+    return NULL;
+
+  return savestring (result, *arg - result);
+}
+
+/* See documentation in cli-utils.h.  */
+
+char *
 extract_arg (char **arg)
 {
-  char *result, *copy;
+  const char *arg_const = *arg;
+  char *result;
 
-  if (!*arg)
-    return NULL;
-
-  /* Find the start of the argument.  */
-  *arg = skip_spaces (*arg);
-  if (!**arg)
-    return NULL;
-  result = *arg;
-
-  /* Find the end of the argument.  */
-  *arg = skip_to_space (*arg + 1);
-
-  if (result == *arg)
-    return NULL;
-
-  copy = xmalloc (*arg - result + 1);
-  memcpy (copy, result, *arg - result);
-  copy[*arg - result] = '\0';
-
-  return copy;
+  result = extract_arg_const (&arg_const);
+  *arg += arg_const - *arg;
+  return result;
 }
 
 /* See documentation in cli-utils.h.  */
 
 int
 check_for_argument (char **str, char *arg, int arg_len)
 {
   if (strncmp (*str, arg, arg_len) == 0
       && ((*str)[arg_len] == '\0' || isspace ((*str)[arg_len])))
     {
       *str += arg_len;
       return 1;
     }
   return 0;
 }