New stubs to get the test setup to compile with the exclude changes.

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index 21ace4d..e5638f0 100644 (file)
--- a/util.c
+++ b/util.c
@@ -532,7 +532,8 @@ void glob_expand(char *base1, char **argv, int *argc, int maxargs)
 void strlower(char *s)
 {
        while (*s) {
-               if (isupper(*s)) *s = tolower(*s);
+               if (isupper(* (unsigned char *) s))
+                       *s = tolower(* (unsigned char *) s);
                s++;
        }
 }
@@ -792,49 +793,42 @@ int u_strcmp(const char *cs1, const char *cs2)
  *
  * @sa t_unsafe.c
  **/
-int unsafe_symlink(char *dest, char *src)
+int unsafe_symlink(const char *dest, const char *src)
 {
-       char *tok;
+       const char *name, *slash;
        int depth = 0;
 
        /* all absolute and null symlinks are unsafe */
-       if (!dest || !(*dest) || (*dest == '/')) return 1;
-
-       src = strdup(src);
-       if (!src) out_of_memory("unsafe_symlink");
+       if (!dest || !*dest || *dest == '/') return 1;
 
        /* find out what our safety margin is */
-       for (tok=strtok(src,"/"); tok; tok=strtok(NULL,"/")) {
-               if (strcmp(tok,"..") == 0) {
+       for (name = src; (slash = strchr(name, '/')) != 0; name = slash+1) {
+               if (strncmp(name, "../", 3) == 0) {
                        depth=0;
-               } else if (strcmp(tok,".") == 0) {
+               } else if (strncmp(name, "./", 2) == 0) {
                        /* nothing */
                } else {
                        depth++;
                }
        }
-       free(src);
-
-       /* drop by one to account for the filename portion */
-       depth--;
-
-       dest = strdup(dest);
-       if (!dest) out_of_memory("unsafe_symlink");
+       if (strcmp(name, "..") == 0)
+               depth = 0;
 
-       for (tok=strtok(dest,"/"); tok; tok=strtok(NULL,"/")) {
-               if (strcmp(tok,"..") == 0) {
-                       depth--;
-               } else if (strcmp(tok,".") == 0) {
+       for (name = dest; (slash = strchr(name, '/')) != 0; name = slash+1) {
+               if (strncmp(name, "../", 3) == 0) {
+                       /* if at any point we go outside the current directory
+                          then stop - it is unsafe */
+                       if (--depth < 0)
+                               return 1;
+               } else if (strncmp(name, "./", 2) == 0) {
                        /* nothing */
                } else {
                        depth++;
                }
-               /* if at any point we go outside the current directory then
-                  stop - it is unsafe */
-               if (depth < 0) break;
        }
+       if (strcmp(name, "..") == 0)
+               depth--;
 
-       free(dest);
        return (depth < 0);
 }