rename basic.la to shared.la and put selinux deps in shared-selinx.la

Only 34 of 74 tools need libselinux linked, and libselinux is a pain
with its unconditional library constructor.

src/ask-password-api.c

@@ -32,6 +32,7 @@
 #include <sys/signalfd.h>
 
 #include "util.h"
+#include "mkdir.h"
 #include "strv.h"
 
 #include "ask-password-api.h"

src/automount.c

@@ -38,6 +38,7 @@
 #include "bus-errors.h"
 #include "special.h"
 #include "label.h"
+#include "mkdir.h"
 
 static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = {
         [AUTOMOUNT_DEAD] = UNIT_INACTIVE,

src/cryptsetup/cryptsetup-generator.c

@@ -26,6 +26,7 @@
 #include "log.h"
 #include "util.h"
 #include "unit-name.h"
+#include "mkdir.h"
 
 const char *arg_dest = "/tmp";
 

src/dbus.c

@@ -29,6 +29,7 @@
 #include "log.h"
 #include "strv.h"
 #include "cgroup.h"
+#include "mkdir.h"
 #include "dbus-unit.h"
 #include "dbus-job.h"
 #include "dbus-manager.h"

src/getty-generator.c

@@ -25,6 +25,7 @@
 
 #include "log.h"
 #include "util.h"
+#include "mkdir.h"
 #include "unit-name.h"
 #include "virt.h"
 

src/install.c

@@ -26,6 +26,7 @@
 #include <fnmatch.h>
 
 #include "util.h"
+#include "mkdir.h"
 #include "hashmap.h"
 #include "set.h"
 #include "path-lookup.h"

src/journal/coredump.c

@@ -29,6 +29,7 @@
 
 #include "log.h"
 #include "util.h"
+#include "mkdir.h"
 #include "special.h"
 
 #define COREDUMP_MAX (24*1024*1024)

src/journal/journald.c

@@ -35,6 +35,7 @@
 #include <systemd/sd-messages.h>
 #include <systemd/sd-daemon.h>
 
+#include "mkdir.h"
 #include "hashmap.h"
 #include "journal-file.h"
 #include "socket-util.h"

src/locale/localed.c

@@ -26,6 +26,7 @@
 #include <unistd.h>
 
 #include "util.h"
+#include "mkdir.h"
 #include "strv.h"
 #include "dbus-common.h"
 #include "polkit.h"

src/login/logind-dbus.c

@@ -27,6 +27,7 @@
 #include "logind.h"
 #include "dbus-common.h"
 #include "strv.h"
+#include "mkdir.h"
 #include "polkit.h"
 #include "special.h"
 

src/login/logind-seat.c

@@ -30,6 +30,7 @@
 #include "logind-seat.h"
 #include "logind-acl.h"
 #include "util.h"
+#include "mkdir.h"
 
 Seat *seat_new(Manager *m, const char *id) {
         Seat *s;

src/login/logind-session.c

@@ -28,6 +28,7 @@
 #include "logind-session.h"
 #include "strv.h"
 #include "util.h"
+#include "mkdir.h"
 #include "cgroup-util.h"
 
 #define IDLE_THRESHOLD_USEC (5*USEC_PER_MINUTE)

src/login/logind-user.c

@@ -25,6 +25,7 @@
 
 #include "logind-user.h"
 #include "util.h"
+#include "mkdir.h"
 #include "cgroup-util.h"
 #include "hashmap.h"
 #include "strv.h"

src/login/multi-seat-x.c

@@ -25,6 +25,7 @@
 #include <libudev.h>
 
 #include "util.h"
+#include "mkdir.h"
 
 int main(int argc, char *argv[]) {
 

src/machine-id-setup.c

@@ -32,6 +32,7 @@
 #include "machine-id-setup.h"
 #include "macro.h"
 #include "util.h"
+#include "mkdir.h"
 #include "log.h"
 #include "virt.h"
 

src/manager.c

@@ -49,6 +49,7 @@
 #include "strv.h"
 #include "log.h"
 #include "util.h"
+#include "mkdir.h"
 #include "ratelimit.h"
 #include "cgroup.h"
 #include "mount-setup.h"

src/mount-setup.c

@@ -36,6 +36,7 @@
 #include "label.h"
 #include "set.h"
 #include "strv.h"
+#include "mkdir.h"
 
 #ifndef TTY_GID
 #define TTY_GID 5

src/mount.c

@@ -31,6 +31,7 @@
 #include "load-dropin.h"
 #include "log.h"
 #include "strv.h"
+#include "mkdir.h"
 #include "mount-setup.h"
 #include "unit-name.h"
 #include "dbus-mount.h"

src/nspawn.c

@@ -43,6 +43,7 @@
 
 #include "log.h"
 #include "util.h"
+#include "mkdir.h"
 #include "audit.h"
 #include "missing.h"
 #include "cgroup-util.h"

src/path-lookup.c

@@ -26,6 +26,7 @@
 #include <errno.h>
 
 #include "util.h"
+#include "mkdir.h"
 #include "strv.h"
 
 #include "path-lookup.h"

src/path.c

@@ -28,6 +28,7 @@
 #include "unit.h"
 #include "unit-name.h"
 #include "path.h"
+#include "mkdir.h"
 #include "dbus-path.h"
 #include "special.h"
 #include "bus-errors.h"

src/random-seed.c

@@ -27,6 +27,7 @@
 
 #include "log.h"
 #include "util.h"
+#include "mkdir.h"
 
 #define POOL_SIZE_MIN 512
 

src/rc-local-generator.c

@@ -26,6 +26,7 @@
 
 #include "log.h"
 #include "util.h"
+#include "mkdir.h"
 
 #if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
 #define SCRIPT_PATH "/etc/rc.d/rc.local"

src/shared/cgroup-util.c

@@ -34,6 +34,7 @@
 #include "set.h"
 #include "macro.h"
 #include "util.h"
+#include "mkdir.h"
 
 int cg_enumerate_processes(const char *controller, const char *path, FILE **_f) {
         char *fs;

src/shared/mkdir.c

@@ -0,0 +1,99 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <assert.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "mkdir.h"
+#include "label.h"
+#include "util.h"
+#include "log.h"
+
+int safe_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid) {
+        struct stat st;
+
+        if (label_mkdir(path, mode) >= 0)
+                if (chmod_and_chown(path, mode, uid, gid) < 0)
+                        return -errno;
+
+        if (lstat(path, &st) < 0)
+                return -errno;
+
+        if ((st.st_mode & 0777) != mode ||
+            st.st_uid != uid ||
+            st.st_gid != gid ||
+            !S_ISDIR(st.st_mode)) {
+                errno = EEXIST;
+                return -errno;
+        }
+
+        return 0;
+}
+
+int mkdir_parents(const char *path, mode_t mode) {
+        const char *p, *e;
+
+        assert(path);
+
+        /* Creates every parent directory in the path except the last
+         * component. */
+
+        p = path + strspn(path, "/");
+        for (;;) {
+                int r;
+                char *t;
+
+                e = p + strcspn(p, "/");
+                p = e + strspn(e, "/");
+
+                /* Is this the last component? If so, then we're
+                 * done */
+                if (*p == 0)
+                        return 0;
+
+                if (!(t = strndup(path, e - path)))
+                        return -ENOMEM;
+
+                r = label_mkdir(t, mode);
+                free(t);
+
+                if (r < 0 && errno != EEXIST)
+                        return -errno;
+        }
+}
+
+int mkdir_p(const char *path, mode_t mode) {
+        int r;
+
+        /* Like mkdir -p */
+
+        if ((r = mkdir_parents(path, mode)) < 0)
+                return r;
+
+        if (label_mkdir(path, mode) < 0 && errno != EEXIST)
+                return -errno;
+
+        return 0;
+}

src/shared/mkdir.h

@@ -0,0 +1,28 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#ifndef foomkdirhfoo
+#define foomkdirhfoo
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+int safe_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid);
+int mkdir_parents(const char *path, mode_t mode);
+int mkdir_p(const char *path, mode_t mode);
+#endif

src/shared/socket-util.c

@@ -34,6 +34,7 @@
 
 #include "macro.h"
 #include "util.h"
+#include "mkdir.h"
 #include "socket-util.h"
 #include "missing.h"
 #include "label.h"

src/shared/util.c

@@ -1591,74 +1591,6 @@ char *file_in_same_dir(const char *path, const char *filename) {
         return r;
 }
 
-int safe_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid) {
-        struct stat st;
-
-        if (label_mkdir(path, mode) >= 0)
-                if (chmod_and_chown(path, mode, uid, gid) < 0)
-                        return -errno;
-
-        if (lstat(path, &st) < 0)
-                return -errno;
-
-        if ((st.st_mode & 0777) != mode ||
-            st.st_uid != uid ||
-            st.st_gid != gid ||
-            !S_ISDIR(st.st_mode)) {
-                errno = EEXIST;
-                return -errno;
-        }
-
-        return 0;
-}
-
-
-int mkdir_parents(const char *path, mode_t mode) {
-        const char *p, *e;
-
-        assert(path);
-
-        /* Creates every parent directory in the path except the last
-         * component. */
-
-        p = path + strspn(path, "/");
-        for (;;) {
-                int r;
-                char *t;
-
-                e = p + strcspn(p, "/");
-                p = e + strspn(e, "/");
-
-                /* Is this the last component? If so, then we're
-                 * done */
-                if (*p == 0)
-                        return 0;
-
-                if (!(t = strndup(path, e - path)))
-                        return -ENOMEM;
-
-                r = label_mkdir(t, mode);
-                free(t);
-
-                if (r < 0 && errno != EEXIST)
-                        return -errno;
-        }
-}
-
-int mkdir_p(const char *path, mode_t mode) {
-        int r;
-
-        /* Like mkdir -p */
-
-        if ((r = mkdir_parents(path, mode)) < 0)
-                return r;
-
-        if (label_mkdir(path, mode) < 0 && errno != EEXIST)
-                return -errno;
-
-        return 0;
-}
-
 int rmdir_parents(const char *path, const char *stop) {
         size_t l;
         int r = 0;

src/shared/util.h

@@ -242,9 +242,6 @@ char *delete_chars(char *s, const char *bad);
 char *truncate_nl(char *s);
 
 char *file_in_same_dir(const char *path, const char *filename);
-int safe_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid);
-int mkdir_parents(const char *path, mode_t mode);
-int mkdir_p(const char *path, mode_t mode);
 
 int parent_of_path(const char *path, char **parent);
 

src/shutdown.c

@@ -41,6 +41,7 @@
 #include "log.h"
 #include "umount.h"
 #include "util.h"
+#include "mkdir.h"
 #include "virt.h"
 #include "watchdog.h"
 

src/socket.c

@@ -36,6 +36,7 @@
 #include "load-dropin.h"
 #include "load-fragment.h"
 #include "strv.h"
+#include "mkdir.h"
 #include "unit-name.h"
 #include "dbus-socket.h"
 #include "missing.h"

src/tmpfiles.c

@@ -41,6 +41,7 @@
 
 #include "log.h"
 #include "util.h"
+#include "mkdir.h"
 #include "strv.h"
 #include "label.h"
 #include "set.h"

src/tty-ask-password-agent.c

@@ -33,6 +33,7 @@
 #include <fcntl.h>
 
 #include "util.h"
+#include "mkdir.h"
 #include "conf-parser.h"
 #include "utmp-wtmp.h"
 #include "socket-util.h"