chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
efivars: do binary and before converting to bool
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index 00d2d44993d3711adfc2b244e994360d1f2a8912..12d1ec321f174619183f1423cbdf5f83c2389e90 100644
(file)
--- a/
src/shared/path-util.c
+++ b/
src/shared/path-util.c
@@
-19,15
+19,12
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
-#include <signal.h>
#include <stdio.h>
#include <fcntl.h>
#include <stdio.h>
#include <fcntl.h>
-#include <dirent.h>
#include <sys/statvfs.h>
#include "macro.h"
#include <sys/statvfs.h>
#include "macro.h"
@@
-436,6
+433,10
@@
bool path_equal(const char *a, const char *b) {
}
}
}
}
+bool path_equal_or_files_same(const char *a, const char *b) {
+ return path_equal(a, b) || files_same(a, b) > 0;
+}
+
char* path_join(const char *root, const char *path, const char *rest) {
assert(path);
char* path_join(const char *root, const char *path, const char *rest) {
assert(path);
@@
-560,14
+561,14
@@
int path_is_os_tree(const char *path) {
int r;
/* We use /usr/lib/os-release as flag file if something is an OS */
int r;
/* We use /usr/lib/os-release as flag file if something is an OS */
- p = str
append
a(path, "/usr/lib/os-release");
+ p = str
join
a(path, "/usr/lib/os-release");
r = access(p, F_OK);
if (r >= 0)
return 1;
/* Also check for the old location in /etc, just in case. */
r = access(p, F_OK);
if (r >= 0)
return 1;
/* Also check for the old location in /etc, just in case. */
- p = str
append
a(path, "/etc/os-release");
+ p = str
join
a(path, "/etc/os-release");
r = access(p, F_OK);
return r >= 0;
r = access(p, F_OK);
return r >= 0;
@@
-665,7
+666,7
@@
int fsck_exists(const char *fstype) {
const char *checker;
int r;
const char *checker;
int r;
- checker = str
append
a("fsck.", fstype);
+ checker = str
join
a("fsck.", fstype);
r = find_binary(checker, true, &p);
if (r < 0)
r = find_binary(checker, true, &p);
if (r < 0)