chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: add missing files
[elogind.git]
/
src
/
shared
/
mkdir.c
diff --git
a/src/shared/mkdir.c
b/src/shared/mkdir.c
index e668cc2558083eb6641976d23a29ecd9075ef316..b102af779df70c45b536f37df61dc5d31b5e2d77 100644
(file)
--- a/
src/shared/mkdir.c
+++ b/
src/shared/mkdir.c
@@
-6,16
+6,16
@@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU
Lesser
General Public License as published by
+ the Free Software Foundation; either version 2
.1
of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+
Lesser
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU
Lesser
General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
@@
-53,13
+53,24
@@
int safe_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid) {
}
int mkdir_parents(const char *path, mode_t mode) {
}
int mkdir_parents(const char *path, mode_t mode) {
+ struct stat st;
const char *p, *e;
assert(path);
const char *p, *e;
assert(path);
- /* Creates every parent directory in the path except the last
- * component. */
+ /* return immediately if directory exists */
+ e = strrchr(path, '/');
+ if (!e)
+ return -EINVAL;
+ p = strndupa(path, e - path);
+ if (stat(p, &st) >= 0) {
+ if ((st.st_mode & S_IFMT) == S_IFDIR)
+ return 0;
+ else
+ return -ENOTDIR;
+ }
+ /* create every parent directory in the path, except the last component */
p = path + strspn(path, "/");
for (;;) {
int r;
p = path + strspn(path, "/");
for (;;) {
int r;
@@
-73,7
+84,8
@@
int mkdir_parents(const char *path, mode_t mode) {
if (*p == 0)
return 0;
if (*p == 0)
return 0;
- if (!(t = strndup(path, e - path)))
+ t = strndup(path, e - path);
+ if (!t)
return -ENOMEM;
r = label_mkdir(t, mode);
return -ENOMEM;
r = label_mkdir(t, mode);