diff options
author | Radek Podgorny <radek@podgorny.cz> | 2012-08-17 10:30:46 +0200 |
---|---|---|
committer | Radek Podgorny <radek@podgorny.cz> | 2012-08-17 10:30:46 +0200 |
commit | f947d1a8e39bcc1fe40fdb6c3a05b26fefae0ffa (patch) | |
tree | 7a036bc4c2bea370c145d81735d331e7ac815b96 | |
parent | 5ae16a6b6175bcf7568d02a0c4fc8a5f2a195ef9 (diff) | |
download | unionfs-fuse-git-f947d1a8e39bcc1fe40fdb6c3a05b26fefae0ffa.tar.gz |
trivial fixes by B Howe
-rw-r--r-- | CREDITS | 1 | ||||
-rw-r--r-- | src/cow.c | 2 | ||||
-rw-r--r-- | src/cow_utils.c | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -18,6 +18,7 @@ Sebastian Pipping <sebastian@pipping.org> Nicolas Dely <nanouck@gmail.com> Julian Andres Klode <jak@debian.org> Mike Kazantsev <mk.fraggod@gmail.com> +B Howe <bhowe@wetafx.co.nz> Hashtable routines taken from: Christopher Clark <christopher.clark@cl.cam.ac.uk> @@ -203,7 +203,7 @@ int copy_directory(const char *path, int branch_ro, int branch_rw) { if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) continue; char member[PATHLEN_MAX]; - if (BUILD_PATH(member, path, de->d_name)) { + if (BUILD_PATH(member, path, "/", de->d_name)) { res = 1; break; } diff --git a/src/cow_utils.c b/src/cow_utils.c index 52e824a..674956b 100644 --- a/src/cow_utils.c +++ b/src/cow_utils.c @@ -64,7 +64,7 @@ int setfile(const char *path, struct stat *fs) int rval; rval = 0; - fs->st_mode &= S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO; + fs->st_mode &= S_ISUID | S_ISGID | S_ISTXT | S_IRWXU | S_IRWXG | S_IRWXO; ut.actime = fs->st_atime; ut.modtime = fs->st_mtime; |