Changeset 37462

Timestamp:

Oct 4, 2014, 5:52:22 PM (12 years ago)

Author:

eugene

Message:

add support for controller options

Location:

branches/eam_branches/ipp-20140904/Ohana/src/opihi

Files:

• pantasks/controller_status.c (modified) (2 diffs)
• pcontrol/status.c (modified) (1 diff)

branches/eam_branches/ipp-20140904/Ohana/src/opihi/pantasks/controller_status.c

@@ -3 +3 @@
 int controller_status (int argc, char **argv) {
 
-  int status;
-  char command[1024];
+  int i, status;
+  char command[1024], tmpline[1024];
   IOBuffer buffer;
 
-  if (argc != 1) {
-    gprint (GP_ERR, "USAGE: controller status\n");
+  if ((argc > 1) && (!strcasecmp(argv[1], "help")))  {
+    gprint (GP_ERR, "USAGE: controller status [options]\n");
+    gprint (GP_ERR, "  OPTIONS:\n");
+    gprint (GP_ERR, "  -cmd command\n");
+    gprint (GP_ERR, "  -host hostname\n");
+    gprint (GP_ERR, "  -state state\n");
+    gprint (GP_ERR, "  -age seconds\n");
+    gprint (GP_ERR, "  +jobs [-nohost]\n");
+    gprint (GP_ERR, "  +host [-nojobs]\n");
     return (FALSE);
   }
@@ -19 +26 @@
   }
 
+  snprintf (command, 1024, "status");
+  for (i = 1; i < argc; i++) {
+    snprintf (tmpline, 1024, "%s %s", command, argv[i]);
+    strcpy (command, tmpline);
+  }
 
-  sprintf (command, "status");
   InitIOBuffer (&buffer, 0x100);
 

branches/eam_branches/ipp-20140904/Ohana/src/opihi/pcontrol/status.c

@@ -85 +85 @@
 
 usage:
-  gprint (GP_ERR, "USAGE: status [-cmd command] [-host hostname] [-state state] [-age seconds] [+jobs,-nohost] [+host,-nojobs]\n");
+  gprint (GP_LOG, "USAGE: status [-cmd command] [-host hostname] [-state state] [-age seconds] [+jobs,-nohost] [+host,-nojobs]\n");
   return FALSE;
 }