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
Chunk a really large file to avoid sender-side hash-table
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
656c3bf
..
689de61
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-21,6
+21,7
@@
*/
#include "rsync.h"
*/
#include "rsync.h"
+#include "ifuncs.h"
extern int verbose;
extern int dry_run;
extern int verbose;
extern int dry_run;
@@
-90,9
+91,9
@@
int fd_pair(int fd[2])
return ret;
}
return ret;
}
-void print_child_argv(char **cmd)
+void print_child_argv(c
onst char *prefix, c
har **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
for (; *cmd; cmd++) {
/* Look for characters that ought to be quoted. This
* is not a great quoting algorithm, but it's
@@
-264,15
+265,14
@@
static int safe_read(int desc, char *ptr, size_t len)
*
* This is used in conjunction with the --temp-dir, --backup, and
* --copy-dest options. */
*
* 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, mode_t mode
, int create_bak_dir
)
{
int ifd;
int ofd;
char buf[1024 * 8];
int len; /* Number of bytes read into `buf'. */
{
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;
}
rsyserr(FERROR, errno, "open %s", full_fname(source));
return -1;
}
@@
-282,8
+282,9
@@
int copy_file(const char *source, const char *dest, mode_t mode)
return -1;
}
return -1;
}
- ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode);
- if (ofd == -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;
rsyserr(FERROR, errno, "open %s", full_fname(dest));
close(ifd);
return -1;
@@
-406,7
+407,7
@@
int robust_rename(const char *from, const char *to, const char *partialptr,
return -1;
to = partialptr;
}
return -1;
to = partialptr;
}
- if (copy_file(from, to, mode) != 0)
+ if (copy_file(from, to, mode
, 0
) != 0)
return -2;
do_unlink(from);
return 1;
return -2;
do_unlink(from);
return 1;
@@
-519,8
+520,7
@@
static int filter_server_path(char *arg)
return 0;
}
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;
{
char **argv = *argv_ptr;
int argc = *argc_ptr;
@@
-529,7
+529,7
@@
static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
if (argc == maxargs) {
maxargs += MAX_ARGS;
if (!(argv = realloc_array(argv, char *, maxargs)))
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;
}
*argv_ptr = argv;
*maxargs_ptr = maxargs;
}
@@
-549,6
+549,8
@@
static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
s = sanitize_path(NULL, s, "", 0, NULL);
else
s = strdup(s);
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))
memset(&globbuf, 0, sizeof globbuf);
if (!filter_server_path(s))
@@
-556,7
+558,7
@@
static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
if (MAX((int)globbuf.gl_pathc, 1) > maxargs - argc) {
maxargs += globbuf.gl_pathc + MAX_ARGS;
if (!(argv = realloc_array(argv, char *, maxargs)))
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;
}
*argv_ptr = argv;
*maxargs_ptr = maxargs;
}
@@
-567,7
+569,7
@@
static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
free(s);
for (i = 0; i < (int)globbuf.gl_pathc; i++) {
if (!(argv[argc++] = strdup(globbuf.gl_pathv[i])))
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);
}
}
globfree(&globbuf);
@@
-576,35
+578,34
@@
static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
}
/* This routine is only used in daemon mode. */
}
/* 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);
char *base = base1;
int base_len = strlen(base);
- if (!
s || !*s
)
+ if (!
arg || !*arg
)
return;
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)
if (asprintf(&base," %s/", base1) <= 0)
- out_of_memory("glob_expand");
+ out_of_memory("glob_expand
_module
");
base_len++;
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 */
*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;
}
if (!p)
break;
}
- free(
s
);
+ free(
arg
);
free(base);
}
free(base);
}
@@
-1255,11
+1256,11
@@
int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6)
#define MALLOC_MAX 0x40000000
#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;
{
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 *_realloc_array(void *ptr, unsigned int size, unsigned long num)
@@
-1478,7
+1479,7
@@
void *expand_item_list(item_list *lp, size_t item_size,
void *new_ptr;
size_t new_size = lp->malloced;
if (incr < 0)
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
else if (new_size < (size_t)incr)
new_size += incr;
else