initctl: add show command to cat foo.conf, default finit.conf

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

src/initctl.c

@@ -740,9 +740,14 @@ static int usage(int rc)
 			"  ls | list                 List all .conf in " FINIT_RCSD "\n"
 			"  create   <CONF>           Create   .conf in %s\n"
 			"  delete   <CONF>           Delete   .conf in %s\n"
+			"  show     <CONF>           Show     .conf in %s\n"
 			"  edit     <CONF>           Edit     .conf in %s\n"
 			"  touch    <CONF>           Change   .conf in %s\n",
-			avail, avail, avail, avail);
+			avail, avail, avail, avail, avail);
+	else
+		fprintf(stderr,
+			"  show                      Show     %s\n", FINIT_CONF);
+
 	if (has_ena)
 		fprintf(stderr,
 			"  enable   <CONF>           Enable   .conf in %s\n", avail);
@@ -805,6 +810,7 @@ int main(int argc, char *argv[])
 		{ "enable",   serv_enable  },
 		{ "disable",  serv_disable },
 		{ "touch",    serv_touch   },
+		{ "show",     serv_show    },
 		{ "edit",     serv_edit    },
 		{ "create",   serv_creat   },
 		{ "delete",   serv_delete  },

src/serv.c

@@ -138,6 +138,11 @@ static char *conf(char *path, size_t len, char *name, int creat)
 {
 	char corr[40];
 
+	if (!name || !name[0]) {
+		strlcpy(path, FINIT_CONF, len);
+		return path;
+	}
+
 	if (!strstr(name, ".conf")) {
 		snprintf(corr, sizeof(corr), "%s.conf", name);
 		name = corr;
@@ -250,6 +255,20 @@ int serv_touch(char *arg)
 	return 0;
 }
 
+int serv_show(char *arg)
+{
+	char path[256];
+	char *fn;
+
+	fn = conf(path, sizeof(path), arg, creat);
+	if (!fexist(fn)) {
+		warnx("Cannot find %s", arg);
+		return 1;
+	}
+
+	return systemf("cat %s", fn);
+}
+
 /*
  * Try to open an editor for the given file, if creat is given we
  * create a new file based on /lib/finit/sample.conf

src/serv.h

@@ -28,6 +28,7 @@ int serv_list    (char *arg);
 int serv_enable  (char *arg);
 int serv_disable (char *arg);
 int serv_touch   (char *arg);
+int serv_show    (char *arg);
 int serv_edit    (char *arg);
 int serv_creat   (char *arg);
 int serv_delete  (char *arg);