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

Timestamp:

Jul 19, 2006, 10:26:59 AM (20 years ago)

Author:

eugene

Message:

unified the client/standalone command functions

File:

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

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

@@ -5 +5 @@
 
   int i, Nbad, status, server;
-  char *line, *outline, *prompt, *history;
-  char hostname[256], PASSWORD[256];
+  char *line, *prompt, *history;
   pid_t ppid;
-  IOBuffer message;
 
   general_init (&argc, argv);
@@ -17 +15 @@
   welcome ();
 
-  /* connect to the server */
-  if (VarConfig ("PANTASKS_SERVER", "%s", hostname) == NULL) {
-    gprint (GP_ERR, "pantasks server host undefined\n");
-    exit (2);
-  }
-  server = GetClientSocket (hostname);
+  /* attempt to connect to the pantasks server (exit on failure) */
+  multicommand_InitServer ();
 
-  /* here we can perform the security handshaking */
-  VarConfig ("PASSWORD", "%s", PASSWORD);
-  SendCommand (server, strlen(PASSWORD), PASSWORD);
-  
   Nbad = 0;
   while (1) {  /** must exit with command "exit" or "quit" */
@@ -50 +40 @@
 
     stripwhite (line);
-    
-    /* check for commands to be caught by client */
-    /* use the standard command parser? */
-    /* XXX the exit status of command does not allow us
-       to distinguish 'failed command' and 'command not found' */
-    /* XXX eventually replace this with a multicommand parsing */
-    status = multicommand_client (line, server);
-    add_history (line);
-    append_history (1, history);
 
+    if (*line) {
+        status = multicommand (line);
+        add_history (line);
+        append_history (1, history);
+    }
     free (line);
   }
 }
-
-# if 0
-    /* command was not caught by client, send to server */
-    if (*outline && !status ) {
-      gprint (GP_ERR, "sending message to %d: %s\n", server, outline);
-      SendMessage (server, outline);
-      add_history (outline);
-      append_history (1, history);
-
-      // XXX add this in and print to stdout
-      status = ExpectMessage (server, 2.0, &message);
-      // 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");
-    }
-# endif
 
 /*