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
If --backup was specified without a --backup-dir, don't preserve the
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
6fe19fc
..
2212723
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-28,6
+28,9
@@
#include "rsync.h"
extern int verbose;
#include "rsync.h"
extern int verbose;
+extern int dry_run;
+extern int module_id;
+extern int modify_window;
extern struct exclude_list_struct server_exclude_list;
int sanitize_paths = 0;
extern struct exclude_list_struct server_exclude_list;
int sanitize_paths = 0;
@@
-126,7
+129,6
@@
void overflow(char *str)
int set_modtime(char *fname, time_t modtime)
{
int set_modtime(char *fname, time_t modtime)
{
- extern int dry_run;
if (dry_run)
return 0;
if (dry_run)
return 0;
@@
-252,29
+254,25
@@
int copy_file(char *source, char *dest, mode_t mode)
ifd = do_open(source, O_RDONLY, 0);
if (ifd == -1) {
ifd = do_open(source, O_RDONLY, 0);
if (ifd == -1) {
- rprintf(FERROR,"open %s: %s\n",
- full_fname(source), strerror(errno));
+ rsyserr(FERROR, errno, "open %s", full_fname(source));
return -1;
}
if (robust_unlink(dest) && errno != ENOENT) {
return -1;
}
if (robust_unlink(dest) && errno != ENOENT) {
- rprintf(FERROR,"unlink %s: %s\n",
- full_fname(dest), strerror(errno));
+ rsyserr(FERROR, errno, "unlink %s", full_fname(dest));
return -1;
}
ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
if (ofd == -1) {
return -1;
}
ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
if (ofd == -1) {
- rprintf(FERROR,"open %s: %s\n",
- full_fname(dest), strerror(errno));
+ rsyserr(FERROR, errno, "open %s", full_fname(dest));
close(ifd);
return -1;
}
while ((len = safe_read(ifd, buf, sizeof buf)) > 0) {
if (full_write(ofd, buf, len) < 0) {
close(ifd);
return -1;
}
while ((len = safe_read(ifd, buf, sizeof buf)) > 0) {
if (full_write(ofd, buf, len) < 0) {
- rprintf(FERROR,"write %s: %s\n",
- full_fname(dest), strerror(errno));
+ rsyserr(FERROR, errno, "write %s", full_fname(dest));
close(ifd);
close(ofd);
return -1;
close(ifd);
close(ofd);
return -1;
@@
-282,21
+280,20
@@
int copy_file(char *source, char *dest, mode_t mode)
}
if (len < 0) {
}
if (len < 0) {
- rprintf(FERROR, "read %s: %s\n",
- full_fname(source), strerror(errno));
+ rsyserr(FERROR, errno, "read %s", full_fname(source));
close(ifd);
close(ofd);
return -1;
}
if (close(ifd) < 0) {
close(ifd);
close(ofd);
return -1;
}
if (close(ifd) < 0) {
- r
printf(FINFO, "close failed on %s: %s\n
",
- full_fname(source)
, strerror(errno)
);
+ r
syserr(FINFO, errno, "close failed on %s
",
+ full_fname(source));
}
if (close(ofd) < 0) {
}
if (close(ofd) < 0) {
- r
printf(FERROR, "close failed on %s: %s\n
",
- full_fname(dest)
, strerror(errno)
);
+ r
syserr(FERROR, errno, "close failed on %s
",
+ full_fname(dest));
return -1;
}
return -1;
}
@@
-507,7
+504,6
@@
static void glob_expand_one(char *s, char **argv, int *argc, int maxargs)
exclude_server_path(s);
(*argc)++;
#else
exclude_server_path(s);
(*argc)++;
#else
- extern int sanitize_paths;
glob_t globbuf;
int i;
glob_t globbuf;
int i;
@@
-891,7
+887,6
@@
int pop_dir(char *dir)
**/
char *full_fname(char *fn)
{
**/
char *full_fname(char *fn)
{
- extern int module_id;
static char *result = NULL;
char *m1, *m2, *m3;
char *p1, *p2;
static char *result = NULL;
char *m1, *m2, *m3;
char *p1, *p2;
@@
-1075,13
+1070,13
@@
int msleep(int t)
**/
int cmp_modtime(time_t file1, time_t file2)
{
**/
int cmp_modtime(time_t file1, time_t file2)
{
- extern int modify_window;
-
if (file2 > file1) {
if (file2 > file1) {
- if (file2 - file1 <= modify_window) return 0;
+ if (file2 - file1 <= modify_window)
+ return 0;
return -1;
}
return -1;
}
- if (file1 - file2 <= modify_window) return 0;
+ if (file1 - file2 <= modify_window)
+ return 0;
return 1;
}
return 1;
}