Update the copyright year.

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index 7569981..6e83ed2 100644 (file)
--- a/util.c
+++ b/util.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2008 Wayne Davison
+ * Copyright (C) 2003-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -806,7 +806,8 @@ int count_dir_elements(const char *p)
        return cnt;
 }
 
-/* Turns multiple adjacent slashes into a single slash, drops all leading or
+/* Turns multiple adjacent slashes into a single slash (possible exception:
+ * the preserving of two leading slashes at the start), drops all leading or
  * interior "." elements unless CFN_KEEP_DOT_DIRS is flagged.  Will also drop
  * a trailing '.' after a '/' if CFN_DROP_TRAILING_DOT_DIR is flagged, removes
  * a trailing slash (perhaps after removing the aforementioned dot) unless
@@ -821,9 +822,16 @@ unsigned int clean_fname(char *name, int flags)
        if (!name)
                return 0;
 
-       if ((anchored = *f == '/') != 0)
+       if ((anchored = *f == '/') != 0) {
                *t++ = *f++;
-       else if (flags & CFN_KEEP_DOT_DIRS && *f == '.' && f[1] == '/') {
+#ifdef __CYGWIN__
+               /* If there are exactly 2 slashes at the start, preserve
+                * them.  Would break daemon excludes unless the paths are
+                * really treated differently, so used this sparingly. */
+               if (*f == '/' && f[1] != '/')
+                       *t++ = *f++;
+#endif
+       } else if (flags & CFN_KEEP_DOT_DIRS && *f == '.' && f[1] == '/') {
                *t++ = *f++;
                *t++ = *f++;
        }
@@ -979,7 +987,10 @@ int change_dir(const char *dir, int set_path_only)
 
        if (!initialised) {
                initialised = 1;
-               getcwd(curr_dir, sizeof curr_dir - 1);
+               if (getcwd(curr_dir, sizeof curr_dir - 1) == NULL) {
+                       rsyserr(FERROR, errno, "getcwd()");
+                       exit_cleanup(RERR_FILESELECT);
+               }
                curr_dir_len = strlen(curr_dir);
        }
 
@@ -1025,6 +1036,34 @@ int change_dir(const char *dir, int set_path_only)
        return 1;
 }
 
+/* This will make a relative path absolute and clean it up via clean_fname().
+ * Returns the string, which might be newly allocated, or NULL on error. */
+char *normalize_path(char *path, BOOL force_newbuf, unsigned int *len_ptr)
+{
+       unsigned int len;
+
+       if (*path != '/') { /* Make path absolute. */
+               int len = strlen(path);
+               if (curr_dir_len + 1 + len >= sizeof curr_dir)
+                       return NULL;
+               curr_dir[curr_dir_len] = '/';
+               memcpy(curr_dir + curr_dir_len + 1, path, len + 1);
+               if (!(path = strdup(curr_dir)))
+                       out_of_memory("normalize_path");
+               curr_dir[curr_dir_len] = '\0';
+       } else if (force_newbuf) {
+               if (!(path = strdup(path)))
+                       out_of_memory("normalize_path");
+       }
+
+       len = clean_fname(path, CFN_COLLAPSE_DOT_DOT_DIRS | CFN_DROP_TRAILING_DOT_DIR);
+
+       if (len_ptr)
+               *len_ptr = len;
+
+       return path;
+}
+
 /**
  * Return a quoted string with the full pathname of the indicated filename.
  * The string " (in MODNAME)" may also be appended.  The returned pointer
@@ -1512,6 +1551,39 @@ int bitbag_next_bit(struct bitbag *bb, int after)
        return -1;
 }
 
+void flist_ndx_push(flist_ndx_list *lp, int ndx)
+{
+       struct flist_ndx_item *item;
+
+       if (!(item = new(struct flist_ndx_item)))
+               out_of_memory("flist_ndx_push");
+       item->next = NULL;
+       item->ndx = ndx;
+       if (lp->tail)
+               lp->tail->next = item;
+       else
+               lp->head = item;
+       lp->tail = item;
+}
+
+int flist_ndx_pop(flist_ndx_list *lp)
+{
+       struct flist_ndx_item *next;
+       int ndx;
+
+       if (!lp->head)
+               return -1;
+
+       ndx = lp->head->ndx;
+       next = lp->head->next;
+       free(lp->head);
+       lp->head = next;
+       if (!next)
+               lp->tail = NULL;
+
+       return ndx;
+}
+
 void *expand_item_list(item_list *lp, size_t item_size,
                       const char *desc, int incr)
 {