#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;
int set_modtime(char *fname, time_t modtime)
{
- extern int dry_run;
if (dry_run)
return 0;
ifd = do_open(source, O_RDONLY, 0);
if (ifd == -1) {
- rprintf(FERROR,"open %s: %s\n",
- source,strerror(errno));
+ rsyserr(FERROR, errno, "open %s", full_fname(source));
return -1;
}
if (robust_unlink(dest) && errno != ENOENT) {
- rprintf(FERROR,"unlink %s: %s\n",
- 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) {
- rprintf(FERROR,"open %s: %s\n",
- 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) {
- rprintf(FERROR,"write %s: %s\n",
- dest,strerror(errno));
+ rsyserr(FERROR, errno, "write %s", full_fname(dest));
close(ifd);
close(ofd);
return -1;
}
}
- close(ifd);
- close(ofd);
-
if (len < 0) {
- rprintf(FERROR,"read %s: %s\n",
- source,strerror(errno));
+ rsyserr(FERROR, errno, "read %s", full_fname(source));
+ close(ifd);
+ close(ofd);
+ return -1;
+ }
+
+ if (close(ifd) < 0) {
+ rsyserr(FINFO, errno, "close failed on %s",
+ full_fname(source));
+ }
+
+ if (close(ofd) < 0) {
+ rsyserr(FERROR, errno, "close failed on %s",
+ full_fname(dest));
return -1;
}
static int exclude_server_path(char *arg)
{
char *s;
- extern struct exclude_struct **server_exclude_list;
- if (server_exclude_list) {
+ if (server_exclude_list.head) {
for (s = arg; (s = strchr(s, '/')) != NULL; ) {
*s = '\0';
- if (check_exclude(server_exclude_list, arg, 1)) {
+ if (check_exclude(&server_exclude_list, arg, 1) < 0) {
/* We must leave arg truncated! */
return 1;
}
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)++;
#else
- extern int sanitize_paths;
glob_t globbuf;
int i;
- if (!*s) s = ".";
+ if (!*s)
+ s = ".";
s = argv[*argc] = strdup(s);
- if (sanitize_paths) {
+ if (sanitize_paths)
sanitize_path(s, NULL);
- }
memset(&globbuf, 0, sizeof globbuf);
if (!exclude_server_path(s))
int allowdotdot = 0;
if (reldir) {
- depth++;
+ int new_component = 1;
while (*reldir) {
- if (*reldir++ == '/') {
+ if (*reldir++ == '/')
+ new_component = 1;
+ else if (new_component) {
+ new_component = 0;
depth++;
}
}
char *buf;
int rlen, plen = strlen(path);
- if (*path == '/' && rootdir)
+ if (*path == '/' && rootdir) {
rlen = strlen(rootdir);
- else
+ if (rlen == 1)
+ path++;
+ } else
rlen = 0;
if (!(buf = new_array(char, rlen + plen + 1)))
out_of_memory("alloc_sanitize_path");
memcpy(buf, rootdir, rlen);
memcpy(buf + rlen, path, plen + 1);
- if (rlen)
+ if (rlen > 1)
rlen++;
sanitize_path(buf + rlen, NULL);
- if (rlen && buf[rlen] == '.' && buf[rlen+1] == '\0')
- buf[rlen-1] = '\0';
+ if (rlen && buf[rlen] == '.' && buf[rlen+1] == '\0') {
+ if (rlen > 1)
+ rlen--;
+ buf[rlen] = '\0';
+ }
return buf;
}
* The string " (in MODNAME)" may also be appended. The returned pointer
* remains valid until the next time full_fname() is called.
**/
-char *full_fname(char *fn)
+char *full_fname(const char *fn)
{
- extern int module_id;
static char *result = NULL;
char *m1, *m2, *m3;
char *p1, *p2;
struct timeval tval, t1, t2;
gettimeofday(&t1, NULL);
- gettimeofday(&t2, NULL);
while (tdiff < t) {
tval.tv_sec = (t-tdiff)/1000;
**/
int cmp_modtime(time_t file1, time_t file2)
{
- extern int modify_window;
-
if (file2 > file1) {
- if (file2 - file1 <= modify_window) return 0;
+ if (file2 - file1 <= modify_window)
+ return 0;
return -1;
}
- if (file1 - file2 <= modify_window) return 0;
+ if (file1 - file2 <= modify_window)
+ return 0;
return 1;
}