Moved inline functions from rsync.h into ifuncs.h.

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index 656c3bf..7a32025 100644 (file)
--- a/util.c
+++ b/util.c
@@ -21,6 +21,7 @@
  */
 
 #include "rsync.h"
+#include "ifuncs.h"
 
 extern int verbose;
 extern int dry_run;
@@ -90,9 +91,9 @@ int fd_pair(int fd[2])
        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
@@ -519,8 +520,7 @@ static int filter_server_path(char *arg)
        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;
@@ -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)))
-                       out_of_memory("glob_expand_one");
+                       out_of_memory("glob_expand");
                *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);
+       if (!s)
+               out_of_memory("glob_expand");
 
        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)))
-                       out_of_memory("glob_expand_one");
+                       out_of_memory("glob_expand");
                *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])))
-                               out_of_memory("glob_expand_one");
+                               out_of_memory("glob_expand");
                }
        }
        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. */
-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);
 }
 
@@ -1255,11 +1256,11 @@ int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6)
 
 #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)
@@ -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)
-                       new_size -= incr; /* increase slowly */
+                       new_size += -incr; /* increase slowly */
                else if (new_size < (size_t)incr)
                        new_size += incr;
                else