Got rid of a debug-output statement.

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index 5c55ce4..327dd91 100644 (file)
--- a/util.c
+++ b/util.c
@@ -476,8 +476,7 @@ static int exclude_server_path(char *arg)
        if (server_exclude_list.head) {
                for (s = arg; (s = strchr(s, '/')) != NULL; ) {
                        *s = '\0';
-                       if (check_exclude(&server_exclude_list, arg, 1,
-                           "server pattern")) {
+                       if (check_exclude(&server_exclude_list, arg, 1) < 0) {
                                /* We must leave arg truncated! */
                                return 1;
                        }
@@ -786,9 +785,11 @@ char *alloc_sanitize_path(const char *path, const char *rootdir)
        char *buf;
        int rlen, plen = strlen(path);
 
-       if (*path == '/' && rootdir)
+       if (*path == '/' && rootdir) {
                rlen = strlen(rootdir);
-       else
+               if (rlen == 1)
+                       path++;
+       } else
                rlen = 0;
        if (!(buf = new_array(char, rlen + plen + 1)))
                out_of_memory("alloc_sanitize_path");
@@ -796,11 +797,14 @@ char *alloc_sanitize_path(const char *path, const char *rootdir)
                memcpy(buf, rootdir, rlen);
        memcpy(buf + rlen, path, plen + 1);
 
-       if (rlen)
+       if (rlen > 1)
                rlen++;
        sanitize_path(buf + rlen, NULL);
-       if (rlen && buf[rlen] == '.' && buf[rlen+1] == '\0')
-               buf[rlen-1] = '\0';
+       if (rlen && buf[rlen] == '.' && buf[rlen+1] == '\0') {
+               if (rlen > 1)
+                       rlen--;
+               buf[rlen] = '\0';
+       }
 
        return buf;
 }