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 | 6846cf63b0c814bd9bcea77290ed1975804050d1 (patch) | |
| tree | 1196a3ff8d5b612846e8fb89fe2bbd6a74ea67ac | |
| parent | f5d830c5bdde3d960ef075b043f01c5a2a291d61 (diff) | |
| download | unionfs-fuse-6846cf63b0c814bd9bcea77290ed1975804050d1.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; |