tmpfiles: move exclamation mark into right place

[elogind.git] / src / tmpfiles / tmpfiles.c

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index ed51ec8a7f8dd8fc719045625b701f12a212e6d1..7da94ed57b80dc5a1650184e10663f8daf8de24e 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -42,6 +42,7 @@
 
 #include "log.h"
 #include "util.h"
 
 #include "log.h"
 #include "util.h"

+#include "macro.h"

 #include "mkdir.h"
 #include "path-util.h"
 #include "strv.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "strv.h"


@@ -69,6 +70,7 @@ typedef enum ItemType {
 
         /* These ones take globs */
         IGNORE_PATH = 'x',
 
         /* These ones take globs */
         IGNORE_PATH = 'x',

+        IGNORE_DIRECTORY_PATH = 'X',

         REMOVE_PATH = 'r',
         RECURSIVE_REMOVE_PATH = 'R',
         RELABEL_PATH = 'z',
         REMOVE_PATH = 'r',
         RECURSIVE_REMOVE_PATH = 'R',
         RELABEL_PATH = 'z',


@@ -104,21 +106,20 @@ static bool arg_remove = false;
 
 static const char *arg_prefix = NULL;
 
 
 static const char *arg_prefix = NULL;
 

-static const char * const conf_file_dirs[] = {
-        "/etc/tmpfiles.d",
-        "/run/tmpfiles.d",
-        "/usr/local/lib/tmpfiles.d",
-        "/usr/lib/tmpfiles.d",
+static const char conf_file_dirs[] =
+        "/etc/tmpfiles.d\0"
+        "/run/tmpfiles.d\0"
+        "/usr/local/lib/tmpfiles.d\0"
+        "/usr/lib/tmpfiles.d\0"

 #ifdef HAVE_SPLIT_USR
 #ifdef HAVE_SPLIT_USR

-        "/lib/tmpfiles.d",
+        "/lib/tmpfiles.d\0"

 #endif
 #endif

-        NULL
-};
+        ;

 
 #define MAX_DEPTH 256
 
 static bool needs_glob(ItemType t) {
 
 #define MAX_DEPTH 256
 
 static bool needs_glob(ItemType t) {

-        return t == IGNORE_PATH || t == REMOVE_PATH || t == RECURSIVE_REMOVE_PATH || t == RELABEL_PATH || t == RECURSIVE_RELABEL_PATH;
+        return t == IGNORE_PATH || t == IGNORE_DIRECTORY_PATH || t == REMOVE_PATH || t == RECURSIVE_REMOVE_PATH || t == RELABEL_PATH || t == RECURSIVE_RELABEL_PATH;

 }
 
 static struct Item* find_glob(Hashmap *h, const char *match) {
 }
 
 static struct Item* find_glob(Hashmap *h, const char *match) {


@@ -217,6 +218,7 @@ static bool unix_socket_alive(const char *fn) {
 }
 
 static int dir_cleanup(
 }
 
 static int dir_cleanup(

+                Item *i,

                 const char *p,
                 DIR *d,
                 const struct stat *ds,
                 const char *p,
                 DIR *d,
                 const struct stat *ds,


@@ -296,7 +298,7 @@ static int dir_cleanup(
                                         continue;
                                 }
 
                                         continue;
                                 }
 

-                                q = dir_cleanup(sub_path, sub_dir, &s, cutoff, rootdev, false, maxdepth-1, false);
+                                q = dir_cleanup(i, sub_path, sub_dir, &s, cutoff, rootdev, false, maxdepth-1, false);

                                 closedir(sub_dir);
 
                                 if (q < 0)
                                 closedir(sub_dir);
 
                                 if (q < 0)


@@ -319,12 +321,14 @@ static int dir_cleanup(
                         if (age >= cutoff)
                                 continue;
 
                         if (age >= cutoff)
                                 continue;
 

-                        log_debug("rmdir '%s'\n", sub_path);
+                        if (i->type != IGNORE_DIRECTORY_PATH || !streq(dent->d_name, p)) {
+                                log_debug("rmdir '%s'\n", sub_path);

 
 

-                        if (unlinkat(dirfd(d), dent->d_name, AT_REMOVEDIR) < 0) {
-                                if (errno != ENOENT && errno != ENOTEMPTY) {
-                                        log_error("rmdir(%s): %m", sub_path);
-                                        r = -errno;
+                                if (unlinkat(dirfd(d), dent->d_name, AT_REMOVEDIR) < 0) {
+                                        if (errno != ENOENT && errno != ENOTEMPTY) {
+                                                log_error("rmdir(%s): %m", sub_path);
+                                                r = -errno;
+                                        }

                                 }
                         }
 
                                 }
                         }
 


@@ -394,68 +398,6 @@ finish:
         return r;
 }
 
         return r;
 }
 

-static int clean_item(Item *i) {
-        DIR *d;
-        struct stat s, ps;
-        bool mountpoint;
-        int r;
-        usec_t cutoff, n;
-
-        assert(i);
-
-        if (i->type != CREATE_DIRECTORY &&
-            i->type != TRUNCATE_DIRECTORY &&
-            i->type != IGNORE_PATH)
-                return 0;
-
-        if (!i->age_set || i->age <= 0)
-                return 0;
-
-        n = now(CLOCK_REALTIME);
-        if (n < i->age)
-                return 0;
-
-        cutoff = n - i->age;
-
-        d = opendir(i->path);
-        if (!d) {
-                if (errno == ENOENT)
-                        return 0;
-
-                log_error("Failed to open directory %s: %m", i->path);
-                return -errno;
-        }
-
-        if (fstat(dirfd(d), &s) < 0) {
-                log_error("stat(%s) failed: %m", i->path);
-                r = -errno;
-                goto finish;
-        }
-
-        if (!S_ISDIR(s.st_mode)) {
-                log_error("%s is not a directory.", i->path);
-                r = -ENOTDIR;
-                goto finish;
-        }
-
-        if (fstatat(dirfd(d), "..", &ps, AT_SYMLINK_NOFOLLOW) != 0) {
-                log_error("stat(%s/..) failed: %m", i->path);
-                r = -errno;
-                goto finish;
-        }
-
-        mountpoint = s.st_dev != ps.st_dev ||
-                     (s.st_dev == ps.st_dev && s.st_ino == ps.st_ino);
-
-        r = dir_cleanup(i->path, d, &s, cutoff, s.st_dev, mountpoint, MAX_DEPTH, i->keep_first_level);
-
-finish:
-        if (d)
-                closedir(d);
-
-        return r;
-}
-

 static int item_set_perms(Item *i, const char *path) {
         /* not using i->path directly because it may be a glob */
         if (i->mode_set)
 static int item_set_perms(Item *i, const char *path) {
         /* not using i->path directly because it may be a glob */
         if (i->mode_set)


@@ -503,24 +445,17 @@ static int write_one_file(Item *i, const char *path) {
         if (i->argument) {
                 ssize_t n;
                 size_t l;
         if (i->argument) {
                 ssize_t n;
                 size_t l;

-                struct iovec iovec[2];
-                static const char new_line = '\n';
+                _cleanup_free_ char *unescaped;

 
 

-                l = strlen(i->argument);
-
-                zero(iovec);
-                iovec[0].iov_base = i->argument;
-                iovec[0].iov_len = l;
-
-                iovec[1].iov_base = (void*) &new_line;
-                iovec[1].iov_len = 1;
+                unescaped = cunescape(i->argument);
+                if (unescaped == NULL) {
+                        close_nointr_nofail(fd);
+                        return log_oom();
+                }

 
 

-                n = writev(fd, iovec, 2);
+                l = strlen(unescaped);
+                n = write(fd, unescaped, l);

 
 

-                /* It's OK if we don't write the trailing
-                 * newline, hence we check for l, instead of
-                 * l+1 here. Files in /sys often refuse
-                 * writing of the trailing newline. */

                 if (n < 0 || (size_t) n < l) {
                         log_error("Failed to write file %s: %s", path, n < 0 ? strerror(-n) : "Short write");
                         close_nointr_nofail(fd);
                 if (n < 0 || (size_t) n < l) {
                         log_error("Failed to write file %s: %s", path, n < 0 ? strerror(-n) : "Short write");
                         close_nointr_nofail(fd);


@@ -559,12 +494,13 @@ static int recursive_relabel_children(Item *i, const char *path) {
                 return errno == ENOENT ? 0 : -errno;
 
         for (;;) {
                 return errno == ENOENT ? 0 : -errno;
 
         for (;;) {

-                struct dirent buf, *de;
+                struct dirent *de;
+                union dirent_storage buf;

                 bool is_dir;
                 int r;
                 char *entry_path;
 
                 bool is_dir;
                 int r;
                 char *entry_path;
 

-                r = readdir_r(d, &buf, &de);
+                r = readdir_r(d, &buf.de, &de);

                 if (r != 0) {
                         if (ret == 0)
                                 ret = -r;
                 if (r != 0) {
                         if (ret == 0)
                                 ret = -r;


@@ -674,12 +610,17 @@ static int create_item(Item *i) {
         switch (i->type) {
 
         case IGNORE_PATH:
         switch (i->type) {
 
         case IGNORE_PATH:

+        case IGNORE_DIRECTORY_PATH:

         case REMOVE_PATH:
         case RECURSIVE_REMOVE_PATH:
                 return 0;
 
         case CREATE_FILE:
         case TRUNCATE_FILE:
         case REMOVE_PATH:
         case RECURSIVE_REMOVE_PATH:
                 return 0;
 
         case CREATE_FILE:
         case TRUNCATE_FILE:

+                r = write_one_file(i, i->path);
+                if (r < 0)
+                        return r;
+                break;

         case WRITE_FILE:
                 r = glob_item(i, write_one_file);
                 if (r < 0)
         case WRITE_FILE:
                 r = glob_item(i, write_one_file);
                 if (r < 0)


@@ -853,6 +794,7 @@ static int remove_item_instance(Item *i, const char *instance) {
         case CREATE_BLOCK_DEVICE:
         case CREATE_CHAR_DEVICE:
         case IGNORE_PATH:
         case CREATE_BLOCK_DEVICE:
         case CREATE_CHAR_DEVICE:
         case IGNORE_PATH:

+        case IGNORE_DIRECTORY_PATH:

         case RELABEL_PATH:
         case RECURSIVE_RELABEL_PATH:
         case WRITE_FILE:
         case RELABEL_PATH:
         case RECURSIVE_RELABEL_PATH:
         case WRITE_FILE:


@@ -897,6 +839,7 @@ static int remove_item(Item *i) {
         case CREATE_CHAR_DEVICE:
         case CREATE_BLOCK_DEVICE:
         case IGNORE_PATH:
         case CREATE_CHAR_DEVICE:
         case CREATE_BLOCK_DEVICE:
         case IGNORE_PATH:

+        case IGNORE_DIRECTORY_PATH:

         case RELABEL_PATH:
         case RECURSIVE_RELABEL_PATH:
         case WRITE_FILE:
         case RELABEL_PATH:
         case RECURSIVE_RELABEL_PATH:
         case WRITE_FILE:


@@ -912,6 +855,84 @@ static int remove_item(Item *i) {
         return r;
 }
 
         return r;
 }
 

+static int clean_item_instance(Item *i, const char* instance) {
+        DIR *d;
+        struct stat s, ps;
+        bool mountpoint;
+        int r;
+        usec_t cutoff, n;
+
+        assert(i);
+
+        if (!i->age_set)
+                return 0;
+
+        n = now(CLOCK_REALTIME);
+        if (n < i->age)
+                return 0;
+
+        cutoff = n - i->age;
+
+        d = opendir(instance);
+        if (!d) {
+                if (errno == ENOENT || errno == ENOTDIR)
+                        return 0;
+
+                log_error("Failed to open directory %s: %m", i->path);
+                return -errno;
+        }
+
+        if (fstat(dirfd(d), &s) < 0) {
+                log_error("stat(%s) failed: %m", i->path);
+                r = -errno;
+                goto finish;
+        }
+
+        if (!S_ISDIR(s.st_mode)) {
+                log_error("%s is not a directory.", i->path);
+                r = -ENOTDIR;
+                goto finish;
+        }
+
+        if (fstatat(dirfd(d), "..", &ps, AT_SYMLINK_NOFOLLOW) != 0) {
+                log_error("stat(%s/..) failed: %m", i->path);
+                r = -errno;
+                goto finish;
+        }
+
+        mountpoint = s.st_dev != ps.st_dev ||
+                     (s.st_dev == ps.st_dev && s.st_ino == ps.st_ino);
+
+        r = dir_cleanup(i, instance, d, &s, cutoff, s.st_dev, mountpoint, MAX_DEPTH, i->keep_first_level);
+
+finish:
+        if (d)
+                closedir(d);
+
+        return r;
+}
+
+static int clean_item(Item *i) {
+        int r = 0;
+
+        assert(i);
+
+        switch (i->type) {
+        case CREATE_DIRECTORY:
+        case TRUNCATE_DIRECTORY:
+        case IGNORE_PATH:
+                clean_item_instance(i, i->path);
+                break;
+        case IGNORE_DIRECTORY_PATH:
+                r = glob_item(i, clean_item_instance);
+                break;
+        default:
+                break;
+        }
+
+        return r;
+}
+

 static int process_item(Item *i) {
         int r, q, p;
 
 static int process_item(Item *i) {
         int r, q, p;
 


@@ -1031,6 +1052,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
         case TRUNCATE_DIRECTORY:
         case CREATE_FIFO:
         case IGNORE_PATH:
         case TRUNCATE_DIRECTORY:
         case CREATE_FIFO:
         case IGNORE_PATH:

+        case IGNORE_DIRECTORY_PATH:

         case REMOVE_PATH:
         case RECURSIVE_REMOVE_PATH:
         case RELABEL_PATH:
         case REMOVE_PATH:
         case RECURSIVE_REMOVE_PATH:
         case RELABEL_PATH:


@@ -1266,18 +1288,19 @@ static int parse_argv(int argc, char *argv[]) {
 static int read_config_file(const char *fn, bool ignore_enoent) {
         FILE *f;
         unsigned v = 0;
 static int read_config_file(const char *fn, bool ignore_enoent) {
         FILE *f;
         unsigned v = 0;

-        int r = 0;
+        int r;
+        Iterator iterator;
+        Item *i;

 
         assert(fn);
 
 
         assert(fn);
 

-        f = fopen(fn, "re");
-        if (!f) {
-
-                if (ignore_enoent && errno == ENOENT)
+        r = search_and_fopen_nulstr(fn, "re", conf_file_dirs, &f);
+        if (r < 0) {
+                if (ignore_enoent && r == -ENOENT)

                         return 0;
 
                         return 0;
 

-                log_error("Failed to open %s: %m", fn);
-                return -errno;
+                log_error("Failed to open '%s', ignoring: %s", fn, strerror(-r));
+                return r;

         }
 
         log_debug("apply: %s\n", fn);
         }
 
         log_debug("apply: %s\n", fn);


@@ -1299,43 +1322,47 @@ static int read_config_file(const char *fn, bool ignore_enoent) {
                                 r = k;
         }
 
                                 r = k;
         }
 

-        if (ferror(f)) {
-                log_error("Failed to read from file %s: %m", fn);
-                if (r == 0)
-                        r = -EIO;
-        }
-
-        fclose(f);
+        /* we have to determine age parameter for each entry of type X */
+        HASHMAP_FOREACH(i, globs, iterator) {
+                Iterator iter;
+                Item *j, *candidate_item = NULL;

 
 

-        return r;
-}
+                if (i->type != IGNORE_DIRECTORY_PATH)
+                        continue;

 
 

-static char *resolve_fragment(const char *fragment, const char **search_paths) {
-        const char **p;
-        char *resolved_path;
+                HASHMAP_FOREACH(j, items, iter) {
+                        if (j->type != CREATE_DIRECTORY && j->type != TRUNCATE_DIRECTORY)
+                                continue;

 
 

-        if (is_path(fragment))
-                return strdup(fragment);
+                        if (path_equal(j->path, i->path)) {
+                                candidate_item = j;
+                                break;
+                        }

 
 

-        STRV_FOREACH(p, search_paths) {
-                resolved_path = strjoin(*p, "/", fragment, NULL);
-                if (resolved_path == NULL) {
-                        log_oom();
-                        return NULL;
+                        if ((!candidate_item && path_startswith(i->path, j->path)) ||
+                            (candidate_item && path_startswith(j->path, candidate_item->path) && (fnmatch(i->path, j->path, FNM_PATHNAME | FNM_PERIOD) == 0)))
+                                candidate_item = j;

                 }
 
                 }
 

-                if (access(resolved_path, F_OK) == 0)
-                        return resolved_path;
+                if (candidate_item) {
+                        i->age = candidate_item->age;
+                        i->age_set = true;
+                }
+        }

 
 

-                free(resolved_path);
+        if (ferror(f)) {
+                log_error("Failed to read from file %s: %m", fn);
+                if (r == 0)
+                        r = -EIO;

         }
 
         }
 

-        errno = ENOENT;
-        return NULL;
+        fclose(f);
+
+        return r;

 }
 
 int main(int argc, char *argv[]) {
 }
 
 int main(int argc, char *argv[]) {

-        int r;
+        int r, k;

         Item *i;
         Iterator iterator;
 
         Item *i;
         Iterator iterator;
 


@@ -1355,47 +1382,36 @@ int main(int argc, char *argv[]) {
         globs = hashmap_new(string_hash_func, string_compare_func);
 
         if (!items || !globs) {
         globs = hashmap_new(string_hash_func, string_compare_func);
 
         if (!items || !globs) {

-                log_oom();
-                r = EXIT_FAILURE;
+                r = log_oom();

                 goto finish;
         }
 
                 goto finish;
         }
 

-        r = EXIT_SUCCESS;
+        r = 0;

 
         if (optind < argc) {
                 int j;
 
                 for (j = optind; j < argc; j++) {
 
         if (optind < argc) {
                 int j;
 
                 for (j = optind; j < argc; j++) {

-                        char *fragment;
-
-                        fragment = resolve_fragment(argv[j], (const char**) conf_file_dirs);
-                        if (!fragment) {
-                                log_error("Failed to find a %s file: %m", argv[j]);
-                                r = EXIT_FAILURE;
-                                goto finish;
-                        }
-                        if (read_config_file(fragment, false) < 0)
-                                r = EXIT_FAILURE;
-                        free(fragment);
+                        k = read_config_file(argv[j], false);
+                        if (k < 0 && r == 0)
+                                r = k;

                 }
 
         } else {
                 }
 
         } else {

-                char **files, **f;
+                _cleanup_strv_free_ char **files = NULL;
+                char **f;

 
 

-                r = conf_files_list_strv(&files, ".conf",
-                                    (const char **) conf_file_dirs);
+                r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);

                 if (r < 0) {
                         log_error("Failed to enumerate tmpfiles.d files: %s", strerror(-r));
                 if (r < 0) {
                         log_error("Failed to enumerate tmpfiles.d files: %s", strerror(-r));

-                        r = EXIT_FAILURE;

                         goto finish;
                 }
 
                 STRV_FOREACH(f, files) {
                         goto finish;
                 }
 
                 STRV_FOREACH(f, files) {

-                        if (read_config_file(*f, true) < 0)
-                                r = EXIT_FAILURE;
+                        k = read_config_file(*f, true);
+                        if (k < 0 && r == 0)
+                                r = k;

                 }
                 }

-
-                strv_free(files);

         }
 
         HASHMAP_FOREACH(i, globs, iterator)
         }
 
         HASHMAP_FOREACH(i, globs, iterator)


@@ -1418,5 +1434,5 @@ finish:
 
         label_finish();
 
 
         label_finish();
 

-        return r;
+        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;

 }
 }