chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strv: fix STRV_FOREACH_PAIR macro definition
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index 2bdbd22dc71becce8484dec92fb81dc8326e68ef..0b50ea646aa984a3a1a64b15946f438ac17527e1 100644
(file)
--- a/
src/shared/path-util.c
+++ b/
src/shared/path-util.c
@@
-35,6
+35,7
@@
#include "log.h"
#include "strv.h"
#include "path-util.h"
#include "log.h"
#include "strv.h"
#include "path-util.h"
+#include "missing.h"
bool path_is_absolute(const char *p) {
return p[0] == '/';
bool path_is_absolute(const char *p) {
return p[0] == '/';
@@
-134,7
+135,8
@@
char *path_make_absolute_cwd(const char *p) {
if (path_is_absolute(p))
return strdup(p);
if (path_is_absolute(p))
return strdup(p);
- if (!(cwd = get_current_dir_name()))
+ cwd = get_current_dir_name();
+ if (!cwd)
return NULL;
r = path_make_absolute(p, cwd);
return NULL;
r = path_make_absolute(p, cwd);
@@
-180,6
+182,7
@@
char **path_strv_canonicalize(char **l) {
t = path_make_absolute_cwd(*s);
free(*s);
t = path_make_absolute_cwd(*s);
free(*s);
+ *s = NULL;
if (!t) {
enomem = true;
if (!t) {
enomem = true;
@@
-188,14
+191,18
@@
char **path_strv_canonicalize(char **l) {
errno = 0;
u = canonicalize_file_name(t);
errno = 0;
u = canonicalize_file_name(t);
- free(t);
-
if (!u) {
if (!u) {
- if (errno == ENOMEM || !errno)
- enomem = true;
-
- continue;
- }
+ if (errno == ENOENT)
+ u = t;
+ else {
+ free(t);
+ if (errno == ENOMEM || !errno)
+ enomem = true;
+
+ continue;
+ }
+ } else
+ free(t);
l[k++] = u;
}
l[k++] = u;
}
@@
-208,24
+215,14
@@
char **path_strv_canonicalize(char **l) {
return l;
}
return l;
}
-char **path_strv_remove_empty(char **l) {
- char **f, **t;
+char **path_strv_canonicalize_uniq(char **l) {
+ if (strv_isempty(l))
+ return l;
- if (!
l
)
+ if (!
path_strv_canonicalize(l)
)
return NULL;
return NULL;
- for (f = t = l; *f; f++) {
-
- if (dir_is_empty(*f) > 0) {
- free(*f);
- continue;
- }
-
- *(t++) = *f;
- }
-
- *t = NULL;
- return l;
+ return strv_uniq(l);
}
char *path_kill_slashes(char *path) {
}
char *path_kill_slashes(char *path) {
@@
-263,12
+260,12
@@
char *path_kill_slashes(char *path) {
return path;
}
return path;
}
-
bool
path_startswith(const char *path, const char *prefix) {
+
char*
path_startswith(const char *path, const char *prefix) {
assert(path);
assert(prefix);
if ((path[0] == '/') != (prefix[0] == '/'))
assert(path);
assert(prefix);
if ((path[0] == '/') != (prefix[0] == '/'))
- return
false
;
+ return
NULL
;
for (;;) {
size_t a, b;
for (;;) {
size_t a, b;
@@
-277,19
+274,19
@@
bool path_startswith(const char *path, const char *prefix) {
prefix += strspn(prefix, "/");
if (*prefix == 0)
prefix += strspn(prefix, "/");
if (*prefix == 0)
- return
true
;
+ return
(char*) path
;
if (*path == 0)
if (*path == 0)
- return
false
;
+ return
NULL
;
a = strcspn(path, "/");
b = strcspn(prefix, "/");
if (a != b)
a = strcspn(path, "/");
b = strcspn(prefix, "/");
if (a != b)
- return
false
;
+ return
NULL
;
if (memcmp(path, prefix, a) != 0)
if (memcmp(path, prefix, a) != 0)
- return
false
;
+ return
NULL
;
path += a;
prefix += b;
path += a;
prefix += b;
@@
-334,6
+331,7
@@
int path_is_mount_point(const char *t, bool allow_symlink) {
int r;
struct file_handle *h;
int mount_id, mount_id_parent;
int r;
struct file_handle *h;
int mount_id, mount_id_parent;
+ struct stat a, b;
/* We are not actually interested in the file handles, but
* name_to_handle_at() also passes us the mount ID, hence use
/* We are not actually interested in the file handles, but
* name_to_handle_at() also passes us the mount ID, hence use
@@
-347,6
+345,12
@@
int path_is_mount_point(const char *t, bool allow_symlink) {
r = name_to_handle_at(AT_FDCWD, t, h, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
if (r < 0) {
r = name_to_handle_at(AT_FDCWD, t, h, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
if (r < 0) {
+ if (errno == ENOSYS || errno == ENOTSUP)
+ /* This kernel or file system does not support
+ * name_to_handle_at(), hence fallback to the
+ * traditional stat() logic */
+ goto fallback;
+
if (errno == ENOENT)
return 0;
if (errno == ENOENT)
return 0;
@@
-361,11
+365,42
@@
int path_is_mount_point(const char *t, bool allow_symlink) {
r = name_to_handle_at(AT_FDCWD, parent, h, &mount_id_parent, 0);
free(parent);
r = name_to_handle_at(AT_FDCWD, parent, h, &mount_id_parent, 0);
free(parent);
- if (r < 0)
- return -errno;
+ if (r < 0) {
+ /* The parent can't do name_to_handle_at() but the
+ * directory we are interested in can? If so, it must
+ * be a mount point */
+ if (errno == ENOTSUP)
+ return 1;
+ return -errno;
+ }
return mount_id != mount_id_parent;
return mount_id != mount_id_parent;
+
+fallback:
+ if (allow_symlink)
+ r = stat(t, &a);
+ else
+ r = lstat(t, &a);
+
+ if (r < 0) {
+ if (errno == ENOENT)
+ return 0;
+
+ return -errno;
+ }
+
+ r = path_get_parent(t, &parent);
+ if (r < 0)
+ return r;
+
+ r = lstat(parent, &b);
+ free(parent);
+
+ if (r < 0)
+ return -errno;
+
+ return a.st_dev != b.st_dev;
}
int path_is_read_only_fs(const char *path) {
}
int path_is_read_only_fs(const char *path) {