Merge pull request #157 from troglobit/usr/kandeg/initctl-edit

initctl: add edit command, fix #154 

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

src/initctl.c

@@ -660,7 +660,8 @@ static int usage(int rc)
 		"  disable  <CONF>           Disable  .conf in /etc/finit.d/[enabled/]\n"
 		"  touch    <CONF>           Mark     .conf in /etc/finit.d/ for reload\n"
 		"  reload                    Reload  *.conf in /etc/finit.d/ (activates changes)\n"
-//		"  reload   <JOB|NAME>[:ID]  Reload (SIGHUP) service by job# or name\n"
+//		"  reload   <JOB|NAME>[:ID]  Reload (SIGHUP) service by job# or name\n"  
+		"  edit     <CONF>           Edit     .conf in /etc/finit.d/available/\n"
 		"\n"
 		"  cond     show             Show condition status\n"
 		"  cond     dump             Dump all conditions and their status\n"
@@ -710,6 +711,7 @@ int main(int argc, char *argv[])
 		{ "enable",   serv_enable  },
 		{ "disable",  serv_disable },
 		{ "touch",    serv_touch   },
+		{ "edit",     serv_edit    },
 		{ "reload",   do_reload    },
 
 		{ "cond",     do_cond      },

src/serv.c

@@ -27,6 +27,7 @@
 #include <fcntl.h> /* Definition of AT_* constants */
 #include <glob.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <lite/lite.h>
 
 #include "util.h"
@@ -199,6 +200,34 @@ int serv_touch(char *arg)
 	return 0;
 }
 
+int serv_edit(char *arg)
+{
+	char corr[40];
+	char path[256];
+
+	if (!arg || !arg[0])
+		return serv_list(NULL);
+
+	if (!strstr(arg, ".conf")) {
+		snprintf(corr, sizeof(corr), "%s.conf", arg);
+		arg = corr;
+	}
+
+	pushd(FINIT_RCSD);
+	if (mkdir("available", 0755) && EEXIST != errno)
+		err(1, "Failed creating %s/available directory", FINIT_RCSD);
+
+	snprintf(path, sizeof(path), "%s/%s", available, arg);
+	if (!fexist(path))
+		return serv_list(NULL);
+
+	return 	systemf("[ -x \"$(command -v sensible-editor)\" ] && sensible-editor %s", path) || \
+		systemf("[ -x \"$(command -v editor)\" ] && editor %s", path) || \
+		systemf("${VISUAL:-${EDITOR:-$(command -v vi)}} %s", path) || \
+		systemf("[ -x \"$(command -v mg)\" ] && mg %s", path) || \
+		systemf("[ -x \"$(command -v vi)\" ] && vi %s", path);
+}
+
 /**
  * Local Variables:
  *  indent-tabs-mode: t

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_edit    (char *arg);
 
 #endif /* FINIT_SERV_H_ */