Allow for OS and SUBOS folders so we can introduce NetBSD scripts whilst keeping BSD for all BSD's.

3 files changed, 203 insertions, 0 deletions

diff --git a/src/includes/hidden-visibility.h b/src/includes/hidden-visibility.h
new file mode 100644
index 00000000..bc7e338a
--- /dev/null
+++ b/src/includes/hidden-visibility.h
@@ -0,0 +1,26 @@
+/* 
+ * Written by Mike Frysinger
+ * Placed in the Public Domain 
+ */
+
+#ifndef _HIDDEN_VISIBILITY_H_
+#define _HIDDEN_VISIBILITY_H_
+
+#if defined(__ELF__) && defined(__GNUC__)
+# define __hidden_asmname(name) __hidden_asmname1 (__USER_LABEL_PREFIX__, name)
+# define __hidden_asmname1(prefix, name) __hidden_asmname2(prefix, name)
+# define __hidden_asmname2(prefix, name) #prefix name
+# define __hidden_proto(name, internal) \
+	extern __typeof (name) name __asm__ (__hidden_asmname (#internal)) \
+	__attribute__ ((visibility ("hidden")));
+# define __hidden_ver(local, internal, name) \
+   extern __typeof (name) __EI_##name __asm__(__hidden_asmname (#internal)); \
+   extern __typeof (name) __EI_##name __attribute__((alias (__hidden_asmname1 (,#local))))
+# define hidden_proto(name) __hidden_proto(name, __RC_##name)
+# define hidden_def(name) __hidden_ver(__RC_##name, name, name);
+#else
+# define hidden_proto(name)
+# define hidden_def(name)
+#endif
+
+#endif
diff --git a/src/includes/rc-misc.h b/src/includes/rc-misc.h
new file mode 100644
index 00000000..b7208e67
--- /dev/null
+++ b/src/includes/rc-misc.h
@@ -0,0 +1,129 @@
+/*
+   rc-misc.h
+   This is private to us and not for user consumption
+   */
+
+/* 
+ * Copyright 2007 Roy Marples
+ * All rights reserved
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef __RC_MISC_H__
+#define __RC_MISC_H__
+
+#include <sys/stat.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <string.h>
+
+#ifndef LIB
+#  define LIB "lib"
+#endif
+
+#define RC_LEVEL_BOOT           "boot"
+#define RC_LEVEL_DEFAULT        "default"
+
+#define RC_LIBDIR               "/" LIB "/rc"
+#define RC_SVCDIR               RC_LIBDIR "/init.d"
+#define RC_DEPTREE              RC_SVCDIR "/deptree"
+#define RC_RUNLEVELDIR          "/etc/runlevels"
+#define RC_INITDIR              "/etc/init.d"
+#define RC_CONFDIR              "/etc/conf.d"
+
+#define RC_INITDIR_LOCAL        "/usr/local/etc/init.d"
+#define RC_CONFDIR_LOCAL        "/usr/local/etc/conf.d"
+
+#define RC_KSOFTLEVEL           RC_SVCDIR "/ksoftlevel"
+#define RC_STARTING             RC_SVCDIR "/rc.starting"
+#define RC_STOPPING             RC_SVCDIR "/rc.stopping"
+
+#define RC_SVCDIR_STARTING      RC_SVCDIR "/starting"
+#define RC_SVCDIR_INACTIVE      RC_SVCDIR "/inactive"
+#define RC_SVCDIR_STARTED       RC_SVCDIR "/started"
+#define RC_SVCDIR_COLDPLUGGED	RC_SVCDIR "/coldplugged"
+
+#define RC_PLUGINDIR            RC_LIBDIR "/plugins"
+
+#define ERRX					fprintf (stderr, "out of memory\n"); exit (1)
+
+static inline void *xmalloc (size_t size)
+{
+	void *value = malloc (size);
+
+	if (value)
+		return (value);
+
+	ERRX;
+}
+
+static inline void *xrealloc (void *ptr, size_t size)
+{
+	void *value = realloc (ptr, size);
+
+	if (value)
+		return (value);
+
+	ERRX;
+}
+
+static inline char *xstrdup (const char *str)
+{
+	char *value;
+
+	if (! str)
+		return (NULL);
+
+	value = strdup (str);
+
+	if (value)
+		return (value);
+
+	ERRX;
+}
+
+#undef ERRX
+
+static inline bool exists (const char *pathname)
+{
+	struct stat buf;
+
+	return (stat (pathname, &buf) == 0);
+}
+
+char *rc_conf_value (const char *var);
+bool rc_conf_yesno (const char *var);
+char **env_filter (void);
+char **env_config (void);
+
+/* basename_c never modifies the argument. As such, if there is a trailing
+ * slash then an empty string is returned. */
+static inline const char *basename_c (const char *path) {
+	const char *slash = strrchr (path, '/');
+
+	if (slash)
+		return (++slash);
+	return (path);
+}
+
+#endif
diff --git a/src/includes/strlist.h b/src/includes/strlist.h
new file mode 100644
index 00000000..3abe44ff
--- /dev/null
+++ b/src/includes/strlist.h
@@ -0,0 +1,48 @@
+/*
+   strlist.h 
+   String list macros for making char ** arrays
+   Based on a previous implementation by Martin Schlemmer
+   */
+
+/* 
+ * Copyright 2007 Roy Marples
+ * All rights reserved
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef __STRLIST_H__
+#define __STRLIST_H__
+
+/* FIXME: We should replace the macro with an rc_strlist_foreach
+   function, but I'm unsure how to go about this. */
+
+/* Step through each entry in the string list, setting '_pos' to the
+   beginning of the entry.  '_counter' is used by the macro as index,
+   but should not be used by code as index (or if really needed, then
+   it should usually by +1 from what you expect, and should only be
+   used in the scope of the macro) */
+#define STRLIST_FOREACH(_list, _pos, _counter) \
+	if ((_list) && _list[0] && ! (_counter = 0)) \
+		while ((_pos = _list[_counter++]))
+
+#endif /* __STRLIST_H__ */