Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mention more output changes.
[rsync/rsync.git]
/
token.c
diff --git
a/token.c
b/token.c
index
b3621b9
..
75d2b17
100644
(file)
--- a/
token.c
+++ b/
token.c
@@
-45,12
+45,12
@@
static void add_suffix(struct suffix_tree **prior, char ltr, const char *str)
if (ltr == '[') {
const char *after = strchr(str, ']');
if (ltr == '[') {
const char *after = strchr(str, ']');
- /* Just skip bogus character classes. */
- if (!after++)
+ /* Treat "[foo" and "[]" as having a literal '['. */
+ if (after && after++ != str+1) {
+ while ((ltr = *str++) != ']')
+ add_suffix(prior, ltr, after);
return;
return;
- while ((ltr = *str++) != ']')
- add_suffix(prior, ltr, after);
- return;
+ }
}
for (node = *prior; node; prior = &node->sibling, node = node->sibling) {
}
for (node = *prior; node; prior = &node->sibling, node = node->sibling) {
@@
-100,7
+100,6
@@
static void add_nocompress_suffixes(const char *str)
} while (*++f != '/' && *f);
*t++ = '\0';
} while (*++f != '/' && *f);
*t++ = '\0';
- fprintf(stderr, "adding `%s'\n", buf);
add_suffix(&suftree, *buf, buf+1);
}
add_suffix(&suftree, *buf, buf+1);
}
@@
-193,6
+192,8
@@
void set_compression(const char *fname)
return;
while (1) {
return;
while (1) {
+ if (isUpper(<r))
+ ltr = toLower(<r);
while (node->letter != ltr) {
if (node->letter > ltr)
return;
while (node->letter != ltr) {
if (node->letter > ltr)
return;
@@
-307,7
+308,7
@@
send_deflated_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
Z_DEFLATED, -15, 8,
Z_DEFAULT_STRATEGY) != Z_OK) {
rprintf(FERROR, "compression init failed\n");
Z_DEFLATED, -15, 8,
Z_DEFAULT_STRATEGY) != Z_OK) {
rprintf(FERROR, "compression init failed\n");
- exit_cleanup(RERR_
STREAMIO
);
+ exit_cleanup(RERR_
PROTOCOL
);
}
if ((obuf = new_array(char, OBUF_SIZE)) == NULL)
out_of_memory("send_deflated_token");
}
if ((obuf = new_array(char, OBUF_SIZE)) == NULL)
out_of_memory("send_deflated_token");
@@
-451,7
+452,7
@@
static int32 recv_deflated_token(int f, char **data)
rx_strm.zfree = NULL;
if (inflateInit2(&rx_strm, -15) != Z_OK) {
rprintf(FERROR, "inflate init failed\n");
rx_strm.zfree = NULL;
if (inflateInit2(&rx_strm, -15) != Z_OK) {
rprintf(FERROR, "inflate init failed\n");
- exit_cleanup(RERR_
STREAMIO
);
+ exit_cleanup(RERR_
PROTOCOL
);
}
if (!(cbuf = new_array(char, MAX_DATA_COUNT))
|| !(dbuf = new_array(char, AVAIL_OUT_SIZE(CHUNK_SIZE))))
}
if (!(cbuf = new_array(char, MAX_DATA_COUNT))
|| !(dbuf = new_array(char, AVAIL_OUT_SIZE(CHUNK_SIZE))))
@@
-599,7
+600,7
@@
static void see_deflate_token(char *buf, int32 len)
rx_strm.next_out = (Bytef *)dbuf;
rx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
r = inflate(&rx_strm, Z_SYNC_FLUSH);
rx_strm.next_out = (Bytef *)dbuf;
rx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
r = inflate(&rx_strm, Z_SYNC_FLUSH);
- if (r != Z_OK) {
+ if (r != Z_OK
&& r != Z_BUF_ERROR
) {
rprintf(FERROR, "inflate (token) returned %d\n", r);
exit_cleanup(RERR_STREAMIO);
}
rprintf(FERROR, "inflate (token) returned %d\n", r);
exit_cleanup(RERR_STREAMIO);
}