X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftmpfiles%2Ftmpfiles.c;h=b93d8988fc8573bc4befaf5c60ade7f94b54335e;hb=dec49d88d6a4febc8be0a4470183d9794b3b02b8;hp=96adbff42e9dcab8613e1a957add1074cef6c199;hpb=7850b3b83791ba0e2377ba40383c5abc258b839d;p=elogind.git diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 96adbff42..b93d8988f 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -106,16 +106,15 @@ static bool arg_remove = false; 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 - "/lib/tmpfiles.d", + "/lib/tmpfiles.d\0" #endif - NULL -}; + ; #define MAX_DEPTH 256 @@ -135,7 +134,7 @@ static struct Item* find_glob(Hashmap *h, const char *match) { } static void load_unix_sockets(void) { - FILE *f = NULL; + FILE _cleanup_fclose_ *f = NULL; char line[LINE_MAX]; if (unix_sockets) @@ -195,15 +194,11 @@ static void load_unix_sockets(void) { } } - fclose(f); return; fail: set_free_free(unix_sockets); unix_sockets = NULL; - - if (f) - fclose(f); } static bool unix_socket_alive(const char *fn) { @@ -232,12 +227,12 @@ static int dir_cleanup( struct dirent *dent; struct timespec times[2]; bool deleted = false; - char *sub_path = NULL; int r = 0; while ((dent = readdir(d))) { struct stat s; usec_t age; + char _cleanup_free_ *sub_path = NULL; if (streq(dent->d_name, ".") || streq(dent->d_name, "..")) @@ -261,9 +256,6 @@ static int dir_cleanup( if (s.st_uid == 0 && !(s.st_mode & S_IWUSR)) continue; - free(sub_path); - sub_path = NULL; - if (asprintf(&sub_path, "%s/%s", p, dent->d_name) < 0) { r = log_oom(); goto finish; @@ -286,7 +278,7 @@ static int dir_cleanup( if (maxdepth <= 0) log_warning("Reached max depth on %s.", sub_path); else { - DIR *sub_dir; + DIR _cleanup_closedir_ *sub_dir; int q; sub_dir = xopendirat(dirfd(d), dent->d_name, O_NOFOLLOW|O_NOATIME); @@ -300,7 +292,6 @@ static int dir_cleanup( } q = dir_cleanup(i, sub_path, sub_dir, &s, cutoff, rootdev, false, maxdepth-1, false); - closedir(sub_dir); if (q < 0) r = q; @@ -322,7 +313,7 @@ static int dir_cleanup( if (age >= cutoff) continue; - if (!i->type == IGNORE_DIRECTORY_PATH || !streq(dent->d_name, p)) { + 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) { @@ -394,8 +385,6 @@ finish: log_error("utimensat(%s): %m", p); } - free(sub_path); - return r; } @@ -484,7 +473,7 @@ static int write_one_file(Item *i, const char *path) { } static int recursive_relabel_children(Item *i, const char *path) { - DIR *d; + DIR _cleanup_closedir_ *d; int ret = 0; /* This returns the first error we run into, but nevertheless @@ -499,7 +488,7 @@ static int recursive_relabel_children(Item *i, const char *path) { union dirent_storage buf; bool is_dir; int r; - char *entry_path; + char _cleanup_free_ *entry_path = NULL; r = readdir_r(d, &buf.de, &de); if (r != 0) { @@ -526,7 +515,6 @@ static int recursive_relabel_children(Item *i, const char *path) { if (lstat(entry_path, &st) < 0) { if (ret == 0 && errno != ENOENT) ret = -errno; - free(entry_path); continue; } @@ -539,7 +527,6 @@ static int recursive_relabel_children(Item *i, const char *path) { if (r < 0) { if (ret == 0 && r != -ENOENT) ret = r; - free(entry_path); continue; } @@ -548,12 +535,8 @@ static int recursive_relabel_children(Item *i, const char *path) { if (r < 0 && ret == 0) ret = r; } - - free(entry_path); } - closedir(d); - return ret; } @@ -857,7 +840,7 @@ static int remove_item(Item *i) { } static int clean_item_instance(Item *i, const char* instance) { - DIR *d; + DIR _cleanup_closedir_ *d = NULL; struct stat s, ps; bool mountpoint; int r; @@ -885,31 +868,24 @@ static int clean_item_instance(Item *i, const char* instance) { if (fstat(dirfd(d), &s) < 0) { log_error("stat(%s) failed: %m", i->path); - r = -errno; - goto finish; + return -errno; } if (!S_ISDIR(s.st_mode)) { log_error("%s is not a directory.", i->path); - r = -ENOTDIR; - goto finish; + return -ENOTDIR; } if (fstatat(dirfd(d), "..", &ps, AT_SYMLINK_NOFOLLOW) != 0) { log_error("stat(%s/..) failed: %m", i->path); - r = -errno; - goto finish; + return -errno; } 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); - + r = dir_cleanup(i, instance, d, &s, cutoff, s.st_dev, mountpoint, + MAX_DEPTH, i->keep_first_level); return r; } @@ -1003,7 +979,8 @@ static bool item_equal(Item *a, Item *b) { static int parse_line(const char *fname, unsigned line, const char *buffer) { Item *i, *existing; - char *mode = NULL, *user = NULL, *group = NULL, *age = NULL; + char _cleanup_free_ + *mode = NULL, *user = NULL, *group = NULL, *age = NULL; char type; Hashmap *h; int r, n = -1; @@ -1016,21 +993,16 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { if (!i) return log_oom(); - if (sscanf(buffer, - "%c " - "%ms " - "%ms " - "%ms " - "%ms " - "%ms " - "%n", + r = sscanf(buffer, + "%c %ms %ms %ms %ms %ms %n", &type, &i->path, &mode, &user, &group, &age, - &n) < 2) { + &n); + if (r < 2) { log_error("[%s:%u] Syntax error.", fname, line); r = -EIO; goto finish; @@ -1197,11 +1169,6 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { r = 0; finish: - free(user); - free(group); - free(mode); - free(age); - if (i) item_free(i); @@ -1289,20 +1256,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; - int r = 0; + int r; Iterator iterator; Item *i; 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; - 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); @@ -1363,32 +1329,8 @@ static int read_config_file(const char *fn, bool ignore_enoent) { return r; } -static char *resolve_fragment(const char *fragment, const char **search_paths) { - const char **p; - char *resolved_path; - - if (is_path(fragment)) - return strdup(fragment); - - STRV_FOREACH(p, search_paths) { - resolved_path = strjoin(*p, "/", fragment, NULL); - if (resolved_path == NULL) { - log_oom(); - return NULL; - } - - if (access(resolved_path, F_OK) == 0) - return resolved_path; - - free(resolved_path); - } - - errno = ENOENT; - return NULL; -} - int main(int argc, char *argv[]) { - int r; + int r, k; Item *i; Iterator iterator; @@ -1408,46 +1350,36 @@ int main(int argc, char *argv[]) { globs = hashmap_new(string_hash_func, string_compare_func); if (!items || !globs) { - log_oom(); - r = EXIT_FAILURE; + r = log_oom(); goto finish; } - r = EXIT_SUCCESS; + r = 0; 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 { - char **files, **f; + _cleanup_strv_free_ char **files = NULL; + char **f; - r = conf_files_list_strv(&files, ".conf", NULL, (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)); - r = EXIT_FAILURE; 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) @@ -1470,5 +1402,5 @@ finish: label_finish(); - return r; + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }