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
Added the "write only" option to the daemon config file.
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
9f28148
..
a474c9b
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-252,29
+252,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
+278,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;
}
@@
-499,7
+494,10
@@
static int exclude_server_path(char *arg)
static void glob_expand_one(char *s, char **argv, int *argc, int maxargs)
{
#if !(defined(HAVE_GLOB) && defined(HAVE_GLOB_H))
static void glob_expand_one(char *s, char **argv, int *argc, int maxargs)
{
#if !(defined(HAVE_GLOB) && defined(HAVE_GLOB_H))
- if (!*s) s = ".";
+ if (maxargs <= *argc)
+ return;
+ if (!*s)
+ s = ".";
s = argv[*argc] = strdup(s);
exclude_server_path(s);
(*argc)++;
s = argv[*argc] = strdup(s);
exclude_server_path(s);
(*argc)++;
@@
-508,12
+506,12
@@
static void glob_expand_one(char *s, char **argv, int *argc, int maxargs)
glob_t globbuf;
int i;
glob_t globbuf;
int i;
- if (!*s) s = ".";
+ if (!*s)
+ s = ".";
s = argv[*argc] = strdup(s);
s = argv[*argc] = strdup(s);
- if (sanitize_paths)
{
+ if (sanitize_paths)
sanitize_path(s, NULL);
sanitize_path(s, NULL);
- }
memset(&globbuf, 0, sizeof globbuf);
if (!exclude_server_path(s))
memset(&globbuf, 0, sizeof globbuf);
if (!exclude_server_path(s))