Include argv in the output of ctl id command.

* ctl.c (res_instance): Include "argv" in the return json.
Use pies_master_argv[0] to report binary path.
* pies.c (pies_master_argv,pies_master_argc): New globals.
(main): Initialize them.
Refuse to restart unless argv[0] begins with a slash.
* pies.h (pies_master_argv,pies_master_argc): New globals.
* piesctl.c (com_id): Rewrite output formatting.

1 files changed, 19 insertions, 3 deletions

diff --git a/src/ctl.c b/src/ctl.c
index cdb9b6c..8845390 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -1296,27 +1296,43 @@ static void
 idfmt_pid (struct ctlio *io, char const *name, void *ptr)
 {
   json_object_set_number (io->output.reply, name, getpid ());
 }
 
 static void
+idfmt_argv (struct ctlio *io, char const *name, void *ptr)
+{
+  struct json_value *ar = json_new_array ();
+  size_t i;
+
+  for (i = 0; i < pies_master_argc; i++)
+    json_array_append (ar, json_new_string (pies_master_argv[i]));
+  json_object_set (io->output.reply, name, ar);
+}
+
+static void
+idfmt_binary (struct ctlio *io, char const *name, void *ptr)
+{
+  json_object_set_string (io->output.reply, name, "%s", pies_master_argv[0]);
+}
+
+static void
 res_instance (struct ctlio *io, enum http_method meth,
 	      char const *uri, struct json_value *req)
 {
   static struct idparam {
     char *name;
     void (*fmt) (struct ctlio *, char const *, void *);
     void *data;
   } idparam[] = {
     { "package",  idfmt_string, PACKAGE_NAME },
     { "version",  idfmt_string, PACKAGE_VERSION },
-#if HAVE_DECL_PROGRAM_INVOCATION_NAME
-    { "binary",   idfmt_string_ptr, &program_invocation_name },
-#endif
+    { "binary",   idfmt_binary, NULL },
     { "PID",      idfmt_pid, NULL },
     { "instance", idfmt_string_ptr, &instance },
+    { "argv",     idfmt_argv, NULL },
     { NULL }
   };
   struct idparam *p;
   
   io->output.reply = json_reply_create ();
   if (uri)