diff -u -r --new-file --exclude=CVS rsync-2.4.5/Makefile.in rsync-2.4.6/Makefile.in --- rsync-2.4.5/Makefile.in Sat Aug 19 23:10:39 2000 +++ rsync-2.4.6/Makefile.in Wed Sep 6 12:46:43 2000 @@ -9,6 +9,7 @@ LIBS=@LIBS@ CC=@CC@ CFLAGS=@CFLAGS@ +LDFLAGS=@LDFLAGS@ INSTALLCMD=@INSTALL@ diff -u -r --new-file --exclude=CVS rsync-2.4.5/README rsync-2.4.6/README --- rsync-2.4.5/README Tue Mar 16 08:23:10 1999 +++ rsync-2.4.6/README Wed Sep 6 12:46:43 2000 @@ -125,8 +125,7 @@ applications. It is open to anyone to join. I will announce new versions on this list. -To join the mailing list send mail to listproc@samba.org with -no subject and a body of "subscribe rsync Your Name". +To join the mailing list see the web page at http://lists.samba.org/ To send mail to everyone on the list send it to rsync@samba.org diff -u -r --new-file --exclude=CVS rsync-2.4.5/authenticate.c rsync-2.4.6/authenticate.c --- rsync-2.4.5/authenticate.c Sat Jan 29 22:35:03 2000 +++ rsync-2.4.6/authenticate.c Wed Sep 6 12:46:43 2000 @@ -135,7 +135,6 @@ static char *getpassf(char *filename) { char buffer[100]; - int len=0; int fd=0; STRUCT_STAT st; int ok = 1; @@ -170,7 +169,7 @@ if (envpw) rprintf(FERROR,"RSYNC_PASSWORD environment variable ignored\n"); buffer[sizeof(buffer)-1]='\0'; - if ( (len=read(fd,buffer,sizeof(buffer)-1)) > 0) + if (read(fd,buffer,sizeof(buffer)-1) > 0) { char *p = strtok(buffer,"\n\r"); close(fd); diff -u -r --new-file --exclude=CVS rsync-2.4.5/clientserver.c rsync-2.4.6/clientserver.c --- rsync-2.4.5/clientserver.c Sat Aug 19 23:10:39 2000 +++ rsync-2.4.6/clientserver.c Wed Sep 6 12:46:43 2000 @@ -38,6 +38,11 @@ extern int am_sender; extern struct in_addr socket_address; + if (argc == 0 && !am_sender) { + extern int list_only; + list_only = 1; + } + if (*path == '/') { rprintf(FERROR,"ERROR: The remote path must start with a module name\n"); return -1; diff -u -r --new-file --exclude=CVS rsync-2.4.5/configure rsync-2.4.6/configure --- rsync-2.4.5/configure Sat Jul 29 15:05:08 2000 +++ rsync-2.4.6/configure Wed Sep 6 12:46:43 2000 @@ -525,6 +525,7 @@ # compile with optimisation and without debugging by default CFLAGS=${CFLAGS-"-O"} +LDFLAGS=${LDFLAGS-""} ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do @@ -573,7 +574,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:577: checking host system type" >&5 +echo "configure:578: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -594,7 +595,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:598: checking target system type" >&5 +echo "configure:599: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -612,7 +613,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:616: checking build system type" >&5 +echo "configure:617: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -637,7 +638,7 @@ echo $ac_n "checking config.cache system type""... $ac_c" 1>&6 -echo "configure:641: checking config.cache system type" >&5 +echo "configure:642: checking config.cache system type" >&5 if { test x"${ac_cv_host_system_type+set}" = x"set" && test x"$ac_cv_host_system_type" != x"$host"; } || { test x"${ac_cv_build_system_type+set}" = x"set" && @@ -654,10 +655,46 @@ ac_cv_target_system_type="$target" +# look for getconf early as this affects just about everything +# Extract the first word of "getconf", so it can be a program name with args. +set dummy getconf; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:663: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_HAVE_GETCONF'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$HAVE_GETCONF"; then + ac_cv_prog_HAVE_GETCONF="$HAVE_GETCONF" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_HAVE_GETCONF="1" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_HAVE_GETCONF" && ac_cv_prog_HAVE_GETCONF="0" +fi +fi +HAVE_GETCONF="$ac_cv_prog_HAVE_GETCONF" +if test -n "$HAVE_GETCONF"; then + echo "$ac_t""$HAVE_GETCONF" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +if test $HAVE_GETCONF = 1; then + CFLAGS=$CFLAGS" "`getconf LFS_CFLAGS` + LDFLAGS=$LDFLAGS" "`getconf LFS_LDFLAGS` +fi + # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:661: checking for $ac_word" >&5 +echo "configure:698: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -687,7 +724,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:691: checking for $ac_word" >&5 +echo "configure:728: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -738,7 +775,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:742: checking for $ac_word" >&5 +echo "configure:779: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -770,7 +807,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:774: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -781,12 +818,12 @@ cat > conftest.$ac_ext << EOF -#line 785 "configure" +#line 822 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -812,12 +849,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:816: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:853: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:821: checking whether we are using GNU C" >&5 +echo "configure:858: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -826,7 +863,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -845,7 +882,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:849: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:886: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -888,7 +925,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:892: checking for a BSD compatible install" >&5 +echo "configure:929: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -942,10 +979,11 @@ + # Extract the first word of "remsh", so it can be a program name with args. set dummy remsh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:949: checking for $ac_word" >&5 +echo "configure:987: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_REMSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -978,14 +1016,14 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:982: checking whether byte ordering is bigendian" >&5 +echo "configure:1020: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -996,11 +1034,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:1000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -1011,7 +1049,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:1015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1031,7 +1069,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1072,12 +1110,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1076: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1114: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1085,7 +1123,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1110,7 +1148,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1114: checking for opendir in -ldir" >&5 +echo "configure:1152: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1118,7 +1156,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1151,7 +1189,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1155: checking for opendir in -lx" >&5 +echo "configure:1193: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1159,7 +1197,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1193,12 +1231,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1197: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1235: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1207,7 +1245,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1228,12 +1266,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1232: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1270: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1249,7 +1287,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1270,7 +1308,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1274: checking how to run the C preprocessor" >&5 +echo "configure:1312: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1285,13 +1323,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1302,13 +1340,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1319,13 +1357,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1353,17 +1391,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1357: checking for $ac_hdr" >&5 +echo "configure:1395: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1393,17 +1431,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1397: checking for $ac_hdr" >&5 +echo "configure:1435: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1433,17 +1471,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1437: checking for $ac_hdr" >&5 +echo "configure:1475: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1473,17 +1511,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1477: checking for $ac_hdr" >&5 +echo "configure:1515: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1511,7 +1549,7 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1515: checking size of int" >&5 +echo "configure:1553: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1519,7 +1557,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1530,7 +1568,7 @@ exit(0); } EOF -if { (eval echo configure:1534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -1550,7 +1588,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1554: checking size of long" >&5 +echo "configure:1592: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1558,7 +1596,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1569,7 +1607,7 @@ exit(0); } EOF -if { (eval echo configure:1573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -1589,7 +1627,7 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:1593: checking size of short" >&5 +echo "configure:1631: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1597,7 +1635,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1608,7 +1646,7 @@ exit(0); } EOF -if { (eval echo configure:1612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -1629,21 +1667,21 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1633: checking for inline" >&5 +echo "configure:1671: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1670,12 +1708,12 @@ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1674: checking return type of signal handlers" >&5 +echo "configure:1712: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1692,7 +1730,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:1696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1711,12 +1749,12 @@ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:1715: checking for uid_t in sys/types.h" >&5 +echo "configure:1753: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -1745,12 +1783,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1749: checking for ANSI C header files" >&5 +echo "configure:1787: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1758,7 +1796,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1775,7 +1813,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1793,7 +1831,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1814,7 +1852,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1825,7 +1863,7 @@ exit (0); } EOF -if { (eval echo configure:1829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1849,12 +1887,12 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:1853: checking for mode_t" >&5 +echo "configure:1891: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1882,12 +1920,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1886: checking for off_t" >&5 +echo "configure:1924: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1915,12 +1953,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1919: checking for size_t" >&5 +echo "configure:1957: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1948,12 +1986,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1952: checking for pid_t" >&5 +echo "configure:1990: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1981,7 +2019,7 @@ fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:1985: checking type of array argument to getgroups" >&5 +echo "configure:2023: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1989,7 +2027,7 @@ ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -2028,7 +2066,7 @@ if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -2052,12 +2090,12 @@ echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:2056: checking for st_rdev in struct stat" >&5 +echo "configure:2094: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2065,7 +2103,7 @@ struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:2069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -2086,12 +2124,12 @@ fi echo $ac_n "checking for ino_t""... $ac_c" 1>&6 -echo "configure:2090: checking for ino_t" >&5 +echo "configure:2128: checking for ino_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2120,20 +2158,20 @@ echo $ac_n "checking for errno in errno.h""... $ac_c" 1>&6 -echo "configure:2124: checking for errno in errno.h" >&5 +echo "configure:2162: checking for errno in errno.h" >&5 if eval "test \"`echo '$''{'rsync_cv_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { int i = errno ; return 0; } EOF -if { (eval echo configure:2137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rsync_cv_errno=yes else @@ -2164,12 +2202,12 @@ for ac_func in connect do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2168: checking for $ac_func" >&5 +echo "configure:2206: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2220,7 +2258,7 @@ case "$LIBS" in *-lnsl*) ;; *) echo $ac_n "checking for printf in -lnsl_s""... $ac_c" 1>&6 -echo "configure:2224: checking for printf in -lnsl_s" >&5 +echo "configure:2262: checking for printf in -lnsl_s" >&5 ac_lib_var=`echo nsl_s'_'printf | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2228,7 +2266,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2270,7 +2308,7 @@ case "$LIBS" in *-lnsl*) ;; *) echo $ac_n "checking for printf in -lnsl""... $ac_c" 1>&6 -echo "configure:2274: checking for printf in -lnsl" >&5 +echo "configure:2312: checking for printf in -lnsl" >&5 ac_lib_var=`echo nsl'_'printf | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2278,7 +2316,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2320,7 +2358,7 @@ case "$LIBS" in *-lsocket*) ;; *) echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2324: checking for connect in -lsocket" >&5 +echo "configure:2362: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2328,7 +2366,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2370,7 +2408,7 @@ case "$LIBS" in *-linet*) ;; *) echo $ac_n "checking for connect in -linet""... $ac_c" 1>&6 -echo "configure:2374: checking for connect in -linet" >&5 +echo "configure:2412: checking for connect in -linet" >&5 ac_lib_var=`echo inet'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2378,7 +2416,7 @@ ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2434,12 +2472,12 @@ for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2438: checking for $ac_func" >&5 +echo "configure:2476: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2488,7 +2526,7 @@ if test x"$ac_cv_func_strcasecmp" = x"no"; then echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:2492: checking for strcasecmp in -lresolv" >&5 +echo "configure:2530: checking for strcasecmp in -lresolv" >&5 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2496,7 +2534,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2537,7 +2575,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2541: checking for 8-bit clean memcmp" >&5 +echo "configure:2579: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2545,7 +2583,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2573,7 +2611,7 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:2577: checking whether utime accepts a null argument" >&5 +echo "configure:2615: checking whether utime accepts a null argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2583,7 +2621,7 @@ ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include @@ -2594,7 +2632,7 @@ && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:2598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_utime_null=yes else @@ -2620,12 +2658,12 @@ for ac_func in waitpid wait4 getcwd strdup strerror chown chmod mknod do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2624: checking for $ac_func" >&5 +echo "configure:2662: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2675,12 +2713,12 @@ for ac_func in fchmod fstat strchr readlink link utime utimes strftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2679: checking for $ac_func" >&5 +echo "configure:2717: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2730,12 +2768,12 @@ for ac_func in memmove lchown vsnprintf snprintf setsid glob strpbrk do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2734: checking for $ac_func" >&5 +echo "configure:2772: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2785,12 +2823,12 @@ for ac_func in strlcat strlcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2789: checking for $ac_func" >&5 +echo "configure:2827: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2839,7 +2877,7 @@ echo $ac_n "checking for working socketpair""... $ac_c" 1>&6 -echo "configure:2843: checking for working socketpair" >&5 +echo "configure:2881: checking for working socketpair" >&5 if eval "test \"`echo '$''{'rsync_cv_HAVE_SOCKETPAIR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2848,7 +2886,7 @@ rsync_cv_HAVE_SOCKETPAIR=cross else cat > conftest.$ac_ext < #include @@ -2857,7 +2895,7 @@ exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1); } EOF -if { (eval echo configure:2861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rsync_cv_HAVE_SOCKETPAIR=yes else @@ -2880,7 +2918,7 @@ fi echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 -echo "configure:2884: checking for working fnmatch" >&5 +echo "configure:2922: checking for working fnmatch" >&5 if eval "test \"`echo '$''{'rsync_cv_HAVE_FNMATCH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2889,13 +2927,13 @@ rsync_cv_HAVE_FNMATCH=cross else cat > conftest.$ac_ext < main() { exit((fnmatch("*.o", "x.o", FNM_PATHNAME) == 0 && fnmatch("a/b/*", "a/b/c/d", FNM_PATHNAME) != 0) ? 0: 1); } EOF -if { (eval echo configure:2899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rsync_cv_HAVE_FNMATCH=yes else @@ -2920,7 +2958,7 @@ # sometimes getopt_long cannot parse same arguments twice # e.g. on certain versions of CygWin32 echo $ac_n "checking for working getopt_long""... $ac_c" 1>&6 -echo "configure:2924: checking for working getopt_long" >&5 +echo "configure:2962: checking for working getopt_long" >&5 if eval "test \"`echo '$''{'rsync_cv_HAVE_GETOPT_LONG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2929,7 +2967,7 @@ rsync_cv_HAVE_GETOPT_LONG=cross else cat > conftest.$ac_ext < main() { @@ -2940,7 +2978,7 @@ exit(x == 2 ? 0 : 1); } EOF -if { (eval echo configure:2944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rsync_cv_HAVE_GETOPT_LONG=yes else @@ -2963,7 +3001,7 @@ fi echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:2967: checking for long long" >&5 +echo "configure:3005: checking for long long" >&5 if eval "test \"`echo '$''{'rsync_cv_HAVE_LONGLONG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2972,12 +3010,12 @@ rsync_cv_HAVE_LONGLONG=cross else cat > conftest.$ac_ext < main() { long long x = 1000000; x *= x; exit(((x/1000000) == 1000000)? 0: 1); } EOF -if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rsync_cv_HAVE_LONGLONG=yes else @@ -3000,7 +3038,7 @@ fi echo $ac_n "checking for off64_t""... $ac_c" 1>&6 -echo "configure:3004: checking for off64_t" >&5 +echo "configure:3042: checking for off64_t" >&5 if eval "test \"`echo '$''{'rsync_cv_HAVE_OFF64_T'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3009,13 +3047,13 @@ rsync_cv_HAVE_OFF64_T=cross else cat > conftest.$ac_ext < #include main() { struct stat64 st; off64_t s; if (sizeof(off_t) == sizeof(off64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); } EOF -if { (eval echo configure:3019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rsync_cv_HAVE_OFF64_T=yes else @@ -3038,7 +3076,7 @@ fi echo $ac_n "checking for short ino_t""... $ac_c" 1>&6 -echo "configure:3042: checking for short ino_t" >&5 +echo "configure:3080: checking for short ino_t" >&5 if eval "test \"`echo '$''{'rsync_cv_HAVE_SHORT_INO_T'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3047,14 +3085,14 @@ rsync_cv_HAVE_SHORT_INO_T=cross else cat > conftest.$ac_ext < #include #include main() { if (sizeof(ino_t) < sizeof(unsigned int)) return 0; return 1; } EOF -if { (eval echo configure:3058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rsync_cv_HAVE_SHORT_INO_T=yes else @@ -3077,7 +3115,7 @@ fi echo $ac_n "checking for unsigned char""... $ac_c" 1>&6 -echo "configure:3081: checking for unsigned char" >&5 +echo "configure:3119: checking for unsigned char" >&5 if eval "test \"`echo '$''{'rsync_cv_HAVE_UNSIGNED_CHAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3086,12 +3124,12 @@ rsync_cv_HAVE_UNSIGNED_CHAR=cross else cat > conftest.$ac_ext < main() { char c; c=250; exit((c > 0)?0:1); } EOF -if { (eval echo configure:3095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rsync_cv_HAVE_UNSIGNED_CHAR=yes else @@ -3114,7 +3152,7 @@ fi echo $ac_n "checking for broken readdir""... $ac_c" 1>&6 -echo "configure:3118: checking for broken readdir" >&5 +echo "configure:3156: checking for broken readdir" >&5 if eval "test \"`echo '$''{'rsync_cv_HAVE_BROKEN_READDIR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3123,7 +3161,7 @@ rsync_cv_HAVE_BROKEN_READDIR=cross else cat > conftest.$ac_ext < #include @@ -3131,7 +3169,7 @@ if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 && di->d_name[0] == 0) exit(0); exit(1);} EOF -if { (eval echo configure:3135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rsync_cv_HAVE_BROKEN_READDIR=yes else @@ -3154,13 +3192,13 @@ fi echo $ac_n "checking for utimbuf""... $ac_c" 1>&6 -echo "configure:3158: checking for utimbuf" >&5 +echo "configure:3196: checking for utimbuf" >&5 if eval "test \"`echo '$''{'rsync_cv_HAVE_UTIMBUF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3168,7 +3206,7 @@ struct utimbuf tbuf; tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf)); ; return 0; } EOF -if { (eval echo configure:3172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rsync_cv_HAVE_UTIMBUF=yes else @@ -3189,7 +3227,7 @@ fi echo $ac_n "checking if gettimeofday takes tz argument""... $ac_c" 1>&6 -echo "configure:3193: checking if gettimeofday takes tz argument" >&5 +echo "configure:3231: checking if gettimeofday takes tz argument" >&5 if eval "test \"`echo '$''{'rsync_cv_HAVE_GETTIMEOFDAY_TZ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3198,14 +3236,14 @@ rsync_cv_HAVE_GETTIMEOFDAY_TZ=cross else cat > conftest.$ac_ext < #include main() { struct timeval tv; exit(gettimeofday(&tv, NULL));} EOF -if { (eval echo configure:3209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes else @@ -3229,7 +3267,7 @@ echo $ac_n "checking for broken inet_ntoa""... $ac_c" 1>&6 -echo "configure:3233: checking for broken inet_ntoa" >&5 +echo "configure:3271: checking for broken inet_ntoa" >&5 if eval "test \"`echo '$''{'rsync_cv_REPLACE_INET_NTOA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3238,7 +3276,7 @@ rsync_cv_REPLACE_INET_NTOA=cross else cat > conftest.$ac_ext < @@ -3250,7 +3288,7 @@ strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(1); } exit(0);} EOF -if { (eval echo configure:3254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rsync_cv_REPLACE_INET_NTOA=no else @@ -3274,7 +3312,7 @@ echo $ac_n "checking for broken inet_aton""... $ac_c" 1>&6 -echo "configure:3278: checking for broken inet_aton" >&5 +echo "configure:3316: checking for broken inet_aton" >&5 if eval "test \"`echo '$''{'rsync_cv_REPLACE_INET_ATON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3283,7 +3321,7 @@ rsync_cv_REPLACE_INET_ATON=cross else cat > conftest.$ac_ext < @@ -3293,7 +3331,7 @@ main() { struct in_addr ip; if (inet_aton("example", &ip) == 0) exit(0); exit(1);} EOF -if { (eval echo configure:3297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rsync_cv_REPLACE_INET_ATON=no else @@ -3319,7 +3357,7 @@ # The following test was mostly taken from the tcl/tk plus patches # echo $ac_n "checking whether -c -o works""... $ac_c" 1>&6 -echo "configure:3323: checking whether -c -o works" >&5 +echo "configure:3361: checking whether -c -o works" >&5 if eval "test \"`echo '$''{'rsync_cv_DASHC_WORKS_WITH_DASHO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3502,6 +3540,7 @@ s%@build_cpu@%$build_cpu%g s%@build_vendor@%$build_vendor%g s%@build_os@%$build_os%g +s%@HAVE_GETCONF@%$HAVE_GETCONF%g s%@CC@%$CC%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g diff -u -r --new-file --exclude=CVS rsync-2.4.5/configure.in rsync-2.4.6/configure.in --- rsync-2.4.5/configure.in Sat Jul 29 15:05:08 2000 +++ rsync-2.4.6/configure.in Wed Sep 6 12:46:43 2000 @@ -4,14 +4,23 @@ # compile with optimisation and without debugging by default CFLAGS=${CFLAGS-"-O"} +LDFLAGS=${LDFLAGS-""} AC_CANONICAL_SYSTEM AC_VALIDATE_CACHE_SYSTEM_TYPE +# look for getconf early as this affects just about everything +AC_CHECK_PROG(HAVE_GETCONF, getconf, 1, 0) +if test $HAVE_GETCONF = 1; then + CFLAGS=$CFLAGS" "`getconf LFS_CFLAGS` + LDFLAGS=$LDFLAGS" "`getconf LFS_LDFLAGS` +fi + dnl Checks for programs. AC_PROG_CC AC_PROG_INSTALL AC_SUBST(SHELL) + AC_CHECK_PROG(HAVE_REMSH, remsh, 1, 0) AC_DEFINE_UNQUOTED(HAVE_REMSH, $HAVE_REMSH) diff -u -r --new-file --exclude=CVS rsync-2.4.5/cvs.log rsync-2.4.6/cvs.log --- rsync-2.4.5/cvs.log Sat Aug 19 23:11:03 2000 +++ rsync-2.4.6/cvs.log Wed Sep 6 12:47:09 2000 @@ -11731,3 +11731,219 @@ Log Message: preparing for release of 2.4.5 + +**************************************** +Date: Sunday August 20, 2000 @ 1:25 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv13278 + +Modified Files: + authenticate.c io.c loadparm.c main.c sender.c +Log Message: +got rid of some unused variables + + + +**************************************** +Date: Tuesday August 29, 2000 @ 14:45 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv13503 + +Modified Files: + exclude.c +Log Message: +a hack to make listing remote sites (by leaving off a target) more +useful + + + +**************************************** +Date: Tuesday August 29, 2000 @ 14:46 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv13185 + +Modified Files: + options.c +Log Message: +the 2nd half of the hack + + + +**************************************** +Date: Tuesday August 29, 2000 @ 14:46 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv15361 + +Modified Files: + main.c +Log Message: +detect list_only a bit earlier + + + + +**************************************** +Date: Tuesday August 29, 2000 @ 14:47 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv20265 + +Modified Files: + clientserver.c +Log Message: +detect list_only a bit earlier + + + + +**************************************** +Date: Tuesday August 29, 2000 @ 14:47 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv20108 + +Modified Files: + flist.c +Log Message: +some string_area cleanups + + + + + +**************************************** +Date: Tuesday August 29, 2000 @ 15:07 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv18883 + +Modified Files: + io.c +Log Message: +make sure we don't chew too much CPU when the outgoing fd is full + + + + + + +**************************************** +Date: Friday September 1, 2000 @ 9:01 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv18158 + +Modified Files: + flist.c +Log Message: +a simple fix to the memory problems with the string pool patch. The +string pools conflict with the lastdir memory saving tricks. + + + +**************************************** +Date: Wednesday September 6, 2000 @ 9:21 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv4900 + +Modified Files: + Makefile.in configure configure.in +Log Message: +added LFS support for Solaris 8 + + +**************************************** +Date: Wednesday September 6, 2000 @ 10:48 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv3410 + +Modified Files: + rsync.c +Log Message: +removed spurious error message + + +**************************************** +Date: Wednesday September 6, 2000 @ 11:27 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv25623 + +Modified Files: + rsync.yo +Log Message: +minor man page update + + + +**************************************** +Date: Wednesday September 6, 2000 @ 12:12 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv27503 + +Modified Files: + generator.c options.c proto.h rsync.1 rsync.c rsync.yo util.c +Log Message: +added --modify-window option from David Bolen + + + +**************************************** +Date: Wednesday September 6, 2000 @ 12:39 +Author: tridge + +Update of /data/cvs/rsync +In directory samba:/tmp/cvs-serv23497 + +Modified Files: + README +Log Message: +README update + + + + +**************************************** +Date: Wednesday September 6, 2000 @ 12:47 +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 2.4.6 + + +**************************************** +Date: Wednesday September 6, 2000 @ 12:47 +Author: rsync-bu + +Update of /data/cvs/rsync/packaging/redhat/5.0 +In directory samba:/data/people/rsync-bugs/rsync/packaging/redhat/5.0 + +Modified Files: + rsync.spec +Log Message: +preparing for release of 2.4.6 + diff -u -r --new-file --exclude=CVS rsync-2.4.5/exclude.c rsync-2.4.6/exclude.c --- rsync-2.4.5/exclude.c Sat Jan 29 22:35:03 2000 +++ rsync-2.4.6/exclude.c Wed Sep 6 12:46:43 2000 @@ -222,6 +222,12 @@ { int i; extern int remote_version; + extern int list_only, recurse; + + /* this is a complete hack - blame Rusty */ + if (list_only && !recurse) { + add_exclude("/*/*", 0); + } if (!exclude_list) { write_int(f,0); diff -u -r --new-file --exclude=CVS rsync-2.4.5/flist.c rsync-2.4.6/flist.c --- rsync-2.4.5/flist.c Sat Aug 19 23:10:39 2000 +++ rsync-2.4.6/flist.c Wed Sep 6 12:46:43 2000 @@ -55,7 +55,7 @@ static void clean_flist(struct file_list *flist, int strip_root); -struct string_area *string_area_new(int size) +static struct string_area *string_area_new(int size) { struct string_area *a; @@ -65,12 +65,12 @@ a->current = a->base = malloc(size); if (!a->current) out_of_memory("string_area_new buffer"); a->end = a->base + size; - a->next = 0; + a->next = NULL; return a; } -void string_area_free(struct string_area *a) +static void string_area_free(struct string_area *a) { struct string_area *next; @@ -80,7 +80,7 @@ } } -char *string_area_malloc(struct string_area **ap, int size) +static char *string_area_malloc(struct string_area **ap, int size) { char *p; struct string_area *a; @@ -100,7 +100,7 @@ return p; } -char *string_area_strdup(struct string_area **ap, const char *src) +static char *string_area_strdup(struct string_area **ap, const char *src) { char* dest = string_area_malloc(ap, strlen(src) + 1); return strcpy(dest, src); @@ -534,7 +534,7 @@ if (lastdir && strcmp(fname, lastdir)==0) { file->dirname = lastdir; } else { - file->dirname = STRDUP(ap, fname); + file->dirname = strdup(fname); lastdir = file->dirname; } file->basename = STRDUP(ap, p+1); @@ -579,7 +579,7 @@ if (lastdir && strcmp(lastdir, flist_dir)==0) { file->basedir = lastdir; } else { - file->basedir = STRDUP(ap, flist_dir); + file->basedir = strdup(flist_dir); lastdir = file->basedir; } } else { @@ -1015,7 +1015,7 @@ #if ARENA_SIZE > 0 flist->string_area = string_area_new(0); #else - flist->string_area = 0; + flist->string_area = NULL; #endif return flist; } diff -u -r --new-file --exclude=CVS rsync-2.4.5/generator.c rsync-2.4.6/generator.c --- rsync-2.4.5/generator.c Sat Aug 19 23:10:39 2000 +++ rsync-2.4.6/generator.c Wed Sep 6 12:46:43 2000 @@ -35,6 +35,7 @@ extern int io_timeout; extern int remote_version; extern int always_checksum; +extern int modify_window; extern char *compare_dest; @@ -75,7 +76,7 @@ return 0; } - return (st->st_mtime == file->modtime); + return (cmp_modtime(st->st_mtime,file->modtime) == 0); } @@ -343,7 +344,7 @@ return; } - if (update_only && st.st_mtime > file->modtime && fnamecmp == fname) { + if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) { if (verbose > 1) rprintf(FINFO,"%s is newer\n",fname); return; diff -u -r --new-file --exclude=CVS rsync-2.4.5/io.c rsync-2.4.6/io.c --- rsync-2.4.5/io.c Sat Jul 29 15:05:08 2000 +++ rsync-2.4.6/io.c Wed Sep 6 12:46:43 2000 @@ -39,16 +39,10 @@ extern int io_timeout; extern struct stats stats; -static int buffer_f_in = -1; static int io_error_fd = -1; static void read_loop(int fd, char *buf, int len); -void setup_readbuffer(int f_in) -{ - buffer_f_in = f_in; -} - static void check_timeout(void) { extern int am_server, am_daemon; @@ -323,11 +317,7 @@ return c; } - - -/* write len bytes to fd, possibly reading from buffer_f_in if set - in order to unclog the pipe. don't return until all len - bytes have been written */ +/* write len bytes to fd */ static void writefd_unbuffered(int fd,char *buf,int len) { int total = 0; @@ -382,6 +372,7 @@ if (ret == -1 && (errno == EWOULDBLOCK || errno == EAGAIN)) { + msleep(1); continue; } @@ -473,6 +464,17 @@ } } +/* some OSes have a bug where an exit causes the pending writes on + a socket to be flushed. Do an explicit shutdown to try to prevent this */ +void io_shutdown(void) +{ + if (multiplex_out_fd != -1) close(multiplex_out_fd); + if (io_error_fd != -1) close(io_error_fd); + multiplex_out_fd = -1; + io_error_fd = -1; +} + + static void writefd(int fd,char *buf,int len) { stats.total_written += len; @@ -621,10 +623,5 @@ void io_multiplexing_close(void) { io_multiplexing_out = 0; -} - -void io_close_input(int fd) -{ - buffer_f_in = -1; } diff -u -r --new-file --exclude=CVS rsync-2.4.5/loadparm.c rsync-2.4.6/loadparm.c --- rsync-2.4.5/loadparm.c Sat Aug 19 23:10:39 2000 +++ rsync-2.4.6/loadparm.c Wed Sep 6 12:46:43 2000 @@ -77,8 +77,6 @@ unsigned flags; }; -static BOOL bLoaded = False; - #ifndef GLOBAL_NAME #define GLOBAL_NAME "global" #endif @@ -734,8 +732,6 @@ iServiceIndex = -1; bRetval = pm_process(n2, globals_only?NULL:do_section, do_parameter); - bLoaded = True; - return (bRetval); } diff -u -r --new-file --exclude=CVS rsync-2.4.5/main.c rsync-2.4.6/main.c --- rsync-2.4.5/main.c Sat Aug 19 23:10:39 2000 +++ rsync-2.4.6/main.c Wed Sep 6 12:46:43 2000 @@ -349,14 +349,13 @@ close(recv_pipe[1]); io_flush(); /* finally we go to sleep until our parent kills us - with a USR2 signal. We sleepp for a short time as on + with a USR2 signal. We sleep for a short time as on some OSes a signal won't interrupt a sleep! */ - while (1) sleep(1); + while (1) msleep(20); } close(recv_pipe[1]); close(error_pipe[1]); - io_close_input(f_in); if (f_in != f_out) close(f_in); io_start_buffering(f_out); @@ -465,7 +464,6 @@ int status = 0, status2 = 0; char *local_name = NULL; extern int am_sender; - extern int list_only; extern int remote_version; set_nonblocking(f_in); @@ -503,7 +501,10 @@ exit_cleanup(status); } - if (argc == 0) list_only = 1; + if (argc == 0) { + extern int list_only; + list_only = 1; + } send_exclude_list(f_out); @@ -640,6 +641,11 @@ if (!am_sender && argc > 1) { usage(FERROR); exit_cleanup(RERR_SYNTAX); + } + + if (argc == 0 && !am_sender) { + extern int list_only; + list_only = 1; } pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out); diff -u -r --new-file --exclude=CVS rsync-2.4.5/options.c rsync-2.4.6/options.c --- rsync-2.4.5/options.c Sat Jul 29 15:05:08 2000 +++ rsync-2.4.6/options.c Wed Sep 6 12:46:43 2000 @@ -67,6 +67,11 @@ int only_existing=0; int max_delete=0; int ignore_errors=0; +#ifdef _WIN32 +int modify_window=2; +#else +int modify_window=0; +#endif int blocking_io=0; char *backup_suffix = BACKUP_SUFFIX; @@ -85,6 +90,9 @@ int always_checksum = 0; int list_only = 0; +static int modify_window_set; + + struct in_addr socket_address = {INADDR_ANY}; void usage(enum logcode F) @@ -144,6 +152,7 @@ rprintf(F," --timeout=TIME set IO timeout in seconds\n"); rprintf(F," -I, --ignore-times don't exclude files that match length and time\n"); rprintf(F," --size-only only use file size when determining if a file should be transferred\n"); + rprintf(F," --modify-window=NUM Timestamp window (seconds) for file match (default=%d)\n",modify_window); rprintf(F," -T --temp-dir=DIR create temporary files in directory DIR\n"); rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); rprintf(F," -P equivalent to --partial --progress\n"); @@ -178,7 +187,8 @@ OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS, OPT_COMPARE_DEST, OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS, OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR, - OPT_IGNORE_ERRORS, OPT_BWLIMIT, OPT_BLOCKING_IO}; + OPT_IGNORE_ERRORS, OPT_BWLIMIT, OPT_BLOCKING_IO, + OPT_MODIFY_WINDOW}; static char *short_options = "oblLWHpguDCtcahvqrRIxnSe:B:T:zP"; @@ -200,6 +210,7 @@ {"one-file-system",0, 0, 'x'}, {"ignore-times",0, 0, 'I'}, {"size-only", 0, 0, OPT_SIZE_ONLY}, + {"modify-window",1, 0, OPT_MODIFY_WINDOW}, {"help", 0, 0, 'h'}, {"dry-run", 0, 0, 'n'}, {"sparse", 0, 0, 'S'}, @@ -331,6 +342,11 @@ size_only = 1; break; + case OPT_MODIFY_WINDOW: + modify_window = atoi(optarg); + modify_window_set = 1; + break; + case 'x': one_file_system=1; break; @@ -598,6 +614,7 @@ static char bsize[30]; static char iotime[30]; static char mdelete[30]; + static char mwindow[30]; static char bw[50]; int i, x; @@ -611,6 +628,7 @@ argstr[0] = '-'; for (i=0;i BuildRoot: /tmp/rsync diff -u -r --new-file --exclude=CVS rsync-2.4.5/proto.h rsync-2.4.6/proto.h --- rsync-2.4.5/proto.h Sat Aug 19 23:10:39 2000 +++ rsync-2.4.6/proto.h Wed Sep 6 12:46:43 2000 @@ -39,10 +39,6 @@ struct map_struct *map_file(int fd,OFF_T len); char *map_ptr(struct map_struct *map,OFF_T offset,int len); void unmap_file(struct map_struct *map); -struct string_area *string_area_new(int size); -void string_area_free(struct string_area *a); -char *string_area_malloc(struct string_area **ap, int size); -char *string_area_strdup(struct string_area **ap, const char *src); int readlink_stat(const char *Path, STRUCT_STAT *Buffer, char *Linkbuf) ; int link_stat(const char *Path, STRUCT_STAT *Buffer) ; struct file_struct *make_file(int f, char *fname, struct string_area **ap, @@ -62,7 +58,6 @@ void init_hard_links(struct file_list *flist); int check_hard_link(struct file_struct *file); void do_hard_links(struct file_list *flist); -void setup_readbuffer(int f_in); void io_set_error_fd(int fd); int32 read_int(int f); int64 read_longint(int f); @@ -72,6 +67,7 @@ void io_start_buffering(int fd); void io_flush(void); void io_end_buffering(int fd); +void io_shutdown(void); void write_int(int f,int32 x); void write_longint(int f, int64 x); void write_buf(int f,char *buf,int len); @@ -83,7 +79,6 @@ int io_multiplex_write(enum logcode code, char *buf, int len); int io_error_write(int f, enum logcode code, char *buf, int len); void io_multiplexing_close(void); -void io_close_input(int fd); char *lp_motd_file(void); char *lp_log_file(void); char *lp_pid_file(void); @@ -214,5 +209,6 @@ int unsafe_symlink(char *dest, char *src); char *timestring(time_t t); void msleep(int t); +int cmp_modtime(time_t file1, time_t file2); int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6); int sys_gettimeofday(struct timeval *tv); diff -u -r --new-file --exclude=CVS rsync-2.4.5/rsync.1 rsync-2.4.6/rsync.1 --- rsync-2.4.5/rsync.1 Sat Aug 19 23:10:39 2000 +++ rsync-2.4.6/rsync.1 Wed Sep 6 12:46:43 2000 @@ -252,7 +252,7 @@ -r, --recursive recurse into directories -R, --relative use relative path names -b, --backup make backups (default ~ suffix) - --backup-dir=DIR put backups in the specified directory + --backup-dir make backups into this directory --suffix=SUFFIX override backup suffix -u, --update update only (don\'t overwrite newer files) -l, --links preserve soft links @@ -285,6 +285,7 @@ --timeout=TIME set IO timeout in seconds -I, --ignore-times don\'t exclude files that match length and time --size-only only use file size when determining if a file should be transferred + --modify-window=NUM Timestamp window (seconds) for file match (default=0) -T --temp-dir=DIR create temporary files in directory DIR --compare-dest=DIR also compare destination files relative to DIR -P equivalent to --partial --progress @@ -353,6 +354,14 @@ after using another mirroring system which may not preserve timestamps exactly\&. .IP +.IP "\fB--modify-window\fP" +When comparing two timestamps rsync treats +the timestamps as being equal if they are within the value of +modify_window\&. This is normally zero, but you may find it useful to +set this to a larger value in some situations\&. In particular, when +transferring to/from FAT filesystems which cannot represent times with +a 1 second resolution this option is useful\&. +.IP .IP "\fB-c, --checksum\fP" This forces the sender to checksum all files using a 128-bit MD4 checksum before transfer\&. The checksum is then @@ -579,9 +588,9 @@ .IP .IP "\fB--exclude-from=FILE\fP" This option is similar to the --exclude -option, but instead it adds all filenames listed in the file FILE to -the exclude list\&. Blank lines in FILE and lines starting with \';\' or \'#\' -are ignored\&. +option, but instead it adds all exclude patterns listed in the file +FILE to the exclude list\&. Blank lines in FILE and lines starting with +\';\' or \'#\' are ignored\&. .IP .IP "\fB--include=PATTERN\fP" This option tells rsync to not exclude the diff -u -r --new-file --exclude=CVS rsync-2.4.5/rsync.c rsync-2.4.6/rsync.c --- rsync-2.4.5/rsync.c Sat Jan 29 22:35:03 2000 +++ rsync-2.4.6/rsync.c Wed Sep 6 12:46:43 2000 @@ -43,7 +43,7 @@ /* - * delete a file or directory. If force_delet is set then delete + * delete a file or directory. If force_delete is set then delete * recursively */ int delete_file(char *fname) @@ -62,7 +62,6 @@ ret = do_stat(fname, &st); #endif if (ret) { - rprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno)); return -1; } @@ -163,7 +162,7 @@ } if (preserve_times && !S_ISLNK(st->st_mode) && - st->st_mtime != file->modtime) { + cmp_modtime(st->st_mtime, file->modtime) != 0) { /* don't complain about not setting times on directories because some filesystems can't do it */ if (set_modtime(fname,file->modtime) != 0 && diff -u -r --new-file --exclude=CVS rsync-2.4.5/rsync.yo rsync-2.4.6/rsync.yo --- rsync-2.4.5/rsync.yo Sat Jul 29 15:05:08 2000 +++ rsync-2.4.6/rsync.yo Wed Sep 6 12:46:43 2000 @@ -223,7 +223,7 @@ -r, --recursive recurse into directories -R, --relative use relative path names -b, --backup make backups (default ~ suffix) - --backup-dir=DIR put backups in the specified directory + --backup-dir make backups into this directory --suffix=SUFFIX override backup suffix -u, --update update only (don't overwrite newer files) -l, --links preserve soft links @@ -256,6 +256,7 @@ --timeout=TIME set IO timeout in seconds -I, --ignore-times don't exclude files that match length and time --size-only only use file size when determining if a file should be transferred + --modify-window=NUM Timestamp window (seconds) for file match (default=0) -T --temp-dir=DIR create temporary files in directory DIR --compare-dest=DIR also compare destination files relative to DIR -P equivalent to --partial --progress @@ -316,6 +317,13 @@ after using another mirroring system which may not preserve timestamps exactly. +dit(bf(--modify-window)) When comparing two timestamps rsync treats +the timestamps as being equal if they are within the value of +modify_window. This is normally zero, but you may find it useful to +set this to a larger value in some situations. In particular, when +transferring to/from FAT filesystems which cannot represent times with +a 1 second resolution this option is useful. + dit(bf(-c, --checksum)) This forces the sender to checksum all files using a 128-bit MD4 checksum before transfer. The checksum is then explicitly checked on the receiver and any files of the same name @@ -497,9 +505,9 @@ this option. dit(bf(--exclude-from=FILE)) This option is similar to the --exclude -option, but instead it adds all filenames listed in the file FILE to -the exclude list. Blank lines in FILE and lines starting with ';' or '#' -are ignored. +option, but instead it adds all exclude patterns listed in the file +FILE to the exclude list. Blank lines in FILE and lines starting with +';' or '#' are ignored. dit(bf(--include=PATTERN)) This option tells rsync to not exclude the specified pattern of filenames. This is useful as it allows you to diff -u -r --new-file --exclude=CVS rsync-2.4.5/sender.c rsync-2.4.6/sender.c --- rsync-2.4.5/sender.c Sat Jan 29 22:35:03 2000 +++ rsync-2.4.6/sender.c Wed Sep 6 12:46:43 2000 @@ -97,8 +97,6 @@ if (verbose > 2) rprintf(FINFO,"send_files starting\n"); - setup_readbuffer(f_in); - while (1) { int offset=0; diff -u -r --new-file --exclude=CVS rsync-2.4.5/util.c rsync-2.4.6/util.c --- rsync-2.4.5/util.c Sat Aug 19 23:10:39 2000 +++ rsync-2.4.6/util.c Wed Sep 6 12:46:43 2000 @@ -955,7 +955,27 @@ } -#ifdef __INSURE__ +/******************************************************************* + Determine if two file modification times are equivalent (either exact + or in the modification timestamp window established by --modify-window) + Returns 0 if the times should be treated as the same, 1 if the + first is later and -1 if the 2nd is later + *******************************************************************/ +int cmp_modtime(time_t file1, time_t file2) +{ + time_t diff; + extern int modify_window; + + if (file2 > file1) { + if (file2 - file1 <= modify_window) return 0; + return -1; + } + if (file1 - file2 <= modify_window) return 0; + return 1; +} + + +#ifdef __INSURE__XX #include /******************************************************************* diff -u -r --new-file --exclude=CVS rsync-2.4.5/version.h rsync-2.4.6/version.h --- rsync-2.4.5/version.h Sat Aug 19 23:10:55 2000 +++ rsync-2.4.6/version.h Wed Sep 6 12:46:58 2000 @@ -1 +1 @@ -#define VERSION "2.4.5" +#define VERSION "2.4.6"