chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: network - do reference counting on netdevs
[elogind.git]
/
src
/
system-update-generator
/
system-update-generator.c
diff --git
a/src/system-update-generator/system-update-generator.c
b/src/system-update-generator/system-update-generator.c
index 30fdbc3ee8cda3bfb1283493398016b94992a3cd..13b8a0c426393819e2031d110a8a5587559503fe 100644
(file)
--- a/
src/system-update-generator/system-update-generator.c
+++ b/
src/system-update-generator/system-update-generator.c
@@
-36,7
+36,7
@@
static const char *arg_dest = "/tmp";
static int generate_symlink(void) {
struct stat st;
static int generate_symlink(void) {
struct stat st;
- char
*p
;
+ char
_cleanup_free_ *p = NULL
;
if (lstat("/system-update", &st) < 0) {
if (errno == ENOENT)
if (lstat("/system-update", &st) < 0) {
if (errno == ENOENT)
@@
-47,34
+47,29
@@
static int generate_symlink(void) {
}
p = strappend(arg_dest, "/default.target");
}
p = strappend(arg_dest, "/default.target");
- if (!p) {
- log_error("Out of memory.");
- return -ENOMEM;
- }
+ if (!p)
+ return log_oom();
if (symlink(SYSTEM_DATA_UNIT_PATH "/system-update.target", p) < 0) {
if (symlink(SYSTEM_DATA_UNIT_PATH "/system-update.target", p) < 0) {
- free(p);
- log_error("Failed to create symlink: %m");
+ log_error("Failed to create symlink %s: %m", p);
return -errno;
}
return -errno;
}
- free(p);
-
return 0;
}
int main(int argc, char *argv[]) {
int r;
return 0;
}
int main(int argc, char *argv[]) {
int r;
- if (argc >
2
) {
- log_error("This program takes
on
e or no arguments.");
+ if (argc >
1 && argc != 4
) {
+ log_error("This program takes
thre
e or no arguments.");
return EXIT_FAILURE;
}
if (argc > 1)
return EXIT_FAILURE;
}
if (argc > 1)
- arg_dest = argv[
1
];
+ arg_dest = argv[
2
];
- log_set_target(LOG_TARGET_
AUTO
);
+ log_set_target(LOG_TARGET_
SAFE
);
log_parse_environment();
log_open();
log_parse_environment();
log_open();