Clumped some option-sending together that only happens on the sending side.

[rsync/rsync.git] / token.c

diff --git a/token.c b/token.c
index e504b46..395fb05 100644 (file)
--- a/token.c
+++ b/token.c
@@ -1,21 +1,23 @@
 /*
-   Copyright (C) Andrew Tridgell 1996
-   Copyright (C) Paul Mackerras 1996
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+ * Routines used by the file-transfer code.
+ *
+ * Copyright (C) 1996 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2003-2007 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
 #include "rsync.h"
 #include "zlib/zlib.h"
@@ -46,8 +48,8 @@ void set_compression(char *fname)
                                continue;
                        }
                        do {
-                               if (isupper(*(unsigned char *)f))
-                                       *t++ = tolower(*(unsigned char *)f);
+                               if (isUpper(f))
+                                       *t++ = toLower(f);
                                else
                                        *t++ = *f;
                        } while (*++f != ' ' && *f);
@@ -105,7 +107,6 @@ static int32 simple_recv_token(int f, char **data)
        return n;
 }
 
-
 /* non-compressing send token */
 static void simple_send_token(int f, int32 token, struct map_struct *buf,
                              OFF_T offset, int32 n)
@@ -124,7 +125,6 @@ static void simple_send_token(int f, int32 token, struct map_struct *buf,
                write_int(f, -(token+1));
 }
 
-
 /* Flag bytes in compressed stream are encoded as follows: */
 #define END_FLAG       0       /* that's all folks */
 #define TOKEN_LONG     0x20    /* followed by 32-bit token number */
@@ -188,10 +188,8 @@ send_deflated_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
                last_run_end = 0;
                run_start = token;
                flush_pending = 0;
-
        } else if (last_token == -2) {
                run_start = token;
-
        } else if (nb != 0 || token != last_token + 1
                   || token >= run_start + 65536) {
                /* output previous run */
@@ -295,7 +293,6 @@ send_deflated_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
        }
 }
 
-
 /* tells us what the receiver is in the middle of doing */
 static enum { r_init, r_idle, r_running, r_inflating, r_inflated } recv_state;
 
@@ -494,7 +491,6 @@ void send_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
                send_deflated_token(f, token, buf, offset, n, toklen);
 }
 
-
 /*
  * receive a token or buffer from the other end. If the reurn value is >0 then
  * it is a data buffer of that length, and *data will point at the data.