chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: add root argument to search_and_fopen
[elogind.git]
/
src
/
tmpfiles
/
tmpfiles.c
diff --git
a/src/tmpfiles/tmpfiles.c
b/src/tmpfiles/tmpfiles.c
index bff95271f526e5ab160c94f69834b4914a5c2e63..36842898ab3240051bea8c461d05187d7778bfcf 100644
(file)
--- a/
src/tmpfiles/tmpfiles.c
+++ b/
src/tmpfiles/tmpfiles.c
@@
-731,7
+731,7
@@
static int create_item(Item *i) {
break;
case CREATE_SYMLINK: {
break;
case CREATE_SYMLINK: {
-
char *x
;
+
_cleanup_free_ char *x = NULL
;
label_context_set(i->path, S_IFLNK);
r = symlink(i->argument, i->path);
label_context_set(i->path, S_IFLNK);
r = symlink(i->argument, i->path);
@@
-751,12
+751,10
@@
static int create_item(Item *i) {
}
if (!streq(i->argument, x)) {
}
if (!streq(i->argument, x)) {
- free(x);
log_error("%s is not the right symlinks.", i->path);
return -EEXIST;
}
log_error("%s is not the right symlinks.", i->path);
return -EEXIST;
}
- free(x);
break;
}
break;
}
@@
-1343,12
+1341,12
@@
static int parse_argv(int argc, char *argv[]) {
break;
case ARG_PREFIX:
break;
case ARG_PREFIX:
- if (strv_
extend
(&include_prefixes, optarg) < 0)
+ if (strv_
push
(&include_prefixes, optarg) < 0)
return log_oom();
break;
case ARG_EXCLUDE_PREFIX:
return log_oom();
break;
case ARG_EXCLUDE_PREFIX:
- if (strv_
extend
(&exclude_prefixes, optarg) < 0)
+ if (strv_
push
(&exclude_prefixes, optarg) < 0)
return log_oom();
break;
return log_oom();
break;
@@
-1378,7
+1376,7
@@
static int read_config_file(const char *fn, bool ignore_enoent) {
assert(fn);
assert(fn);
- r = search_and_fopen_nulstr(fn, "re", conf_file_dirs, &f);
+ r = search_and_fopen_nulstr(fn, "re",
NULL,
conf_file_dirs, &f);
if (r < 0) {
if (ignore_enoent && r == -ENOENT)
return 0;
if (r < 0) {
if (ignore_enoent && r == -ENOENT)
return 0;
@@
-1508,7
+1506,8
@@
finish:
hashmap_free(items);
hashmap_free(globs);
hashmap_free(items);
hashmap_free(globs);
- strv_free(include_prefixes);
+ free(include_prefixes);
+ free(exclude_prefixes);
set_free_free(unix_sockets);
set_free_free(unix_sockets);