Tweaking the license text a bit more.

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index 64a5b38..656c3bf 100644 (file)
--- a/util.c
+++ b/util.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -28,6 +28,7 @@ extern int module_id;
 extern int modify_window;
 extern int relative_paths;
 extern int human_readable;
+extern char *module_dir;
 extern unsigned int module_dirlen;
 extern mode_t orig_umask;
 extern char *partial_dir;
@@ -749,7 +750,7 @@ unsigned int clean_fname(char *name, BOOL collapse_dot_dot)
  * rootdir will be ignored to avoid expansion of the string.
  *
  * The rootdir string contains a value to use in place of a leading slash.
- * Specify NULL to get the default of lp_path(module_id).
+ * Specify NULL to get the default of "module_dir".
  *
  * The depth var is a count of how many '..'s to allow at the start of the
  * path.  If symlink is set, combine its value with the "p" value to get
@@ -778,7 +779,7 @@ char *sanitize_path(char *dest, const char *p, const char *rootdir, int depth,
                int plen = strlen(p);
                if (*p == '/') {
                        if (!rootdir)
-                               rootdir = lp_path(module_id);
+                               rootdir = module_dir;
                        rlen = strlen(rootdir);
                        depth = 0;
                        p++;
@@ -883,8 +884,10 @@ int push_dir(const char *dir, int set_path_only)
        if (len == 1 && *dir == '.')
                return 1;
 
-       if ((*dir == '/' ? len : curr_dir_len + 1 + len) >= sizeof curr_dir)
+       if ((*dir == '/' ? len : curr_dir_len + 1 + len) >= sizeof curr_dir) {
+               errno = ENAMETOOLONG;
                return 0;
+       }
 
        if (!set_path_only && chdir(dir))
                return 0;
@@ -1466,3 +1469,31 @@ int bitbag_next_bit(struct bitbag *bb, int after)
 
        return -1;
 }
+
+void *expand_item_list(item_list *lp, size_t item_size,
+                      const char *desc, int incr)
+{
+       /* First time through, 0 <= 0, so list is expanded. */
+       if (lp->malloced <= lp->count) {
+               void *new_ptr;
+               size_t new_size = lp->malloced;
+               if (incr < 0)
+                       new_size -= incr; /* increase slowly */
+               else if (new_size < (size_t)incr)
+                       new_size += incr;
+               else
+                       new_size *= 2;
+               new_ptr = realloc_array(lp->items, char, new_size * item_size);
+               if (verbose >= 4) {
+                       rprintf(FINFO, "[%s] expand %s to %.0f bytes, did%s move\n",
+                               who_am_i(), desc, (double)new_size * item_size,
+                               new_ptr == lp->items ? " not" : "");
+               }
+               if (!new_ptr)
+                       out_of_memory("expand_item_list");
+
+               lp->items = new_ptr;
+               lp->malloced = new_size;
+       }
+       return (char*)lp->items + (lp->count++ * item_size);
+}