diff -u -r --new-file --exclude=CVS rsync-1.6.7/README rsync-1.6.8/README
--- rsync-1.6.7/README	Wed Dec 17 11:10:22 1997
+++ rsync-1.6.8/README	Sun Dec 28 22:28:17 1997
@@ -134,3 +134,4 @@
 
 ftp://sunsite.auc.dk/pub/unix/rsync
 ftp://ftp.sunet.se/pub/unix/admin/rsync
+ftp://ftp.fu-berlin.de/pub/unix/network/rsync/
diff -u -r --new-file --exclude=CVS rsync-1.6.7/cvs.log rsync-1.6.8/cvs.log
--- rsync-1.6.7/cvs.log	Wed Dec 17 11:19:11 1997
+++ rsync-1.6.8/cvs.log	Sun Dec 28 22:28:29 1997
@@ -456,3 +456,87 @@
 Log Message:
 preparing for release of 1.6.7
 
+
+****************************************
+Date:	Thursday December 18, 1997 @ 11:13
+Author:	tridge
+
+Update of /data/cvs/rsync
+In directory samba:/tmp/cvs-serv2870
+
+Modified Files:
+	README 
+Log Message:
+added a new mirror site to the README
+
+
+
+****************************************
+Date:	Thursday December 18, 1997 @ 11:18
+Author:	tridge
+
+Update of /data/cvs/rsync/lib
+In directory samba:/tmp/cvs-serv15987
+
+Modified Files:
+	zlib.c zlib.h 
+Log Message:
+following a report of problems with Linux/alpha I've changed zlib.c to
+use uint32 instead of "long" in several places. Apparently this fixes
+things on the alpha. The strange thing is that my own tests on a
+OSF/alpha box and a 64 bit IRIX box showed no problems. I wonder what
+was actually going wrong? I'll email the zlib maintainers and let them
+know.
+
+
+
+
+
+****************************************
+Date:	Sunday December 28, 1997 @ 22:13
+Author:	tridge
+
+Update of /data/cvs/rsync
+In directory samba:/tmp/cvs-serv20021
+
+Modified Files:
+	flist.c hlink.c main.c rsync.1 
+Log Message:
+- fixed spelling errors in man page
+
+- fixed bug in hard link handling that could lead to spurious hard
+links. 
+
+- fixed bug in the string handling in flist.c
+
+
+
+
+****************************************
+Date:	Sunday December 28, 1997 @ 22:26
+Author:	tridge
+
+Update of /data/cvs/rsync
+In directory samba:/tmp/cvs-serv23890
+
+Modified Files:
+	proto.h rsync.c 
+Log Message:
+- added a debug message
+
+- rebuilt prototypes
+
+
+
+****************************************
+Date:	Sunday December 28, 1997 @ 22:28
+Author:	rsync-bu
+
+Update of /data/cvs/rsync
+In directory samba:/data/people/rsync-bugs/rsync
+
+Modified Files:
+	version.h 
+Log Message:
+preparing for release of 1.6.8
+
diff -u -r --new-file --exclude=CVS rsync-1.6.7/flist.c rsync-1.6.8/flist.c
--- rsync-1.6.7/flist.c	Wed Dec 17 11:10:22 1997
+++ rsync-1.6.8/flist.c	Sun Dec 28 22:28:17 1997
@@ -634,10 +634,9 @@
 
     if (strncmp(p=name,"./",2) == 0) {      
       modified = 1;
-      while (*p) {
+      do {
 	p[0] = p[2];
-	p++;
-      }
+      } while (*p++);
     }
 
     l = strlen(p=name);
diff -u -r --new-file --exclude=CVS rsync-1.6.7/hlink.c rsync-1.6.8/hlink.c
--- rsync-1.6.7/hlink.c	Wed Dec 17 11:10:22 1997
+++ rsync-1.6.8/hlink.c	Sun Dec 28 22:28:17 1997
@@ -73,12 +73,12 @@
 {
 #if SUPPORT_HARD_LINKS
   int low=0,high=hlink_count-1;
-  int mid=0,ret=0;
+  int ret=0;
 
   if (!hlink_list || !S_ISREG(file->mode)) return 0;
 
   while (low != high) {
-    mid = (low+high)/2;
+    int mid = (low+high)/2;
     ret = hlink_compare(&hlink_list[mid],file);
     if (ret == 0) break;
     if (ret > 0) 
@@ -87,12 +87,12 @@
       low=mid+1;
   }
 
-  if (hlink_compare(&hlink_list[mid],file) != 0) return 0;
+  if (hlink_compare(&hlink_list[low],file) != 0) return 0;
 
-  if (mid > 0 &&
-      S_ISREG(hlink_list[mid-1].mode) &&
-      file->dev == hlink_list[mid-1].dev &&
-      file->inode == hlink_list[mid-1].inode)
+  if (low > 0 &&
+      S_ISREG(hlink_list[low-1].mode) &&
+      file->dev == hlink_list[low-1].dev &&
+      file->inode == hlink_list[low-1].inode)
     return 1;
 #endif
 
diff -u -r --new-file --exclude=CVS rsync-1.6.7/lib/zlib.c rsync-1.6.8/lib/zlib.c
--- rsync-1.6.7/lib/zlib.c	Tue Dec 16 18:18:38 1997
+++ rsync-1.6.8/lib/zlib.c	Sun Dec 28 22:28:17 1997
@@ -10,7 +10,7 @@
  * - added Z_PACKET_FLUSH (see zlib.h for details)
  * - added inflateIncomp
  *
- * $Id: zlib.c,v 1.7 1997/12/16 18:18:02 tridge Exp $
+ * $Id: zlib.c,v 1.8 1997/12/18 11:18:32 tridge Exp $
  */
 
 
@@ -252,7 +252,7 @@
      *   hash_shift * MIN_MATCH >= hash_bits
      */
 
-    long block_start;
+    Long block_start;
     /* Window position at the beginning of the current output block. Gets
      * negative when the window is moved backwards.
      */
@@ -1122,7 +1122,7 @@
             s->match_start -= wsize;
             s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
 
-            s->block_start -= (long) wsize;
+            s->block_start -= (Long) wsize;
 
             /* Slide the hash table (could be avoided with 32 bit values
                at the expense of memory usage):
@@ -1187,7 +1187,7 @@
 #define FLUSH_BLOCK_ONLY(s, flush) { \
    ct_flush_block(s, (s->block_start >= 0L ? \
            (charf *)&s->window[(unsigned)s->block_start] : \
-           (charf *)Z_NULL), (long)s->strstart - s->block_start, (flush)); \
+           (charf *)Z_NULL), (Long)s->strstart - s->block_start, (flush)); \
    s->block_start = s->strstart; \
    flush_pending(s->strm); \
    Tracev((stderr,"[FLUSH]")); \
@@ -1907,8 +1907,8 @@
             if (m > max_code) continue;
             if (tree[m].Len != (unsigned) bits) {
                 Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((long)bits - (long)tree[m].Len)
-                              *(long)tree[m].Freq;
+                s->opt_len += ((Long)bits - (Long)tree[m].Len)
+                              *(Long)tree[m].Freq;
                 tree[m].Len = (ush)bits;
             }
             n--;
@@ -4578,8 +4578,8 @@
     Bytef *buf;
     uInt len;
 {
-    unsigned long s1 = adler & 0xffff;
-    unsigned long s2 = (adler >> 16) & 0xffff;
+    uLong s1 = adler & 0xffff;
+    uLong s2 = (adler >> 16) & 0xffff;
     int k;
 
     if (buf == Z_NULL) return 1L;
diff -u -r --new-file --exclude=CVS rsync-1.6.7/lib/zlib.h rsync-1.6.8/lib/zlib.h
--- rsync-1.6.7/lib/zlib.h	Wed Oct  2 14:20:23 1996
+++ rsync-1.6.8/lib/zlib.h	Sun Dec 28 22:28:17 1997
@@ -1,4 +1,4 @@
-/*	$Id: zlib.h,v 1.2 1996/10/02 04:20:23 paulus Exp $	*/
+/*	$Id: zlib.h,v 1.3 1997/12/18 11:18:35 tridge Exp $	*/
 
 /*
  * This file is derived from zlib.h and zconf.h from the zlib-0.95
@@ -112,7 +112,8 @@
 
 typedef unsigned char  Byte;  /* 8 bits */
 typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
+typedef int32 Long; /* 32 bits or more */
+typedef uint32 uLong; /* 32 bits or more */
 
 typedef Byte FAR Bytef;
 typedef char FAR charf;
diff -u -r --new-file --exclude=CVS rsync-1.6.7/main.c rsync-1.6.8/main.c
--- rsync-1.6.7/main.c	Wed Dec 17 11:10:22 1997
+++ rsync-1.6.8/main.c	Sun Dec 28 22:28:17 1997
@@ -166,7 +166,7 @@
 
 
 
-int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
+static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
 {
   char *args[100];
   int i,argc=0, ret;
diff -u -r --new-file --exclude=CVS rsync-1.6.7/proto.h rsync-1.6.8/proto.h
--- rsync-1.6.7/proto.h	Wed Dec 17 11:10:22 1997
+++ rsync-1.6.8/proto.h	Sun Dec 28 22:28:17 1997
@@ -44,7 +44,6 @@
 void write_buf(int f,char *buf,int len);
 void write_byte(int f,unsigned char c);
 void write_flush(int f);
-int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out);
 void do_server_sender(int argc,char *argv[]);
 void do_server_recv(int argc,char *argv[]);
 int main(int argc,char *argv[]);
diff -u -r --new-file --exclude=CVS rsync-1.6.7/rsync.1 rsync-1.6.8/rsync.1
--- rsync-1.6.7/rsync.1	Wed Dec 17 11:10:22 1997
+++ rsync-1.6.8/rsync.1	Sun Dec 28 22:28:17 1997
@@ -84,7 +84,7 @@
 
 Here are some examples of how I use rsync.
 
-To backup my wifes home directory, which consists of large MS
+To backup my wife's home directory, which consists of large MS
 word files and mail folders I use a cron job that runs 
 
         rsync -Cavz . arvidsjaur:backup
@@ -333,7 +333,7 @@
 with a recursive transfer.
 
 The option FILE can either be a file name or a shell wildcard
-expression. If it is a directory name then rsycn will not recurse into
+expression. If it is a directory name then rsync will not recurse into
 directories of that name. 
 
 You may use as many --exclude options on the command line as you like
@@ -388,7 +388,7 @@
 --csum-length option. Any value less than or equal to 16 is valid.
 
 Note that if you use this option then you run the risk of ending up
-with a incorrect target file. The risk with a value of 16 is
+with an incorrect target file. The risk with a value of 16 is
 microscopic and can be safely ignored (the universe will probably end
 before it fails) but with smaller values the risk is higher.
 .RE
diff -u -r --new-file --exclude=CVS rsync-1.6.7/rsync.c rsync-1.6.8/rsync.c
--- rsync-1.6.7/rsync.c	Wed Dec 17 11:10:22 1997
+++ rsync-1.6.8/rsync.c	Sun Dec 28 22:28:17 1997
@@ -416,6 +416,7 @@
 
   if (fd == -1) {
     fprintf(FERROR,"failed to open %s : %s\n",fname,strerror(errno));
+    fprintf(FERROR,"skipping %s\n",fname);
     return;
   }
 
diff -u -r --new-file --exclude=CVS rsync-1.6.7/version.h rsync-1.6.8/version.h
--- rsync-1.6.7/version.h	Wed Dec 17 11:18:59 1997
+++ rsync-1.6.8/version.h	Sun Dec 28 22:28:19 1997
@@ -1 +1 @@
-#define VERSION "1.6.7"
+#define VERSION "1.6.8"