Optimized set_compression() to remove the per-file strdup(), strlower(),

[rsync/rsync.git] / token.c

diff --git a/token.c b/token.c
index 8ce73ba..e504b46 100644 (file)
--- a/token.c
+++ b/token.c
@@ -24,48 +24,58 @@ extern int do_compression;
 extern int module_id;
 extern int def_compress_level;
 
-static int compression_level;
+static int compression_level, per_file_default_level;
 
 /* determine the compression level based on a wildcard filename list */
 void set_compression(char *fname)
 {
-       char *dont;
-       char *tok;
+       static char *match_list;
+       char *s;
 
        if (!do_compression)
                return;
 
-       compression_level = def_compress_level;
-       dont = lp_dont_compress(module_id);
-
-       if (!dont || !*dont)
-               return;
-
-       if (dont[0] == '*' && !dont[1]) {
-               /* an optimization to skip the rest of this routine */
-               compression_level = 0;
-               return;
+       if (!match_list) {
+               char *t, *f = lp_dont_compress(module_id);
+               int len = strlen(f);
+               if (!(match_list = t = new_array(char, len + 2)))
+                       out_of_memory("set_compression");
+               while (*f) {
+                       if (*f == ' ') {
+                               f++;
+                               continue;
+                       }
+                       do {
+                               if (isupper(*(unsigned char *)f))
+                                       *t++ = tolower(*(unsigned char *)f);
+                               else
+                                       *t++ = *f;
+                       } while (*++f != ' ' && *f);
+                       *t++ = '\0';
+               }
+               /* Optimize a match-string of "*". */
+               if (t - match_list == 2 && match_list[0] == '*') {
+                       t = match_list;
+                       per_file_default_level = 0;
+               } else
+                       per_file_default_level = def_compress_level;
+               *t++ = '\0';
        }
 
-       if ((tok = strrchr(fname, '/')) != NULL)
-               fname = tok + 1;
+       compression_level = per_file_default_level;
 
-       dont = strdup(dont);
-       fname = strdup(fname);
-       if (!dont || !fname)
+       if (!*match_list)
                return;
 
-       strlower(dont);
-       strlower(fname);
+       if ((s = strrchr(fname, '/')) != NULL)
+               fname = s + 1;
 
-       for (tok = strtok(dont, " "); tok; tok = strtok(NULL, " ")) {
-               if (wildmatch(tok, fname)) {
+       for (s = match_list; *s; s += strlen(s) + 1) {
+               if (iwildmatch(s, fname)) {
                        compression_level = 0;
                        break;
                }
        }
-       free(dont);
-       free(fname);
 }
 
 /* non-compressing recv token */