picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tmpfiles: various modernizations

Browse source
This commit is contained in:
Lennart Poettering 2014-06-10 22:50:46 +02:00
parent 874f1947e3
commit cde684a293
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/tmpfiles/tmpfiles.c
View file

@ -63,7 +63,6 @@ typedef enum ItemType {
/* These ones take file names */ /* These ones take file names */
CREATE_FILE = 'f', CREATE_FILE = 'f',
TRUNCATE_FILE = 'F', TRUNCATE_FILE = 'F',
WRITE_FILE = 'w',
CREATE_DIRECTORY = 'd', CREATE_DIRECTORY = 'd',
TRUNCATE_DIRECTORY = 'D', TRUNCATE_DIRECTORY = 'D',
CREATE_FIFO = 'p', CREATE_FIFO = 'p',
@ -73,6 +72,7 @@ typedef enum ItemType {
ADJUST_MODE = 'm', ADJUST_MODE = 'm',
/* These ones take globs */ /* These ones take globs */
WRITE_FILE = 'w',
IGNORE_PATH = 'x', IGNORE_PATH = 'x',
IGNORE_DIRECTORY_PATH = 'X', IGNORE_DIRECTORY_PATH = 'X',
REMOVE_PATH = 'r', REMOVE_PATH = 'r',
@ -126,7 +126,14 @@ static const char conf_file_dirs[] =
#define MAX_DEPTH 256 #define MAX_DEPTH 256
static bool needs_glob(ItemType t) { static bool needs_glob(ItemType t) {
return t == IGNORE_PATH || t == IGNORE_DIRECTORY_PATH || t == REMOVE_PATH || t == RECURSIVE_REMOVE_PATH || t == RELABEL_PATH || t == RECURSIVE_RELABEL_PATH; return IN_SET(t,
WRITE_FILE,
IGNORE_PATH,
IGNORE_DIRECTORY_PATH,
REMOVE_PATH,
RECURSIVE_REMOVE_PATH,
RELABEL_PATH,
RECURSIVE_RELABEL_PATH);
} }
static struct Item* find_glob(Hashmap *h, const char *match) { static struct Item* find_glob(Hashmap *h, const char *match) {
@ -217,7 +224,11 @@ static bool unix_socket_alive(const char *fn) {
} }
static int dir_is_mount_point(DIR *d, const char *subdir) { static int dir_is_mount_point(DIR *d, const char *subdir) {
union file_handle_union h = { .handle.handle_bytes = MAX_HANDLE_SZ };
union file_handle_union h = {
.handle.handle_bytes = MAX_HANDLE_SZ
};
int mount_id_parent, mount_id; int mount_id_parent, mount_id;
int r_p, r; int r_p, r;
@ -301,7 +312,8 @@ static int dir_cleanup(
if (s.st_uid == 0 && !(s.st_mode & S_IWUSR)) if (s.st_uid == 0 && !(s.st_mode & S_IWUSR))
continue; continue;
if (asprintf(&sub_path, "%s/%s", p, dent->d_name) < 0) { sub_path = strjoin(p, "/", dent->d_name, NULL);
if (!sub_path) {
r = log_oom(); r = log_oom();
goto finish; goto finish;
} }
@ -327,7 +339,7 @@ static int dir_cleanup(
int q; int q;
sub_dir = xopendirat(dirfd(d), dent->d_name, O_NOFOLLOW|O_NOATIME); sub_dir = xopendirat(dirfd(d), dent->d_name, O_NOFOLLOW|O_NOATIME);
if (sub_dir == NULL) { if (!sub_dir) {
if (errno != ENOENT) { if (errno != ENOENT) {
log_error("opendir(%s/%s) failed: %m", p, dent->d_name); log_error("opendir(%s/%s) failed: %m", p, dent->d_name);
r = -errno; r = -errno;
@ -337,7 +349,6 @@ static int dir_cleanup(
} }
q = dir_cleanup(i, 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);
if (q < 0) if (q < 0)
r = q; r = q;
} }
@ -434,6 +445,9 @@ finish:
} }
static int item_set_perms_full(Item *i, const char *path, bool ignore_enoent) { static int item_set_perms_full(Item *i, const char *path, bool ignore_enoent) {
assert(i);
assert(path);
/* not using i->path directly because it may be a glob */ /* not using i->path directly because it may be a glob */
if (i->mode_set) if (i->mode_set)
if (chmod(path, i->mode) < 0) { if (chmod(path, i->mode) < 0) {
@ -488,9 +502,9 @@ static int write_one_file(Item *i, const char *path) {
} }
if (i->argument) { if (i->argument) {
_cleanup_free_ char *unescaped;
ssize_t n; ssize_t n;
size_t l; size_t l;
_cleanup_free_ char *unescaped;
unescaped = cunescape(i->argument); unescaped = cunescape(i->argument);
if (unescaped == NULL) { if (unescaped == NULL) {
@ -992,7 +1006,6 @@ static void item_free(Item *i) {
} }
DEFINE_TRIVIAL_CLEANUP_FUNC(Item*, item_free); DEFINE_TRIVIAL_CLEANUP_FUNC(Item*, item_free);
#define _cleanup_item_free_ _cleanup_(item_freep)
static bool item_equal(Item *a, Item *b) { static bool item_equal(Item *a, Item *b) {
assert(a); assert(a);
@ -1063,10 +1076,9 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
{} {}
}; };
_cleanup_item_free_ Item *i = NULL; _cleanup_free_ char *action = NULL, *mode = NULL, *user = NULL, *group = NULL, *age = NULL, *path = NULL;
_cleanup_(item_freep) Item *i = NULL;
Item *existing; Item *existing;
_cleanup_free_ char
*action = NULL, *mode = NULL, *user = NULL, *group = NULL, *age = NULL, *path = NULL;
char type; char type;
Hashmap *h; Hashmap *h;
int r, n = -1; int r, n = -1;
@ -1137,6 +1149,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
log_error("[%s:%u] Symlink file requires argument.", fname, line); log_error("[%s:%u] Symlink file requires argument.", fname, line);
return -EBADMSG; return -EBADMSG;
} }
break; break;
case WRITE_FILE: case WRITE_FILE:
@ -1182,7 +1195,9 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
return 0; return 0;
if (arg_root) { if (arg_root) {
char *p = strappend(arg_root, i->path); char *p;
p = strappend(arg_root, i->path);
if (!p) if (!p)
return log_oom(); return log_oom();