Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed hard-linking when some of the files can get skipped. This adds
[rsync/rsync.git]
/
syscall.c
diff --git
a/syscall.c
b/syscall.c
index
0dfcaa0
..
c2180de
100644
(file)
--- a/
syscall.c
+++ b/
syscall.c
@@
-4,7
+4,7
@@
*
* Copyright (C) 1998 Andrew Tridgell
* Copyright (C) 2002 Martin Pool
*
* Copyright (C) 1998 Andrew Tridgell
* Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-200
7
Wayne Davison
+ * Copyright (C) 2003-200
8
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-34,6
+34,7
@@
extern int am_root;
extern int read_only;
extern int list_only;
extern int preserve_perms;
extern int read_only;
extern int list_only;
extern int preserve_perms;
+extern int preserve_executability;
#define RETURN_ERROR_IF(x,e) \
do { \
#define RETURN_ERROR_IF(x,e) \
do { \
@@
-167,8
+168,8
@@
int do_chmod(const char *path, mode_t mode)
#endif
} else
code = chmod(path, mode & CHMOD_BITS);
#endif
} else
code = chmod(path, mode & CHMOD_BITS);
- if (code != 0 &&
preserve_perms
)
- return code;
+ if (code != 0 &&
(preserve_perms || preserve_executability)
)
+
return code;
return 0;
}
#endif
return 0;
}
#endif
@@
-211,6
+212,7
@@
int do_mkstemp(char *template, mode_t perms)
{
RETURN_ERROR_IF(dry_run, 0);
RETURN_ERROR_IF(read_only, EROFS);
{
RETURN_ERROR_IF(dry_run, 0);
RETURN_ERROR_IF(read_only, EROFS);
+ perms |= S_IWUSR;
#if defined HAVE_SECURE_MKSTEMP && defined HAVE_FCHMOD && (!defined HAVE_OPEN64 || defined HAVE_MKSTEMP64)
{
#if defined HAVE_SECURE_MKSTEMP && defined HAVE_FCHMOD && (!defined HAVE_OPEN64 || defined HAVE_MKSTEMP64)
{