Call wildmatch(), not fnmatch().

[rsync/rsync.git] / token.c

diff --git a/token.c b/token.c
index 174f121..9f33436 100644 (file)
--- a/token.c
+++ b/token.c
@@ -51,7 +51,7 @@ void set_compression(char *fname)
        strlower(fname);
 
        for (tok=strtok(dont," ");tok;tok=strtok(NULL," ")) {
-               if (fnmatch(tok, fname, 0) == 0) {
+               if (wildmatch(tok, fname)) {
                        compression_level = 0;
                        break;
                }
@@ -127,6 +127,12 @@ static void simple_send_token(int f,int token,
 
 #define MAX_DATA_COUNT 16383   /* fit 14 bit count into 2 bytes with flags */
 
+/* zlib.h says that if we want to be able to compress something in a single
+ * call, avail_out must be at least 0.1% larger than avail_in plus 12 bytes.
+ * We'll add in 0.1%+16, just to be safe (and we'll avoid floating point,
+ * to ensure that this is a compile-time value). */
+#define AVAIL_OUT_SIZE(avail_in_size) ((avail_in_size)*1001/1000+16)
+
 /* For coding runs of tokens */
 static int last_token = -1;
 static int run_start;
@@ -138,6 +144,14 @@ static z_stream tx_strm;
 /* Output buffer */
 static char *obuf;
 
+/* We want obuf to be able to hold both MAX_DATA_COUNT+2 bytes as well as
+ * AVAIL_OUT_SIZE(CHUNK_SIZE) bytes, so make sure that it's large enough. */
+#if MAX_DATA_COUNT+2 > AVAIL_OUT_SIZE(CHUNK_SIZE)
+#define OBUF_SIZE      (MAX_DATA_COUNT+2)
+#else
+#define OBUF_SIZE      AVAIL_OUT_SIZE(CHUNK_SIZE)
+#endif
+
 /* Send a deflated token */
 static void
 send_deflated_token(int f, int token,
@@ -160,7 +174,7 @@ send_deflated_token(int f, int token,
                                rprintf(FERROR, "compression init failed\n");
                                exit_cleanup(RERR_STREAMIO);
                        }
-                       if ((obuf = malloc(MAX_DATA_COUNT+2)) == NULL)
+                       if ((obuf = malloc(OBUF_SIZE)) == NULL)
                                out_of_memory("send_deflated_token");
                        init_done = 1;
                } else
@@ -280,7 +294,7 @@ send_deflated_token(int f, int token,
                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 = MAX_DATA_COUNT;
+               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",
@@ -474,8 +488,8 @@ static void see_deflate_token(char *buf, int len)
        } while (len || rx_strm.avail_out == 0);
 }
 
-/*
- * transmit a verbatim buffer of length n followed by a token 
+/**
+ * Transmit a verbatim buffer of length @p n followed by a token.
  * If token == -1 then we have reached EOF 
  * If n == 0 then don't send a buffer
  */