X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftmpfiles.c;h=68af37aab0eb43f27edb0fb3062a0ff08cbebb3d;hp=3dabe4692016112bb7e512a8a9d1bb76f7478b41;hb=b925e72633bf98438f56a140520e07ec8c959e46;hpb=b8bb3e8f346468e61dcc7a6aba5e7ac9c623d964 diff --git a/src/tmpfiles.c b/src/tmpfiles.c index 3dabe4692..68af37aab 100644 --- a/src/tmpfiles.c +++ b/src/tmpfiles.c @@ -80,11 +80,14 @@ typedef struct Item { } Item; static Hashmap *items = NULL, *globs = NULL; +static Set *unix_sockets = NULL; static bool arg_create = false; static bool arg_clean = false; static bool arg_remove = false; +static const char *arg_prefix = NULL; + #define MAX_DEPTH 256 static bool needs_glob(int t) { @@ -102,6 +105,80 @@ static struct Item* find_glob(Hashmap *h, const char *match) { return NULL; } +static void load_unix_sockets(void) { + FILE *f = NULL; + char line[LINE_MAX]; + + if (unix_sockets) + return; + + /* We maintain a cache of the sockets we found in + * /proc/net/unix to speed things up a little. */ + + if (!(unix_sockets = set_new(string_hash_func, string_compare_func))) + return; + + if (!(f = fopen("/proc/net/unix", "re"))) + return; + + if (!(fgets(line, sizeof(line), f))) + goto fail; + + for (;;) { + char *p, *s; + int k; + + if (!(fgets(line, sizeof(line), f))) + break; + + truncate_nl(line); + + if (strlen(line) < 53) + continue; + + p = line + 53; + p += strspn(p, WHITESPACE); + p += strcspn(p, WHITESPACE); + p += strspn(p, WHITESPACE); + + if (*p != '/') + continue; + + if (!(s = strdup(p))) + goto fail; + + path_kill_slashes(s); + + if ((k = set_put(unix_sockets, s)) < 0) { + free(s); + + if (k != -EEXIST) + goto fail; + } + } + + return; + +fail: + set_free_free(unix_sockets); + unix_sockets = NULL; + + if (f) + fclose(f); +} + +static bool unix_socket_alive(const char *fn) { + assert(fn); + + load_unix_sockets(); + + if (unix_sockets) + return !!set_get(unix_sockets, (char*) fn); + + /* We don't know, so assume yes */ + return true; +} + static int dir_cleanup( const char *p, DIR *d, @@ -212,7 +289,7 @@ static int dir_cleanup( if (s.st_mode & S_ISVTX) continue; - if (mountpoint) { + if (mountpoint && S_ISREG(s.st_mode)) { if (streq(dent->d_name, ".journal") && s.st_uid == 0) continue; @@ -222,6 +299,14 @@ static int dir_cleanup( continue; } + /* Ignore sockets that are listed in /proc/net/unix */ + if (S_ISSOCK(s.st_mode) && unix_socket_alive(sub_path)) + continue; + + /* Ignore device nodes */ + if (S_ISCHR(s.st_mode) || S_ISBLK(s.st_mode)) + continue; + age = MAX3(timespec_load(&s.st_mtim), timespec_load(&s.st_atim), timespec_load(&s.st_ctim)); @@ -422,7 +507,7 @@ static int create_item(Item *i) { break; } - if ((r = label_fix(i->path)) < 0) + if ((r = label_fix(i->path, false)) < 0) goto finish; log_debug("%s created successfully.", i->path); @@ -538,7 +623,7 @@ static void item_free(Item *i) { free(i); } -static int parse_line(const char *fname, unsigned line, const char *buffer, const char *prefix) { +static int parse_line(const char *fname, unsigned line, const char *buffer) { Item *i; char *mode = NULL, *user = NULL, *group = NULL, *age = NULL; int r; @@ -590,7 +675,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, cons path_kill_slashes(i->path); - if (prefix && !path_startswith(i->path, prefix)) { + if (arg_prefix && !path_startswith(i->path, arg_prefix)) { r = 0; goto finish; } @@ -690,7 +775,8 @@ static int scandir_filter(const struct dirent *d) { return 0; if (d->d_type != DT_REG && - d->d_type != DT_LNK) + d->d_type != DT_LNK && + d->d_type != DT_UNKNOWN) return 0; return endswith(d->d_name, ".conf"); @@ -698,12 +784,13 @@ static int scandir_filter(const struct dirent *d) { static int help(void) { - printf("%s [OPTIONS...]\n\n" - "Create and clean up temporary directories.\n\n" + printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n" + "Creates, deletes and cleans up volatile and temporary files and directories.\n\n" " -h --help Show this help\n" " --create Create marked files/directories\n" " --clean Clean up marked directories\n" - " --remove Remove marked files/directories\n", + " --remove Remove marked files/directories\n" + " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n", program_invocation_short_name); return 0; @@ -714,7 +801,8 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_CREATE, ARG_CLEAN, - ARG_REMOVE + ARG_REMOVE, + ARG_PREFIX }; static const struct option options[] = { @@ -722,6 +810,7 @@ static int parse_argv(int argc, char *argv[]) { { "create", no_argument, NULL, ARG_CREATE }, { "clean", no_argument, NULL, ARG_CLEAN }, { "remove", no_argument, NULL, ARG_REMOVE }, + { "prefix", required_argument, NULL, ARG_PREFIX }, { NULL, 0, NULL, 0 } }; @@ -750,6 +839,10 @@ static int parse_argv(int argc, char *argv[]) { arg_remove = true; break; + case ARG_PREFIX: + arg_prefix = optarg; + break; + case '?': return -EINVAL; @@ -760,29 +853,67 @@ static int parse_argv(int argc, char *argv[]) { } if (!arg_clean && !arg_create && !arg_remove) { - help(); + log_error("You need to specify at least one of --clean, --create or --remove."); return -EINVAL; } return 1; } +static int read_config_file(const char *fn, bool ignore_enoent) { + FILE *f; + unsigned v = 0; + int r = 0; + + assert(fn); + + if (!(f = fopen(fn, "re"))) { + + if (ignore_enoent && errno == ENOENT) + return 0; + + log_error("Failed to open %s: %m", fn); + return -errno; + } + + for (;;) { + char line[LINE_MAX], *l; + int k; + + if (!(fgets(line, sizeof(line), f))) + break; + + v++; + + l = strstrip(line); + if (*l == '#' || *l == 0) + continue; + + if ((k = parse_line(fn, v, l)) < 0) + if (r == 0) + r = k; + } + + if (ferror(f)) { + log_error("Failed to read from file %s: %m", fn); + if (r == 0) + r = -EIO; + } + + fclose(f); + + return r; +} + int main(int argc, char *argv[]) { - struct dirent **de = NULL; - int r, n, j; - const char *prefix = NULL; + int r; Item *i; Iterator iterator; if ((r = parse_argv(argc, argv)) <= 0) return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; - if (optind < argc) - prefix = argv[optind]; - else - prefix = "/"; - - log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); + log_set_target(LOG_TARGET_AUTO); log_parse_environment(); log_open(); @@ -797,75 +928,51 @@ int main(int argc, char *argv[]) { goto finish; } - if ((n = scandir("/etc/tmpfiles.d/", &de, scandir_filter, alphasort)) < 0) { - - if (errno == ENOENT) - r = EXIT_SUCCESS; - else { - log_error("Failed to enumerate /etc/tmpfiles.d/ files: %m"); - r = EXIT_FAILURE; - } - - goto finish; - } - r = EXIT_SUCCESS; - for (j = 0; j < n; j++) { - int k; - char *fn; - FILE *f; - unsigned v; + if (optind < argc) { + int j; - k = asprintf(&fn, "/etc/tmpfiles.d/%s", de[j]->d_name); - free(de[j]); + for (j = optind; j < argc; j++) + if (read_config_file(argv[j], false) < 0) + r = EXIT_FAILURE; - if (k < 0) { - log_error("Failed to allocate file name."); - r = EXIT_FAILURE; - continue; - } + } else { + int n, j; + struct dirent **de = NULL; - if (!(f = fopen(fn, "re"))) { + if ((n = scandir("/etc/tmpfiles.d/", &de, scandir_filter, alphasort)) < 0) { if (errno != ENOENT) { - log_error("Failed to open %s: %m", fn); + log_error("Failed to enumerate /etc/tmpfiles.d/ files: %m"); r = EXIT_FAILURE; } - free(fn); - continue; + goto finish; } - v = 0; - for (;;) { - char line[LINE_MAX], *l; - - if (!(fgets(line, sizeof(line), f))) - break; + for (j = 0; j < n; j++) { + int k; + char *fn; - v++; + k = asprintf(&fn, "/etc/tmpfiles.d/%s", de[j]->d_name); + free(de[j]); - l = strstrip(line); - if (*l == '#' || *l == 0) + if (k < 0) { + log_error("Failed to allocate file name."); + r = EXIT_FAILURE; continue; + } - if (parse_line(fn, v, l, prefix) < 0) + if (read_config_file(fn, true) < 0) r = EXIT_FAILURE; - } - if (ferror(f)) { - r = EXIT_FAILURE; - log_error("Failed to read from file %s: %m", fn); + free(fn); } - free(fn); - - fclose(f); + free(de); } - free(de); - HASHMAP_FOREACH(i, globs, iterator) if (process_item(i) < 0) r = EXIT_FAILURE; @@ -878,9 +985,14 @@ finish: while ((i = hashmap_steal_first(items))) item_free(i); + while ((i = hashmap_steal_first(globs))) + item_free(i); + hashmap_free(items); hashmap_free(globs); + set_free_free(unix_sockets); + label_finish(); return r;