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
Move the description of include/exclude modifiers to a better place
[rsync/rsync.git]
/
hlink.c
diff --git
a/hlink.c
b/hlink.c
index
0581398
..
c9eb33a
100644
(file)
--- a/
hlink.c
+++ b/
hlink.c
@@
-4,7
+4,7
@@
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool <mbp@samba.org>
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2004-200
8
Wayne Davison
+ * Copyright (C) 2004-200
9
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
@@
-22,6
+22,7
@@
#include "rsync.h"
#include "inums.h"
#include "rsync.h"
#include "inums.h"
+#include "ifuncs.h"
extern int dry_run;
extern int list_only;
extern int dry_run;
extern int list_only;
@@
-216,6
+217,7
@@
static int maybe_hard_link(struct file_struct *file, int ndx,
const char *realname, int itemizing, enum logcode code)
{
if (statret == 0) {
const char *realname, int itemizing, enum logcode code)
{
if (statret == 0) {
+ int ok = 0;
if (sxp->st.st_dev == old_stp->st_dev
&& sxp->st.st_ino == old_stp->st_ino) {
if (itemizing) {
if (sxp->st.st_dev == old_stp->st_dev
&& sxp->st.st_ino == old_stp->st_ino) {
if (itemizing) {
@@
-228,10
+230,9
@@
static int maybe_hard_link(struct file_struct *file, int ndx,
file->flags |= FLAG_HLINK_DONE;
return 0;
}
file->flags |= FLAG_HLINK_DONE;
return 0;
}
- if (make_backups > 0) {
- if (!make_backup(fname))
- return -1;
- } else if (robust_unlink(fname)) {
+ if (make_backups > 0 && (ok = make_backup(fname, True)) == 0)
+ return -1;
+ if (ok != 1 && robust_unlink(fname) && errno != ENOENT) {
rsyserr(FERROR_XFER, errno, "unlink %s failed",
full_fname(fname));
return -1;
rsyserr(FERROR_XFER, errno, "unlink %s failed",
full_fname(fname));
return -1;
@@
-393,12
+394,7
@@
int hard_link_check(struct file_struct *file, int ndx, const char *fname,
char cmpbuf[MAXPATHLEN];
stat_x alt_sx;
int j = 0;
char cmpbuf[MAXPATHLEN];
stat_x alt_sx;
int j = 0;
-#ifdef SUPPORT_ACLS
- alt_sx.acc_acl = alt_sx.def_acl = NULL;
-#endif
-#ifdef SUPPORT_XATTRS
- alt_sx.xattr = NULL;
-#endif
+ init_stat_x(&alt_sx);
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
if (link_stat(cmpbuf, &alt_sx.st, 0) < 0)
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
if (link_stat(cmpbuf, &alt_sx.st, 0) < 0)
@@
-521,12
+517,7
@@
void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
} else
our_name = fname;
} else
our_name = fname;
-#ifdef SUPPORT_ACLS
- prev_sx.acc_acl = prev_sx.def_acl = NULL;
-#endif
-#ifdef SUPPORT_XATTRS
- prev_sx.xattr = NULL;
-#endif
+ init_stat_x(&prev_sx);
while ((ndx = prev_ndx) >= 0) {
int val;
while ((ndx = prev_ndx) >= 0) {
int val;