*/
#include "rsync.h"
+#include "ifuncs.h"
extern int verbose;
extern int dry_run;
return ret;
}
-void print_child_argv(char **cmd)
+void print_child_argv(const char *prefix, char **cmd)
{
- rprintf(FCLIENT, "opening connection using ");
+ rprintf(FCLIENT, "%s ", prefix);
for (; *cmd; cmd++) {
/* Look for characters that ought to be quoted. This
* is not a great quoting algorithm, but it's
}
# endif
return utimes(fname, t);
-#elif defined HAVE_UTIMBUF
+#elif defined HAVE_STRUCT_UTIMBUF
struct utimbuf tbuf;
tbuf.actime = time(NULL);
tbuf.modtime = modtime;
return n_chars;
}
-/** Copy a file.
+/* Copy a file. If ofd < 0, copy_file unlinks and opens the "dest" file.
+ * Otherwise, it just writes to and closes the provided file descriptor.
*
* This is used in conjunction with the --temp-dir, --backup, and
* --copy-dest options. */
-int copy_file(const char *source, const char *dest, mode_t mode)
+int copy_file(const char *source, const char *dest, int ofd,
+ mode_t mode, int create_bak_dir)
{
int ifd;
- int ofd;
char buf[1024 * 8];
int len; /* Number of bytes read into `buf'. */
- ifd = do_open(source, O_RDONLY, 0);
- if (ifd == -1) {
+ if ((ifd = do_open(source, O_RDONLY, 0)) < 0) {
rsyserr(FERROR, errno, "open %s", full_fname(source));
return -1;
}
- if (robust_unlink(dest) && errno != ENOENT) {
- rsyserr(FERROR, errno, "unlink %s", full_fname(dest));
- return -1;
- }
+ if (ofd < 0) {
+ if (robust_unlink(dest) && errno != ENOENT) {
+ 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) {
- rsyserr(FERROR, errno, "open %s", full_fname(dest));
- close(ifd);
- return -1;
+ if ((ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode)) < 0
+ && (!create_bak_dir || errno != ENOENT || make_bak_dir(dest) < 0
+ || (ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode)) < 0)) {
+ rsyserr(FERROR, errno, "open %s", full_fname(dest));
+ close(ifd);
+ return -1;
+ }
}
while ((len = safe_read(ifd, buf, sizeof buf)) > 0) {
return -1;
to = partialptr;
}
- if (copy_file(from, to, mode) != 0)
+ if (copy_file(from, to, -1, mode, 0) != 0)
return -2;
do_unlink(from);
return 1;
return 0;
}
-static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
- int *maxargs_ptr)
+void glob_expand(char *s, char ***argv_ptr, int *argc_ptr, int *maxargs_ptr)
{
char **argv = *argv_ptr;
int argc = *argc_ptr;
if (argc == maxargs) {
maxargs += MAX_ARGS;
if (!(argv = realloc_array(argv, char *, maxargs)))
- out_of_memory("glob_expand_one");
+ out_of_memory("glob_expand");
*argv_ptr = argv;
*maxargs_ptr = maxargs;
}
s = sanitize_path(NULL, s, "", 0, NULL);
else
s = strdup(s);
+ if (!s)
+ out_of_memory("glob_expand");
memset(&globbuf, 0, sizeof globbuf);
if (!filter_server_path(s))
if (MAX((int)globbuf.gl_pathc, 1) > maxargs - argc) {
maxargs += globbuf.gl_pathc + MAX_ARGS;
if (!(argv = realloc_array(argv, char *, maxargs)))
- out_of_memory("glob_expand_one");
+ out_of_memory("glob_expand");
*argv_ptr = argv;
*maxargs_ptr = maxargs;
}
free(s);
for (i = 0; i < (int)globbuf.gl_pathc; i++) {
if (!(argv[argc++] = strdup(globbuf.gl_pathv[i])))
- out_of_memory("glob_expand_one");
+ out_of_memory("glob_expand");
}
}
globfree(&globbuf);
}
/* This routine is only used in daemon mode. */
-void glob_expand(char *base1, char ***argv_ptr, int *argc_ptr, int *maxargs_ptr)
+void glob_expand_module(char *base1, char *arg, char ***argv_ptr, int *argc_ptr, int *maxargs_ptr)
{
- char *s = (*argv_ptr)[*argc_ptr];
- char *p, *q;
+ char *p, *s;
char *base = base1;
int base_len = strlen(base);
- if (!s || !*s)
+ if (!arg || !*arg)
return;
- if (strncmp(s, base, base_len) == 0)
- s += base_len;
+ if (strncmp(arg, base, base_len) == 0)
+ arg += base_len;
- if (!(s = strdup(s)))
- out_of_memory("glob_expand");
+ if (!(arg = strdup(arg)))
+ out_of_memory("glob_expand_module");
if (asprintf(&base," %s/", base1) <= 0)
- out_of_memory("glob_expand");
+ out_of_memory("glob_expand_module");
base_len++;
- for (q = s; *q; q = p + base_len) {
- if ((p = strstr(q, base)) != NULL)
+ for (s = arg; *s; s = p + base_len) {
+ if ((p = strstr(s, base)) != NULL)
*p = '\0'; /* split it at this point */
- glob_expand_one(q, argv_ptr, argc_ptr, maxargs_ptr);
+ glob_expand(s, argv_ptr, argc_ptr, maxargs_ptr);
if (!p)
break;
}
- free(s);
+ free(arg);
free(base);
}
return cnt;
}
-/* Turns multiple adjacent slashes into a single slash, gets rid of "./"
- * elements (but not a trailing dot dir), removes a trailing slash, and
- * optionally collapses ".." elements (except for those at the start of the
- * string). If the resulting name would be empty, change it into a ".". */
-unsigned int clean_fname(char *name, BOOL collapse_dot_dot)
+/* Turns multiple adjacent slashes into a single slash, drops interior "."
+ * elements, drops an intial "./" unless CFN_KEEP_LEADING_DOT_DIR is flagged,
+ * will even drop a trailing '.' after a '/' if CFN_DROP_TRAILING_DOT_DIR is
+ * flagged, removes a trailing slash (perhaps after removing the aforementioned
+ * dot) unless CFN_KEEP_TRAILING_SLASH is flagged, will even collapse ".."
+ * elements (except at the start of the string) if CFN_COLLAPSE_DOT_DOT_DIRS
+ * is flagged. If the resulting name would be empty, we return ".". */
+unsigned int clean_fname(char *name, int flags)
{
char *limit = name - 1, *t = name, *f = name;
int anchored;
if ((anchored = *f == '/') != 0)
*t++ = *f++;
+ else if (flags & CFN_KEEP_LEADING_DOT_DIR && *f == '.' && f[1] == '/') {
+ *t++ = *f++;
+ *t++ = *f++;
+ }
while (*f) {
/* discard extra slashes */
if (*f == '/') {
continue;
}
if (*f == '.') {
- /* discard "." dirs (but NOT a trailing '.'!) */
+ /* discard interior "." dirs */
if (f[1] == '/') {
f += 2;
continue;
}
+ if (f[1] == '\0' && flags & CFN_DROP_TRAILING_DOT_DIR)
+ break;
/* collapse ".." dirs */
- if (collapse_dot_dot
- && f[1] == '.' && (f[2] == '/' || !f[2])) {
+ if (flags & CFN_COLLAPSE_DOT_DOT_DIRS
+ && f[1] == '.' && (f[2] == '/' || !f[2])) {
char *s = t - 1;
if (s == name && anchored) {
f += 2;
while (*f && (*t++ = *f++) != '/') {}
}
- if (t > name+anchored && t[-1] == '/')
+ if (t > name+anchored && t[-1] == '/' && !(flags & CFN_KEEP_TRAILING_SLASH))
t--;
if (t == name)
*t++ = '.';
curr_dir_len += len;
}
- curr_dir_len = clean_fname(curr_dir, 1);
+ curr_dir_len = clean_fname(curr_dir, CFN_COLLAPSE_DOT_DOT_DIRS);
if (sanitize_paths) {
if (module_dirlen > curr_dir_len)
module_dirlen = curr_dir_len;
#define MALLOC_MAX 0x40000000
-void *_new_array(unsigned int size, unsigned long num)
+void *_new_array(unsigned long num, unsigned int size, int use_calloc)
{
if (num >= MALLOC_MAX/size)
return NULL;
- return malloc(size * num);
+ return use_calloc ? calloc(num, size) : malloc(num * size);
}
void *_realloc_array(void *ptr, unsigned int size, unsigned long num)
void *new_ptr;
size_t new_size = lp->malloced;
if (incr < 0)
- new_size -= incr; /* increase slowly */
+ new_size += -incr; /* increase slowly */
else if (new_size < (size_t)incr)
new_size += incr;
else
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff