chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journalctl: add new switch -b to show data from current boot only
[elogind.git]
/
src
/
udev
/
udev-rules.c
diff --git
a/src/udev/udev-rules.c
b/src/udev/udev-rules.c
index 45a611474de6cf03da7b51d7a8a4ca9a182ab8d5..b5b54dd0431d5e021ef1cabac629869eb7203d4a 100644
(file)
--- a/
src/udev/udev-rules.c
+++ b/
src/udev/udev-rules.c
@@
-31,6
+31,7
@@
#include <time.h>
#include "udev.h"
#include <time.h>
#include "udev.h"
+#include "path-util.h"
#include "conf-files.h"
#define PREALLOC_TOKEN 2048
#include "conf-files.h"
#define PREALLOC_TOKEN 2048
@@
-1764,7
+1765,7
@@
struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
log_error("failed to build config directory array");
return NULL;
}
log_error("failed to build config directory array");
return NULL;
}
- if (!
strv_path
_canonicalize(rules->dirs)) {
+ if (!
path_strv
_canonicalize(rules->dirs)) {
log_error("failed to canonicalize config directories\n");
return NULL;
}
log_error("failed to canonicalize config directories\n");
return NULL;
}
@@
-1857,6
+1858,9
@@
bool udev_rules_check_timestamp(struct udev_rules *rules)
unsigned int i;
bool changed = false;
unsigned int i;
bool changed = false;
+ if (rules == NULL)
+ goto out;
+
for (i = 0; rules->dirs[i]; i++) {
struct stat stats;
for (i = 0; rules->dirs[i]; i++) {
struct stat stats;
@@
-1875,7
+1879,7
@@
bool udev_rules_check_timestamp(struct udev_rules *rules)
/* update timestamp */
rules->dirs_ts_usec[i] = ts_usec(&stats.st_mtim);
}
/* update timestamp */
rules->dirs_ts_usec[i] = ts_usec(&stats.st_mtim);
}
-
+out:
return changed;
}
return changed;
}