CVS update: rsync

[Martin Pool]

Date:	Mon Aug  6 01:21:41 2001
Author:	mbp

Update of /data/cvs/rsync
In directory va:/tmp/cvs-serv26619

Modified Files:
      Tag: branch-merge-rsync+-2-4-7
	util.c token.c sender.c rsync.c proto.h options.c match.c 
	main.c flist.c compat.c Makefile.in 
Added Files:
      Tag: branch-merge-rsync+-2-4-7
	batch.c 
Log Message:
This time for sure :-): merge the rsync+ 2.4.6 patch onto the head.
The changes are just to accomodate other code which had been added in
conflicting regions, and to update the option-handling code to use
popt rather than getopt.


Revisions:
batch.c		NONE => 1.1.6.1
	http://www.samba.org/cgi-bin/cvsweb/rsync/batch.c?rev=1.1.6.1
util.c		1.89 => 1.89.4.1
	http://www.samba.org/cgi-bin/cvsweb/rsync/util.c?r1=1.89&r2=1.89.4.1
token.c		1.20 => 1.20.12.1
	http://www.samba.org/cgi-bin/cvsweb/rsync/token.c?r1=1.20&r2=1.20.12.1
sender.c		1.10 => 1.10.12.1
	http://www.samba.org/cgi-bin/cvsweb/rsync/sender.c?r1=1.10&r2=1.10.12.1
rsync.c		1.117 => 1.117.4.1
	http://www.samba.org/cgi-bin/cvsweb/rsync/rsync.c?r1=1.117&r2=1.117.4.1
proto.h		1.126 => 1.126.4.1
	http://www.samba.org/cgi-bin/cvsweb/rsync/proto.h?r1=1.126&r2=1.126.4.1
options.c		1.53 => 1.53.4.1
	http://www.samba.org/cgi-bin/cvsweb/rsync/options.c?r1=1.53&r2=1.53.4.1
match.c		1.45 => 1.45.12.1
	http://www.samba.org/cgi-bin/cvsweb/rsync/match.c?r1=1.45&r2=1.45.12.1
main.c		1.129 => 1.129.4.1
	http://www.samba.org/cgi-bin/cvsweb/rsync/main.c?r1=1.129&r2=1.129.4.1
flist.c		1.90 => 1.90.4.1
	http://www.samba.org/cgi-bin/cvsweb/rsync/flist.c?r1=1.90&r2=1.90.4.1
compat.c		1.14 => 1.14.4.1
	http://www.samba.org/cgi-bin/cvsweb/rsync/compat.c?r1=1.14&r2=1.14.4.1
Makefile.in		1.46 => 1.46.4.1
	http://www.samba.org/cgi-bin/cvsweb/rsync/Makefile.in?r1=1.46&r2=1.46.4.1