summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-12 23:07:17 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-12 23:07:34 +0200
commit753615e85d990077c303ae4a42a53e792ffb12ca (patch)
treebc8f01b2b57b8d97355332e47115435d217fb696
parent034753ac13a9d4b308eee1e8d7c3285f6646c0d8 (diff)
tmpfiles: minor modernizations
-rw-r--r--src/tmpfiles/tmpfiles.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index bb12dd0b5a..f515fe8c0c 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1021,7 +1021,9 @@ static int process_item(Item *i) {
}
static void item_free(Item *i) {
- assert(i);
+
+ if (!i)
+ return;
free(i->path);
free(i->argument);
@@ -1150,7 +1152,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
}
}
- switch(type) {
+ switch (type) {
case CREATE_FILE:
case TRUNCATE_FILE:
@@ -1214,7 +1216,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
}
default:
- log_error("[%s:%u] Unknown file type '%c'.", fname, line, type);
+ log_error("[%s:%u] Unknown command type '%c'.", fname, line, type);
return -EBADMSG;
}
@@ -1413,9 +1415,11 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_ROOT:
+ free(arg_root);
arg_root = path_make_absolute_cwd(optarg);
if (!arg_root)
return log_oom();
+
path_kill_slashes(arg_root);
break;
@@ -1513,7 +1517,7 @@ int main(int argc, char *argv[]) {
r = parse_argv(argc, argv);
if (r <= 0)
- return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+ goto finish;
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();