piesctl: Implement all basic commands, except "restart"

3 files changed, 336 insertions, 14 deletions

diff --git a/src/ctl.c b/src/ctl.c
index ce13dab..cbc5fea 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -1,5 +1,5 @@
 /* This file is part of GNU Pies.
-   Copyright (C) 2007-2013 Sergey Poznyakoff
+   Copyright (C) 2007-2016 Sergey Poznyakoff
 
    GNU Pies is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1446,7 +1446,7 @@ res_programs (struct ctlio *io, enum http_method meth,
                     ctlio_reply (io, 409, "already running");
                   else
                     {
-                      prog->v.p.comp->flags &= CF_DISABLED;
+                      prog->v.p.comp->flags &= ~CF_DISABLED;
                       prog->v.p.status = status_enabled;
                       kill (getpid (), SIGALRM);
                       ctlio_reply (io, 200, "Component started");
diff --git a/src/piesctl-cl.opt b/src/piesctl-cl.opt
index 04ff051..a83616e 100644
--- a/src/piesctl-cl.opt
+++ b/src/piesctl-cl.opt
@@ -1,5 +1,5 @@
 /* This file is part of GNU Pies. -*- c -*-
-   Copyright (C) 2008-2014 Sergey Poznyakoff
+   Copyright (C) 2008-2016 Sergey Poznyakoff
 
    GNU Pies is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -52,6 +52,12 @@ BEGIN
   ++verbose;
 END
 
+OPTION(dump,d,,
+       [<dump obtained responsed verbatim>])
+BEGIN
+  ++dump;
+END
+
 OPTION(url,u,URL,
        [<connect to this socket>])
 BEGIN
diff --git a/src/piesctl.c b/src/piesctl.c
index 0618caa..9c5ef8b 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -1,5 +1,5 @@
 /* This file is part of GNU Pies.
-   Copyright (C) 2015 Sergey Poznyakoff
+   Copyright (C) 2015, 2016 Sergey Poznyakoff
 
    GNU Pies is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@
 #include "progname.h"
 #include "libpies.h"
 #include "grecsasrt.h"
+#include "fprintftime.h"
 
 struct pies_url *default_url;           /* Control socket URL */
 struct pies_url *url;
@@ -43,6 +44,7 @@ char *config_file;
 char default_config_file[] = SYSCONFDIR "/piesctl.conf";
 int preprocess_only;
 int verbose;
+int dump;
 
 static void config_help (void);
 
@@ -794,21 +796,29 @@ shttp_get_reply (struct shttp_connection *conn)
 }
 
 static void
-stderr_writer (void *closure, char const *text, size_t len)
+fp_writer (void *closure, char const *text, size_t len)
 {
-  fwrite (text, len, 1, stderr);
+  fwrite (text, len, 1, (FILE*) closure);
 }
 
 static void
-shttp_format_result (struct shttp_connection *conn)
+print_json (FILE *fp, struct json_value *v)
 {
   struct json_format fmt = {
     .indent = 2,
     .precision = 0,
-    .write = stderr_writer,
+    .write = fp_writer,
+    .data = fp
   };
+  json_format_value (v, &fmt);
+  fputc ('\n', fp);
+}
+
+static void
+shttp_format_result (struct shttp_connection *conn, FILE *fp)
+{
   fprintf (stderr, "%s: raw JSON reply follows:\n", program_name);
-  json_format_value (conn->result, &fmt);
+  print_json (fp, conn->result);
 }
 
 static void
@@ -821,7 +831,7 @@ shttp_fatal (struct shttp_connection *conn)
       if (jv->type == json_string)
         grecs_error (NULL, 0, "%s", jv->v.s);
       else
-        shttp_format_result (conn);
+        shttp_format_result (conn, stderr);
     }
   else
     grecs_error (NULL, 0, "%s", conn->status_line[2]);
@@ -927,6 +937,8 @@ shttp_process (struct shttp_connection *conn, int method, char const *uri)
     {
       shttp_request_send (conn, method, uri);
       shttp_get_reply (conn);
+      if (dump && conn->result)
+        shttp_format_result (conn, stdout);
       if (conn->resp.code / 100 == 2)
         return;
       if (conn->resp.code == 401 && isatty (fileno (stdin)))
@@ -936,24 +948,274 @@ shttp_process (struct shttp_connection *conn, int method, char const *uri)
     }
 }  
 
+static struct json_value *
+shttp_getval (struct shttp_connection *conn, char const *name,
+              enum json_value_type type)
+{
+  struct json_value *p = NULL;
+
+  switch (json_object_get (conn->result, name, &p))
+    {
+    case 0:
+      if (p->type != type)
+        {
+          grecs_error (NULL, 0, _("\"%s\" has wrong type"), name);
+          p = NULL;
+        }
+      break;
+
+    case 1:
+      grecs_error (NULL, 0, _("no \"%s\" member"), name);
+      break;
+      
+    default:
+        grecs_error (NULL, errno, _("can't get value of \"%s\""), name);
+    }
+  return p;
+}
+
+struct kwtrans
+{
+  char const *name;
+  int c;
+};
+
+struct kwtrans mode_trans[] = {
+  { "exec",         'C' },
+  { "accept",       'A' }, 
+  { "inetd",        'I' }, 
+  { "pass_fd",      'P' }, 
+  { "wait",         'W' },  
+  { "once",         'c' }, 
+  { "boot",         'B' }, 
+  { "bootwait",     'w' }, 
+  { "powerfail",    'F' }, 
+  { "powerwait",    'f' },
+  { "powerokwait",  'o' }, 
+  { "ctrlaltdel",   '3' },      
+  { "ondemand",     'D' }, 
+  { "sysinit",      'i' }, 
+  { "powerfailnow", 'n' }, 
+  { "kbrequest",    'k' },
+  { NULL }
+};
+
+struct kwtrans status_trans[] = {
+  { "enabled",  'R' },
+  { "disabled", 'D' },
+  { "listener", 'L' },
+  { "sleeping", 's' },
+  { "stopping", 'S' },
+  { "finished", 'f' },
+  { NULL }
+};
+
+static int
+kwtoc (char const *s, struct kwtrans const *trans)
+{
+  for (; trans->name; trans++)
+    {
+      if (strcmp (trans->name, s) == 0)
+        return trans->c;
+    }
+  return '-';
+}
+
+static struct json_value *
+getval (struct json_value *v, char const *name, enum json_value_type type,
+        int optional)
+{
+  struct json_value *p = NULL;
+
+  switch (json_object_get (v, name, &p))
+    {
+    case 0:
+      if (p->type != type)
+        {
+          grecs_error (NULL, 0, _("\"%s\" has wrong type"), name);
+          p = NULL;
+        }
+      break;
+
+    case 1:
+      if (!optional)
+        grecs_error (NULL, 0, _("no \"%s\" member"), name);
+      break;
+      
+    default:
+        grecs_error (NULL, errno, _("can't get value of \"%s\""), name);
+    }
+  return p;