diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3267a30a69..b00b374b20 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-29  Tom Tromey  <tromey@redhat.com>
+
+	* cli/cli-decode.c (lookup_cmd_1): Use memcpy.
+	(lookup_cmd_composition): Likewise.
+
 2008-07-29  Tom Tromey  <tromey@redhat.com>
 
 	* cli/cli-cmds.c (edit_command): Remove unused variables.  Delete
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 690831466b..5b1a7e0858 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -1112,11 +1112,7 @@ lookup_cmd_1 (char **text, struct cmd_list_element *clist,
 
 
   command = (char *) alloca (len + 1);
-  for (tmp = 0; tmp < len; tmp++)
-    {
-      char x = (*text)[tmp];
-      command[tmp] = x;
-    }
+  memcpy (command, *text, len);
   command[len] = '\0';
 
   /* Look it up.  */
@@ -1468,11 +1464,7 @@ lookup_cmd_composition (char *text,
        it's length is len).  We copy this into a local temporary */
       
       command = (char *) alloca (len + 1);
-      for (tmp = 0; tmp < len; tmp++)
-      {
-        char x = text[tmp];
-        command[tmp] = x;
-      }
+      memcpy (command, text, len);
       command[len] = '\0';
       
       /* Look it up.  */