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
- Use "filename", not "file name".
[rsync/rsync.git]
/
backup.c
diff --git
a/backup.c
b/backup.c
index
49985fa
..
05856aa
100644
(file)
--- a/
backup.c
+++ b/
backup.c
@@
-5,8
+5,9
@@
* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,8
+15,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
*/
#include "rsync.h"
@@
-127,7
+127,7
@@
static int make_bak_dir(char *fullpath)
if (p >= rel) {
/* Try to transfer the directory settings of the
* actual dir that the files are coming from. */
if (p >= rel) {
/* Try to transfer the directory settings of the
* actual dir that the files are coming from. */
- if (
do_stat(rel, &sx.st
) < 0) {
+ if (
x_stat(rel, &sx.st, NULL
) < 0) {
rsyserr(FERROR, errno,
"make_bak_dir stat %s failed",
full_fname(rel));
rsyserr(FERROR, errno,
"make_bak_dir stat %s failed",
full_fname(rel));
@@
-155,7
+155,7
@@
static int make_bak_dir(char *fullpath)
}
#endif
set_file_attrs(fullpath, file, NULL, NULL, 0);
}
#endif
set_file_attrs(fullpath, file, NULL, NULL, 0);
-
fre
e(file);
+
unmake_fil
e(file);
}
}
*p = '/';
}
}
*p = '/';
@@
-200,7
+200,7
@@
static int keep_backup(const char *fname)
int ret_code;
/* return if no file to keep */
int ret_code;
/* return if no file to keep */
- if (
do_lstat(fname, &sx.st
) < 0)
+ if (
x_lstat(fname, &sx.st, NULL
) < 0)
return 1;
#ifdef SUPPORT_ACLS
sx.acc_acl = sx.def_acl = NULL;
return 1;
#ifdef SUPPORT_ACLS
sx.acc_acl = sx.def_acl = NULL;