Changeset 7929 for trunk/Ohana/src/opihi/pantasks/client_shell.c

Timestamp:

Jul 18, 2006, 6:58:54 AM (20 years ago)

Author:

eugene

Message:

updates to fix comm problems with buffers (motivated by opihi gprint)

File:

• trunk/Ohana/src/opihi/pantasks/client_shell.c (modified) (3 diffs)

trunk/Ohana/src/opihi/pantasks/client_shell.c

@@ -4 +4 @@
 int client_shell (int argc, char **argv) {
 
-  int Nbad, status, server;
+  int i, Nbad, status, server;
   char *line, *outline, *prompt, *history;
   char hostname[256], PASSWORD[256];
@@ -55 +55 @@
     /* XXX the exit status of command does not allow us
        to distinguish 'failed command' and 'command not found' */
-    status = command (line, &outline);
-    if (outline == NULL) {
-      gprint (GP_ERR, "programming error: command_client returned NULL\n");
-      exit (2);
-    }
+    /* XXX eventually replace this with a multicommand parsing */
+    status = multicommand_client (line, server);
+    add_history (line);
+    append_history (1, history);
 
+    free (line);
+  }
+}
+
+# if 0
     /* command was not caught by client, send to server */
     if (*outline && !status ) {
@@ -70 +74 @@
       // XXX add this in and print to stdout
       status = ExpectMessage (server, 2.0, &message);
-      gprint (GP_ERR, "got message: %d bytes\n", message.Nbuffer);
-      gwrite (message.buffer, 1, message.Nbuffer, GP_ERR);
-      gprint (GP_ERR, "end message\n");
+      // fprintf (stderr, "got stdout message: %d bytes\n", message.Nbuffer);
+      fwrite (message.buffer, 1, message.Nbuffer, stderr);
+      // fprintf (stderr, "end message\n");
+
+      // fprintf (stderr, "got message: %d bytes\n", message.Nbuffer);
+      // for (i = 0; i < message.Nbuffer; i++) {
+      // fprintf (stderr, "%d %d %c\n", i, message.buffer[i], message.buffer[i]);
+      // }
+      // fwrite (message.buffer, 1, message.Nbuffer, stderr);
+      // fprintf (stderr, "end message\n");
+
+      // XXX add this in and print to stdout
+      status = ExpectMessage (server, 2.0, &message);
+      // fprintf (stderr, "got stderr message: %d bytes\n", message.Nbuffer);
+      fwrite (message.buffer, 1, message.Nbuffer, stderr);
+      // fprintf (stderr, "end message\n");
     }
-    free (outline);
-  }
-}
+# endif
 
 /*