util-lib: use MODE_INVALID as invalid value for mode_t everywhere
This commit is contained in:
parent
c89f52ac69
commit
ee735086f8
|
@ -311,7 +311,7 @@ int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gi
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
return -errno;
|
return -errno;
|
||||||
|
|
||||||
if (mode > 0) {
|
if (mode != MODE_INVALID) {
|
||||||
r = fchmod(fd, mode);
|
r = fchmod(fd, mode);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return -errno;
|
return -errno;
|
||||||
|
@ -338,7 +338,7 @@ int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gi
|
||||||
}
|
}
|
||||||
|
|
||||||
int touch(const char *path) {
|
int touch(const char *path) {
|
||||||
return touch_file(path, false, USEC_INFINITY, UID_INVALID, GID_INVALID, 0);
|
return touch_file(path, false, USEC_INFINITY, UID_INVALID, GID_INVALID, MODE_INVALID);
|
||||||
}
|
}
|
||||||
|
|
||||||
int symlink_idempotent(const char *from, const char *to) {
|
int symlink_idempotent(const char *from, const char *to) {
|
||||||
|
|
|
@ -519,7 +519,7 @@ static void timer_enter_running(Timer *t) {
|
||||||
dual_timestamp_get(&t->last_trigger);
|
dual_timestamp_get(&t->last_trigger);
|
||||||
|
|
||||||
if (t->stamp_path)
|
if (t->stamp_path)
|
||||||
touch_file(t->stamp_path, true, t->last_trigger.realtime, UID_INVALID, GID_INVALID, 0);
|
touch_file(t->stamp_path, true, t->last_trigger.realtime, UID_INVALID, GID_INVALID, MODE_INVALID);
|
||||||
|
|
||||||
timer_set_state(t, TIMER_RUNNING);
|
timer_set_state(t, TIMER_RUNNING);
|
||||||
return;
|
return;
|
||||||
|
@ -555,7 +555,7 @@ static int timer_start(Unit *u) {
|
||||||
/* The timer has never run before,
|
/* The timer has never run before,
|
||||||
* make sure a stamp file exists.
|
* make sure a stamp file exists.
|
||||||
*/
|
*/
|
||||||
touch_file(t->stamp_path, true, USEC_INFINITY, UID_INVALID, GID_INVALID, 0);
|
touch_file(t->stamp_path, true, USEC_INFINITY, UID_INVALID, GID_INVALID, MODE_INVALID);
|
||||||
}
|
}
|
||||||
|
|
||||||
t->result = TIMER_SUCCESS;
|
t->result = TIMER_SUCCESS;
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "conf-files.h"
|
#include "conf-files.h"
|
||||||
#include "fs-util.h"
|
#include "fs-util.h"
|
||||||
#include "macro.h"
|
#include "macro.h"
|
||||||
|
#include "parse-util.h"
|
||||||
#include "rm-rf.h"
|
#include "rm-rf.h"
|
||||||
#include "string-util.h"
|
#include "string-util.h"
|
||||||
#include "strv.h"
|
#include "strv.h"
|
||||||
|
@ -40,7 +41,7 @@ static void setup_test_dir(char *tmp_dir, const char *files, ...) {
|
||||||
va_start(ap, files);
|
va_start(ap, files);
|
||||||
while (files != NULL) {
|
while (files != NULL) {
|
||||||
_cleanup_free_ char *path = strappend(tmp_dir, files);
|
_cleanup_free_ char *path = strappend(tmp_dir, files);
|
||||||
assert_se(touch_file(path, true, USEC_INFINITY, UID_INVALID, GID_INVALID, 0) == 0);
|
assert_se(touch_file(path, true, USEC_INFINITY, UID_INVALID, GID_INVALID, MODE_INVALID) == 0);
|
||||||
files = va_arg(ap, const char *);
|
files = va_arg(ap, const char *);
|
||||||
}
|
}
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
|
|
Loading…
Reference in New Issue