migrate fully to meson build system

- drop old build system
- move shared include and source files to common directory
- drop "rc-" prefix from shared include and source files
- move executable-specific code to individual directories under src
- adjust top-level .gitignore file for new build system

This closes #489.

2 files changed, 111 insertions, 0 deletions

diff --git a/src/mark_service/mark_service.c b/src/mark_service/mark_service.c
new file mode 100644
index 00000000..eaab6eed
--- /dev/null
+++ b/src/mark_service/mark_service.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2007-2015 The OpenRC Authors.
+ * See the Authors file at the top-level directory of this distribution and
+ * https://github.com/OpenRC/openrc/blob/HEAD/AUTHORS
+ *
+ * This file is part of OpenRC. It is subject to the license terms in
+ * the LICENSE file found in the top-level directory of this
+ * distribution and at https://github.com/OpenRC/openrc/blob/HEAD/LICENSE
+ * This file may not be copied, modified, propagated, or distributed
+ *    except according to the terms contained in the LICENSE file.
+ */
+
+#include <sys/types.h>
+#include <sys/time.h>
+
+#include <errno.h>
+#include <ctype.h>
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
+#include <syslog.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "einfo.h"
+#include "rc.h"
+#include "misc.h"
+
+const char *applet = NULL;
+
+int main(int argc, char **argv)
+{
+	bool ok = false;
+	char *svcname = getenv("RC_SVCNAME");
+	char *service = NULL;
+	char *openrc_pid;
+	/* char *mtime; */
+	pid_t pid;
+	RC_SERVICE bit;
+	/* size_t l; */
+
+	applet = basename_c(argv[0]);
+	if (argc > 1)
+		service = argv[1];
+	else
+		service = svcname;
+
+	if (service == NULL || *service == '\0')
+		eerrorx("%s: no service specified", applet);
+
+	if (!strncmp(applet, "mark_", 5) &&
+	    (bit = lookup_service_state(applet + 5)))
+		ok = rc_service_mark(service, bit);
+	else
+		eerrorx("%s: unknown applet", applet);
+
+	/* If we're marking ourselves then we need to inform our parent
+	   openrc-run process so they do not mark us based on our exit code */
+	/*
+	 * FIXME: svcname and service are almost always equal except called from a
+	 * shell with just argv[1] - So that doesn't seem to do what Roy initially
+	 * expected.
+	 * See 20120424041423.GA23657@odin.qasl.de (Tue, 24 Apr 2012 06:14:23 +0200,
+	 * openrc@gentoo.org).
+	 */
+	if (ok && svcname && strcmp(svcname, service) == 0) {
+		openrc_pid = getenv("RC_OPENRC_PID");
+		if (openrc_pid && sscanf(openrc_pid, "%d", &pid) == 1)
+			if (kill(pid, SIGHUP) != 0)
+				eerror("%s: failed to signal parent %d: %s",
+				    applet, pid, strerror(errno));
+
+		/* Remove the exclusive time test. This ensures that it's not
+		   in control as well */
+		/*
+		l = strlen(RC_SVCDIR "/exclusive") + strlen(svcname) +
+		    strlen(openrc_pid) + 4;
+		mtime = xmalloc(l);
+		snprintf(mtime, l, RC_SVCDIR "/exclusive/%s.%s",
+		    svcname, openrc_pid);
+		if (exists(mtime) && unlink(mtime) != 0)
+			eerror("%s: unlink: %s", applet, strerror(errno));
+		free(mtime);
+		*/
+	}
+
+	return ok ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/src/mark_service/meson.build b/src/mark_service/meson.build
new file mode 100644
index 00000000..ba046dcb
--- /dev/null
+++ b/src/mark_service/meson.build
@@ -0,0 +1,20 @@
+mark_service_execs =	[
+  'mark_service_starting',
+  'mark_service_started',
+  'mark_service_stopping',
+  'mark_service_stopped',
+  'mark_service_inactive',
+  'mark_service_wasinactive',
+  'mark_service_hotplugged',
+  'mark_service_failed',
+  'mark_service_crashed',
+  ]
+
+foreach exec : mark_service_execs
+  executable(exec,
+    ['mark_service.c', misc_c, version_h],
+    include_directories: [incdir, einfo_incdir, rc_incdir],
+    link_with: [libeinfo,librc],
+    install: true,
+    install_dir: rc_sbindir)
+endforeach