chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path-util.c: small modernization
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index 0b50ea646aa984a3a1a64b15946f438ac17527e1..68881357784eba69f4cd8d165b32f903f058323e 100644
(file)
--- a/
src/shared/path-util.c
+++ b/
src/shared/path-util.c
@@
-50,7
+50,8
@@
char *path_get_file_name(const char *p) {
assert(p);
assert(p);
- if ((r = strrchr(p, '/')))
+ r = strrchr(p, '/');
+ if (r)
return r + 1;
return (char*) p;
return r + 1;
return (char*) p;
@@
-101,7
+102,8
@@
char **path_split_and_make_absolute(const char *p) {
char **l;
assert(p);
char **l;
assert(p);
- if (!(l = strv_split(p, ":")))
+ l = strv_split(p, ":");
+ if (!l)
return NULL;
if (!path_strv_make_absolute_cwd(l)) {
return NULL;
if (!path_strv_make_absolute_cwd(l)) {
@@
-125,7
+127,7
@@
char *path_make_absolute(const char *p, const char *prefix) {
}
char *path_make_absolute_cwd(const char *p) {
}
char *path_make_absolute_cwd(const char *p) {
-
char *cwd, *r
;
+
_cleanup_free_ char *cwd = NULL
;
assert(p);
assert(p);
@@
-139,10
+141,7
@@
char *path_make_absolute_cwd(const char *p) {
if (!cwd)
return NULL;
if (!cwd)
return NULL;
- r = path_make_absolute(p, cwd);
- free(cwd);
-
- return r;
+ return path_make_absolute(p, cwd);
}
char **path_strv_make_absolute_cwd(char **l) {
}
char **path_strv_make_absolute_cwd(char **l) {
@@
-155,7
+154,8
@@
char **path_strv_make_absolute_cwd(char **l) {
STRV_FOREACH(s, l) {
char *t;
STRV_FOREACH(s, l) {
char *t;
- if (!(t = path_make_absolute_cwd(*s)))
+ t = path_make_absolute_cwd(*s);
+ if (!t)
return NULL;
free(*s);
return NULL;
free(*s);
@@
-413,3
+413,15
@@
int path_is_read_only_fs(const char *path) {
return !!(st.f_flag & ST_RDONLY);
}
return !!(st.f_flag & ST_RDONLY);
}
+
+int path_is_os_tree(const char *path) {
+ char *p;
+ int r;
+
+ /* We use /etc/os-release as flag file if something is an OS */
+
+ p = strappenda(path, "/etc/os-release");
+ r = access(p, F_OK);
+
+ return r < 0 ? 0 : 1;
+}