Tweaked some whitespace to match the latest version from autoconf.

[rsync/rsync.git] / token.c

diff --git a/token.c b/token.c
index 2c660c7..e504b46 100644 (file)
--- a/token.c
+++ b/token.c
@@ -22,46 +22,60 @@
 
 extern int do_compression;
 extern int module_id;
+extern int def_compress_level;
 
-static int compression_level = Z_DEFAULT_COMPRESSION;
+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 = Z_DEFAULT_COMPRESSION;
-       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';
        }
 
-       dont = strdup(dont);
-       fname = strdup(fname);
-       if (!dont || !fname)
+       compression_level = per_file_default_level;
+
+       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 */
@@ -262,16 +276,22 @@ send_deflated_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
        } else if (token != -2) {
                /* Add the data in the current block to the compressor's
                 * history and hash table. */
-               tx_strm.next_in = (Bytef *) map_ptr(buf, offset, toklen);
-               tx_strm.avail_in = toklen;
-               tx_strm.next_out = (Bytef *) obuf;
-               tx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
-               r = deflate(&tx_strm, Z_INSERT_ONLY);
-               if (r != Z_OK || tx_strm.avail_in != 0) {
-                       rprintf(FERROR, "deflate on token returned %d (%d bytes left)\n",
-                               r, tx_strm.avail_in);
-                       exit_cleanup(RERR_STREAMIO);
-               }
+               do {
+                       /* Break up long sections in the same way that
+                        * see_deflate_token() does. */
+                       int32 n1 = toklen > 0xffff ? 0xffff : toklen;
+                       toklen -= n1;
+                       tx_strm.next_in = (Bytef *)map_ptr(buf, offset, n1);
+                       tx_strm.avail_in = n1;
+                       tx_strm.next_out = (Bytef *) obuf;
+                       tx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
+                       r = deflate(&tx_strm, Z_INSERT_ONLY);
+                       if (r != Z_OK || tx_strm.avail_in != 0) {
+                               rprintf(FERROR, "deflate on token returned %d (%d bytes left)\n",
+                                       r, tx_strm.avail_in);
+                               exit_cleanup(RERR_STREAMIO);
+                       }
+               } while (toklen > 0);
        }
 }