chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: replace close_nointr_nofail() by a more useful safe_close()
[elogind.git]
/
src
/
tmpfiles
/
tmpfiles.c
diff --git
a/src/tmpfiles/tmpfiles.c
b/src/tmpfiles/tmpfiles.c
index 74a01271e9ed3777ebfc9e9a8010cf32735c1177..33e7cbc05d2dcab940690102c0740d2dd9502d52 100644
(file)
--- a/
src/tmpfiles/tmpfiles.c
+++ b/
src/tmpfiles/tmpfiles.c
@@
-496,7
+496,7
@@
static int write_one_file(Item *i, const char *path) {
unescaped = cunescape(i->argument);
if (unescaped == NULL) {
unescaped = cunescape(i->argument);
if (unescaped == NULL) {
-
close_nointr_nofail
(fd);
+
safe_close
(fd);
return log_oom();
}
return log_oom();
}
@@
-505,12
+505,12
@@
static int write_one_file(Item *i, const char *path) {
if (n < 0 || (size_t) n < l) {
log_error("Failed to write file %s: %s", path, n < 0 ? strerror(-n) : "Short write");
if (n < 0 || (size_t) n < l) {
log_error("Failed to write file %s: %s", path, n < 0 ? strerror(-n) : "Short write");
-
close_nointr_nofail
(fd);
+
safe_close
(fd);
return n < 0 ? n : -EIO;
}
}
return n < 0 ? n : -EIO;
}
}
-
close_nointr_nofail
(fd);
+
safe_close
(fd);
if (stat(path, &st) < 0) {
log_error("stat(%s) failed: %m", path);
if (stat(path, &st) < 0) {
log_error("stat(%s) failed: %m", path);