Index: trunk/Ohana/src/opihi/lib.shell/command.c
===================================================================
--- trunk/Ohana/src/opihi/lib.shell/command.c	(revision 4301)
+++ trunk/Ohana/src/opihi/lib.shell/command.c	(revision 4448)
@@ -50,7 +50,12 @@
       argv[argc] = 0;
 
+      /* i +> argc + 1, argv[argc-1] = targv[i] 
+       * argv[n] = argv[argc - 1 - argc + 1 + n] = targv[i - argc + 1 + n] 
+       */
+
       cmd = MatchCommand (argv[0], TRUE, FALSE);
       if (cmd != NULL) {
 	REALLOCATE (argv[0], char, strlen(cmd[0].name) + 1);
+	targv[i-argc+1] = argv[0];  /* need to keep ptr in sync */
 	strcpy (argv[0], cmd[0].name);
 	status &= (*cmd[0].func) (argc, argv);
@@ -81,2 +86,3 @@
   fprintf (stderr, "Ncalls to command(): %d\n", Ncalls);
 }
+