diff --git a/NEWS b/NEWS index 40b7019..8510288 100644 --- a/NEWS +++ b/NEWS @@ -1,138 +1,56 @@ -NEWS for rsync 3.0.8 (26 Mar 2011) +NEWS for rsync 3.0.9 (23 Sep 2011) Protocol: 30 (unchanged) -Changes since 3.0.7: +Changes since 3.0.8: BUG FIXES: - - Fixed two buffer-overflow issues: one where a directory path that is - exactly MAXPATHLEN was not handled correctly, and one handling a - --backup-dir that is extra extra large. + - Fix a crash bug in checksum scanning when --inplace is used. - - Fixed a data-corruption issue when preserving hard-links without - preserving file ownership, and doing deletions either before or during - the transfer (CVE-2011-1097). This fixes some assert errors in the - hard-linking code, and some potential failed checksums (via -c) that - should have matched. + - Fix a hang if a hard-linked file cannot be opened by the sender (e.g. + if it has no read permission). - - Fixed a potential crash when an rsync daemon has a filter/exclude list - and the transfer is using ACLs or xattrs. + - Fix preservation of a symlink's system xattrs (e.g. selinux) on Linux. - - Fixed a hang if a really large file is being processed by an rsync that - can't handle 64-bit numbers. Rsync will now complain about the file - being too big and skip it. + - Fix a memory leak in the xattr code. - - For devices and special files, we now avoid gathering useless ACL and/or - xattr information for files that aren't being copied. (The un-copied - files are still put into the file list, but there's no need to gather - data that is not going to be used.) This ensures that if the user uses - --no-D, that rsync can't possibly complain about being unable to gather - extended information from special files that are in the file list (but - not in the transfer). + - Fixed a bug with --delete-excluded when a filter merge file has a rule + that specifies a receiver-only side restriction. - - Properly handle requesting remote filenames that start with a dash. This - avoids a potential error where a filename could be interpreted as a - (usually invalid) option. + - Fix a bug with the modifying of unwritable directories. - - Fixed a bug in the comparing of upper-case letters in file suffixes for - --skip-compress. + - Fix --fake-super's interaction with --link-dest same-file comparisons. - - If an rsync daemon has a module configured without a path setting, rsync - will now disallow access to that module. + - Fix the updating of the curr_dir buffer to avoid a duplicate slash. - - If the destination arg is an empty string, it will be treated as a - reference to the current directory (as 2.x used to do). + - Fix the directory permissions on an implied dot-dir when using --relative + (e.g. /outside/path/././send/path). - - If rsync was compiled with a newer time-setting function (such as - lutimes), rsync will fall-back to an older function (such as utimes) on a - system where the newer function is not around. This helps to make the - rsync binary more portable in mixed-OS-release situations. + - Fixed some too-long sleeping instances when using --bwlimit. - - Fixed a batch-file writing bug that would not write out the full set of - compatibility flags that the transfer was using. This fixes a potential - protocol problem for a batch file that contains a sender-side I/O error: - it would have been sent in a way that the batch-reader wasn't expecting. + - Fixed when symlink ownership difference-checking gets compiled into + unchanged_attrs(). - - Some improvements to the hard-linking code to ensure that device-number - hashing is working right, and to supply more information if the hard-link - code fails. + - Improved the socket-error reporting when multiple protocols fail. - - The --inplace code was improved to not search for an impossible checksum - position. The quadruple-verbose chunk[N] message will now mention when - an inplace chunk was handled by a seek rather than a read+write. + - Fixed a case where a socket error could reference just-freed memory. - - Improved ACL mask handling, e.g. for Solaris. + - Failing to use a password file that was specified on the command-line is + now a fatal error. - - Fixed a bug that prevented --numeric-ids from disabling the translation - of user/group IDs for ACLs. + - Fix the non-root updating of directories that don't have the read and/or + execute permission. - - Fixed an issue where an xattr and/or ACL transfer that used an alt-dest - option (e.g. --link-dest) could output an error trying to itemize the - changes against the alt-dest directory's xattr/ACL info but was instead - trying to access the not-yet-existing new destination directory. + - Make daemon-excluded file errors more error-like. - - Improved xattr system-error messages to mention the full path to the - file. + - Fix a compilation issue on older C compilers (due to a misplaced var + declaration). - - The --link-dest checking for identical symlinks now avoids considering - attribute differences that cannot be changed on the receiver. + - Make configure avoid finding socketpair on cygwin. - - Avoid trying to read/write xattrs on certain file types for certain OSes. - Improved configure to set NO_SYMLINK_XATTRS, NO_DEVICE_XATTRS, and/or - NO_SPECIAL_XATTRS defines in config.h. + - Avoid trying to reference SO_BROADCAST if the OS doesn't support it. - - Improved the unsafe-symlink errors messages. + - Fix some issues with the post-processing of the man pages. - - Fixed a bug setting xattrs on new files that aren't user writable. + - Fixed the user home-dir handling in the support/lsh script. - - Avoid re-setting xattrs on a hard-linked file w/the same xattrs. - - - Fixed a bug with --fake-super when copying files and dirs that aren't - user writable. - - - Fixed a bug where a sparse file could have its last sparse block turned - into a real block when rsync sets the file size (requires ftruncate). - - - If a temp-file name is too long, rsync now avoids truncating the name in - the middle of adjacent high-bit characters. This prevents a potential - filename error if the filesystem doesn't allow a name to contain an - invalid multi-byte sequence. - - - If a muli-protocol socket connection fails (i.e., when contacting a - daemon), we now report all the failures, not just the last one. This - avoids losing a relevant error (e.g. an IPv4 connection-refused error) - that happened before the final error (e.g. an IPv6 protocol-not-supported - error). - - - Generate a transfer error if we try to call chown with a -1 for a uid or - a gid (which is not settable). - - - Fixed the working of --force when used with --one-file-system. - - - Fix the popt arg parsing so that an option that doesn't take an arg will - reject an attempt to supply one (can configure --with-included-popt if - your system's popt library doesn't yet have this fix). - - - A couple minor option tweaks to the support/rrsync script, and also some - regex changes that make vim highlighting happier. - - - Fixed some issues in the support/mnt-excl script. - - - Various manpage improvements. - - ENHANCEMENTS: - - - Added ".hg/" to the default cvs excludes (see -C & --cvs-exclude). - - DEVELOPER RELATED: - - - Use lchmod() whenever it is available (not just on symlinks). - - - A couple fixes to the socketpair_tcp() routine. - - - Updated the helper scripts in the packaging subdirectory. - - - Renamed configure.in to configure.ac. - - - Fixed configure's checking for iconv routines for newer OS X versions. - - - Fixed the testsuite/xattrs.test script on OS X. + - Some minor manpage improvements. diff --git a/OLDNEWS b/OLDNEWS index 2c0af86..7603970 100644 --- a/OLDNEWS +++ b/OLDNEWS @@ -1,3 +1,143 @@ +NEWS for rsync 3.0.8 (26 Mar 2011) +Protocol: 30 (unchanged) +Changes since 3.0.7: + + BUG FIXES: + + - Fixed two buffer-overflow issues: one where a directory path that is + exactly MAXPATHLEN was not handled correctly, and one handling a + --backup-dir that is extra extra large. + + - Fixed a data-corruption issue when preserving hard-links without + preserving file ownership, and doing deletions either before or during + the transfer (CVE-2011-1097). This fixes some assert errors in the + hard-linking code, and some potential failed checksums (via -c) that + should have matched. + + - Fixed a potential crash when an rsync daemon has a filter/exclude list + and the transfer is using ACLs or xattrs. + + - Fixed a hang if a really large file is being processed by an rsync that + can't handle 64-bit numbers. Rsync will now complain about the file + being too big and skip it. + + - For devices and special files, we now avoid gathering useless ACL and/or + xattr information for files that aren't being copied. (The un-copied + files are still put into the file list, but there's no need to gather + data that is not going to be used.) This ensures that if the user uses + --no-D, that rsync can't possibly complain about being unable to gather + extended information from special files that are in the file list (but + not in the transfer). + + - Properly handle requesting remote filenames that start with a dash. This + avoids a potential error where a filename could be interpreted as a + (usually invalid) option. + + - Fixed a bug in the comparing of upper-case letters in file suffixes for + --skip-compress. + + - If an rsync daemon has a module configured without a path setting, rsync + will now disallow access to that module. + + - If the destination arg is an empty string, it will be treated as a + reference to the current directory (as 2.x used to do). + + - If rsync was compiled with a newer time-setting function (such as + lutimes), rsync will fall-back to an older function (such as utimes) on a + system where the newer function is not around. This helps to make the + rsync binary more portable in mixed-OS-release situations. + + - Fixed a batch-file writing bug that would not write out the full set of + compatibility flags that the transfer was using. This fixes a potential + protocol problem for a batch file that contains a sender-side I/O error: + it would have been sent in a way that the batch-reader wasn't expecting. + + - Some improvements to the hard-linking code to ensure that device-number + hashing is working right, and to supply more information if the hard-link + code fails. + + - The --inplace code was improved to not search for an impossible checksum + position. The quadruple-verbose chunk[N] message will now mention when + an inplace chunk was handled by a seek rather than a read+write. + + - Improved ACL mask handling, e.g. for Solaris. + + - Fixed a bug that prevented --numeric-ids from disabling the translation + of user/group IDs for ACLs. + + - Fixed an issue where an xattr and/or ACL transfer that used an alt-dest + option (e.g. --link-dest) could output an error trying to itemize the + changes against the alt-dest directory's xattr/ACL info but was instead + trying to access the not-yet-existing new destination directory. + + - Improved xattr system-error messages to mention the full path to the + file. + + - The --link-dest checking for identical symlinks now avoids considering + attribute differences that cannot be changed on the receiver. + + - Avoid trying to read/write xattrs on certain file types for certain OSes. + Improved configure to set NO_SYMLINK_XATTRS, NO_DEVICE_XATTRS, and/or + NO_SPECIAL_XATTRS defines in config.h. + + - Improved the unsafe-symlink errors messages. + + - Fixed a bug setting xattrs on new files that aren't user writable. + + - Avoid re-setting xattrs on a hard-linked file w/the same xattrs. + + - Fixed a bug with --fake-super when copying files and dirs that aren't + user writable. + + - Fixed a bug where a sparse file could have its last sparse block turned + into a real block when rsync sets the file size (requires ftruncate). + + - If a temp-file name is too long, rsync now avoids truncating the name in + the middle of adjacent high-bit characters. This prevents a potential + filename error if the filesystem doesn't allow a name to contain an + invalid multi-byte sequence. + + - If a muli-protocol socket connection fails (i.e., when contacting a + daemon), we now report all the failures, not just the last one. This + avoids losing a relevant error (e.g. an IPv4 connection-refused error) + that happened before the final error (e.g. an IPv6 protocol-not-supported + error). + + - Generate a transfer error if we try to call chown with a -1 for a uid or + a gid (which is not settable). + + - Fixed the working of --force when used with --one-file-system. + + - Fix the popt arg parsing so that an option that doesn't take an arg will + reject an attempt to supply one (can configure --with-included-popt if + your system's popt library doesn't yet have this fix). + + - A couple minor option tweaks to the support/rrsync script, and also some + regex changes that make vim highlighting happier. + + - Fixed some issues in the support/mnt-excl script. + + - Various manpage improvements. + + ENHANCEMENTS: + + - Added ".hg/" to the default cvs excludes (see -C & --cvs-exclude). + + DEVELOPER RELATED: + + - Use lchmod() whenever it is available (not just on symlinks). + + - A couple fixes to the socketpair_tcp() routine. + + - Updated the helper scripts in the packaging subdirectory. + + - Renamed configure.in to configure.ac. + + - Fixed configure's checking for iconv routines for newer OS X versions. + + - Fixed the testsuite/xattrs.test script on OS X. + + NEWS for rsync 3.0.7 (31 Dec 2009) Protocol: 30 (unchanged) Changes since 3.0.6: @@ -3091,9 +3231,11 @@ Changes since 2.4.6: * The existing test.sh script by Phil Hands has been merged into a test framework that works from both "make check" and the Samba build farm. + Partial Protocol History RELEASE DATE VER. DATE OF COMMIT* PROTOCOL + 23 Sep 2011 3.0.9 30 26 Mar 2011 3.0.8 30 31 Dec 2009 3.0.7 30 08 May 2009 3.0.6 30 diff --git a/acls.c b/acls.c index e6f6088..c72784c 100644 --- a/acls.c +++ b/acls.c @@ -495,9 +495,15 @@ static int get_rsync_acl(const char *fname, rsync_acl *racl, } racl->user_obj = IVAL(buf, 0); + if (racl->user_obj == NO_ENTRY) + racl->user_obj = (mode >> 6) & 7; racl->group_obj = IVAL(buf, 4); + if (racl->group_obj == NO_ENTRY) + racl->group_obj = (mode >> 3) & 7; racl->mask_obj = IVAL(buf, 8); racl->other_obj = IVAL(buf, 12); + if (racl->other_obj == NO_ENTRY) + racl->other_obj = mode & 7; if (cnt) { char *bp = buf + 4*4; diff --git a/authenticate.c b/authenticate.c index 3af7337..7650377 100644 --- a/authenticate.c +++ b/authenticate.c @@ -156,36 +156,27 @@ static const char *getpassf(const char *filename) { STRUCT_STAT st; char buffer[512], *p; - int fd, n, ok = 1; - const char *envpw = getenv("RSYNC_PASSWORD"); + int fd, n; if (!filename) return NULL; if ((fd = open(filename,O_RDONLY)) < 0) { - rsyserr(FWARNING, errno, "could not open password file \"%s\"", - filename); - if (envpw) - rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n"); - return NULL; + rsyserr(FERROR, errno, "could not open password file %s", filename); + exit_cleanup(RERR_SYNTAX); } if (do_stat(filename, &st) == -1) { - rsyserr(FWARNING, errno, "stat(%s)", filename); - ok = 0; - } else if ((st.st_mode & 06) != 0) { - rprintf(FWARNING, "password file must not be other-accessible\n"); - ok = 0; - } else if (MY_UID() == 0 && st.st_uid != 0) { - rprintf(FWARNING, "password file must be owned by root when running as root\n"); - ok = 0; + rsyserr(FERROR, errno, "stat(%s)", filename); + exit_cleanup(RERR_SYNTAX); } - if (!ok) { - close(fd); - rprintf(FWARNING, "continuing without password file\n"); - if (envpw) - rprintf(FINFO, "falling back to RSYNC_PASSWORD environment variable.\n"); - return NULL; + if ((st.st_mode & 06) != 0) { + rprintf(FERROR, "ERROR: password file must not be other-accessible\n"); + exit_cleanup(RERR_SYNTAX); + } + if (MY_UID() == 0 && st.st_uid != 0) { + rprintf(FERROR, "ERROR: password file must be owned by root when running as root\n"); + exit_cleanup(RERR_SYNTAX); } n = read(fd, buffer, sizeof buffer - 1); @@ -196,7 +187,8 @@ static const char *getpassf(const char *filename) return strdup(p); } - return NULL; + rprintf(FERROR, "ERROR: failed to read a password from %s\n", filename); + exit_cleanup(RERR_SYNTAX); } /* Generate an MD4 hash created from the combination of the password diff --git a/clientserver.c b/clientserver.c index 038900e..f3e2c04 100644 --- a/clientserver.c +++ b/clientserver.c @@ -1071,7 +1071,7 @@ int daemon_main(void) rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n", RSYNC_VERSION, rsync_port); /* TODO: If listening on a particular address, then show that - * address too. In fact, why not just do inet_ntop on the + * address too. In fact, why not just do getnameinfo on the * local address??? */ start_accept_loop(rsync_port, start_daemon); diff --git a/configure.ac b/configure.ac index ff21b3a..a9ee0a5 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h]) AC_CONFIG_HEADER(config.h) AC_PREREQ(2.59) -RSYNC_VERSION=3.0.8 +RSYNC_VERSION=3.0.9 AC_SUBST(RSYNC_VERSION) AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) @@ -331,7 +331,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \ sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \ netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \ sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \ - popt.h popt/popt.h) + popt.h popt/popt.h netinet/in_systm.h netinet/ip.h) AC_HEADER_MAJOR AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[ @@ -675,7 +675,11 @@ AC_TRY_RUN([ main() { int fd[2]; +#ifdef __CYGWIN__ + exit(1); +#else exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1); +#endif }], rsync_cv_HAVE_SOCKETPAIR=yes,rsync_cv_HAVE_SOCKETPAIR=no,rsync_cv_HAVE_SOCKETPAIR=cross)]) if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then @@ -966,7 +970,6 @@ else AC_MSG_RESULT(Using Linux xattrs) AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs]) AC_DEFINE(SUPPORT_XATTRS, 1) - AC_DEFINE(NO_SYMLINK_XATTRS, 1, [True if symlinks do not support xattrs]) ;; darwin*) AC_MSG_RESULT(Using OS X xattrs) @@ -980,6 +983,10 @@ else AC_DEFINE(HAVE_FREEBSD_XATTRS, 1, [True if you have FreeBSD xattrs]) AC_DEFINE(SUPPORT_XATTRS, 1) ;; + solaris*) + # Better Solaris support coming in 3.1.0... + AC_DEFINE(NO_SYMLINK_XATTRS, 1, [True if symlinks do not support xattrs]) + ;; *) if test x"$enable_xattr_support" = x"yes"; then AC_MSG_ERROR(Failed to find extended attribute support) diff --git a/exclude.c b/exclude.c index 6101dda..c8edec5 100644 --- a/exclude.c +++ b/exclude.c @@ -901,13 +901,9 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags, exit_cleanup(RERR_SYNTAX); } - /* --delete-excluded turns an un-modified include/exclude into a - * sender-side rule. We also affect per-dir merge files that take - * no prefixes as a simple optimization. */ + /* --delete-excluded turns an un-modified include/exclude into a sender-side rule. */ if (delete_excluded - && !(new_mflags & (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE)) - && (!(new_mflags & MATCHFLG_PERDIR_MERGE) - || new_mflags & MATCHFLG_NO_PREFIXES)) + && !(new_mflags & (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE|MATCHFLG_MERGE_FILE|MATCHFLG_PERDIR_MERGE))) new_mflags |= MATCHFLG_SENDER_SIDE; *len_ptr = len; diff --git a/flist.c b/flist.c index 7102b5b..25d5c8c 100644 --- a/flist.c +++ b/flist.c @@ -1646,11 +1646,12 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len, remainder = 0; for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) { + unsigned name_len; char *dname = d_name(di); if (dname[0] == '.' && (dname[1] == '\0' || (dname[1] == '.' && dname[2] == '\0'))) continue; - unsigned name_len = strlcpy(p, dname, remainder); + name_len = strlcpy(p, dname, remainder); if (name_len >= remainder) { char save = fbuf[len]; fbuf[len] = '\0'; @@ -2101,12 +2102,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) fn = fbuf; /* A leading ./ can be used in relative mode to affect * the dest dir without its name being in the path. */ - if (*fn == '.' && fn[1] == '/' && !implied_dot_dir) { - send_file_name(f, flist, ".", NULL, - (flags | FLAG_IMPLIED_DIR) & ~FLAG_CONTENT_DIR, - ALL_FILTERS); - implied_dot_dir = 1; - } + if (*fn == '.' && fn[1] == '/' && fn[2] && !implied_dot_dir) + implied_dot_dir = -1; len = clean_fname(fn, CFN_KEEP_TRAILING_SLASH | CFN_DROP_TRAILING_DOT_DIR); if (len == 1) { @@ -2144,11 +2141,20 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) dirlen = dir ? strlen(dir) : 0; if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) { if (!change_pathname(NULL, dir, -dirlen)) - continue; + goto bad_path; lastdir = pathname; lastdir_len = pathname_len; - } else if (!change_pathname(NULL, lastdir, lastdir_len)) + } else if (!change_pathname(NULL, lastdir, lastdir_len)) { + bad_path: + if (implied_dot_dir < 0) + implied_dot_dir = 0; continue; + } + + if (implied_dot_dir < 0) { + implied_dot_dir = 1; + send_file_name(f, flist, ".", NULL, (flags | FLAG_IMPLIED_DIR) & ~FLAG_CONTENT_DIR, ALL_FILTERS); + } if (fn != fbuf) memmove(fbuf, fn, len + 1); diff --git a/generator.c b/generator.c index 4f74597..91fd687 100644 --- a/generator.c +++ b/generator.c @@ -630,7 +630,7 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) if (perms_differ(file, sxp)) return 0; #endif -#ifndef CAN_CHOWN_SYMLINK +#ifdef CAN_CHOWN_SYMLINK if (ownership_differs(file, sxp)) return 0; #endif @@ -1355,7 +1355,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, handle_skipped_hlink(file, itemizing, code, f_out); #endif rprintf(FERROR_XFER, - "skipping daemon-excluded %s \"%s\"\n", + "ERROR: daemon refused to receive %s \"%s\"\n", is_dir ? "directory" : "file", fname); if (is_dir) goto skipping_dir_contents; @@ -1523,12 +1523,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } } - /* We need to ensure that the dirs in the transfer have writable - * permissions during the time we are putting files within them. - * This is then fixed after the transfer is done. */ +#ifdef SUPPORT_XATTRS + if (preserve_xattrs && statret == 1) + copy_xattrs(fnamecmpbuf, fname); +#endif + if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0) + && verbose && code != FNONE && f_out != -1) + rprintf(code, "%s/\n", fname); + + /* We need to ensure that the dirs in the transfer have both + * readable and writable permissions during the time we are + * putting files within them. This is then restored to the + * former permissions after the transfer is done. */ #ifdef HAVE_CHMOD - if (!am_root && !(file->mode & S_IWUSR) && dir_tweaking) { - mode_t mode = file->mode | S_IWUSR; + if (!am_root && (file->mode & S_IRWXU) != S_IRWXU && dir_tweaking) { + mode_t mode = file->mode | S_IRWXU; if (do_chmod(fname, mode) < 0) { rsyserr(FERROR_XFER, errno, "failed to modify permissions on %s", @@ -1538,14 +1547,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } #endif -#ifdef SUPPORT_XATTRS - if (preserve_xattrs && statret == 1) - copy_xattrs(fnamecmpbuf, fname); -#endif - if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0) - && verbose && code != FNONE && f_out != -1) - rprintf(code, "%s/\n", fname); - if (real_ret != 0 && one_file_system) real_sx.st.st_dev = filesystem_dev; if (inc_recurse) { @@ -2142,10 +2143,16 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo) while (1) { #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && (ndx = get_hlink_num()) != -1) { + int send_failed = (ndx == -2); + if (send_failed) + ndx = get_hlink_num(); flist = flist_for_ndx(ndx, "check_for_finished_files.1"); file = flist->files[ndx - flist->ndx_start]; assert(file->flags & FLAG_HLINKED); - finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1); + if (send_failed) + handle_skipped_hlink(file, itemizing, code, sock_f_out); + else + finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1); flist->in_progress--; continue; } diff --git a/io.c b/io.c index 0041000..b8e52bf 100644 --- a/io.c +++ b/io.c @@ -177,13 +177,19 @@ static void got_flist_entry_status(enum festatus status, const char *buf) case FES_SUCCESS: if (remove_source_files) send_msg(MSG_SUCCESS, buf, 4, 0); + /* FALL THROUGH */ + case FES_NO_SEND: +#ifdef SUPPORT_HARD_LINKS if (preserve_hard_links) { struct file_struct *file = flist->files[ndx - flist->ndx_start]; if (F_IS_HLINKED(file)) { + if (status == FES_NO_SEND) + flist_ndx_push(&hlink_list, -2); /* indicates a failure follows */ flist_ndx_push(&hlink_list, ndx); flist->in_progress++; } } +#endif break; case FES_REDO: if (read_batch) { @@ -195,8 +201,6 @@ static void got_flist_entry_status(enum festatus status, const char *buf) flist->to_redo++; flist_ndx_push(&redo_list, ndx); break; - case FES_NO_SEND: - break; } } @@ -1062,7 +1066,6 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) xbuf outbuf, inbuf; char ibuf[512]; int add_null = 0; - int pos = 0; INIT_CONST_XBUF(outbuf, line); INIT_XBUF(inbuf, ibuf, 0, -1); @@ -1077,7 +1080,6 @@ static int readfd_unbuffered(int fd, char *buf, size_t len) if (iconvbufs(ic_send, &inbuf, &outbuf, ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE) < 0) goto overflow; - pos = -1; } if (add_null) { if (outbuf.len == outbuf.size) @@ -1402,7 +1404,7 @@ static void sleep_for_bwlimit(int bytes_written) if (prior_tv.tv_sec) { elapsed_usec = (start_tv.tv_sec - prior_tv.tv_sec) * ONE_SEC + (start_tv.tv_usec - prior_tv.tv_usec); - total_written -= elapsed_usec * bwlimit / (ONE_SEC/1024); + total_written -= (int64)elapsed_usec * bwlimit / (ONE_SEC/1024); if (total_written < 0) total_written = 0; } diff --git a/main.c b/main.c index b6cc6bd..e23e570 100644 --- a/main.c +++ b/main.c @@ -526,7 +526,7 @@ static char *get_local_name(struct file_list *flist, char *dest_path) if ((*dest_path != '.' || dest_path[1] != '\0') && (check_filter(&daemon_filter_list, FLOG, dest_path, 0) < 0 || check_filter(&daemon_filter_list, FLOG, dest_path, 1) < 0)) { - rprintf(FERROR, "skipping daemon-excluded destination \"%s\"\n", + rprintf(FERROR, "ERROR: daemon has excluded destination \"%s\"\n", dest_path); exit_cleanup(RERR_FILESELECT); } diff --git a/match.c b/match.c index 658d786..154099d 100644 --- a/match.c +++ b/match.c @@ -238,7 +238,7 @@ static void hash_search(int f,struct sum_struct *s, aligned_offset += s->blength; aligned_i++; } - if (offset == aligned_offset) { + if (offset == aligned_offset && aligned_i < s->count) { if (i != aligned_i) { if (sum != s->sums[aligned_i].sum1 || l != s->sums[aligned_i].len diff --git a/options.c b/options.c index b010067..602b2c6 100644 --- a/options.c +++ b/options.c @@ -369,7 +369,7 @@ void usage(enum logcode F) rprintf(F," --del an alias for --delete-during\n"); rprintf(F," --delete delete extraneous files from destination dirs\n"); rprintf(F," --delete-before receiver deletes before transfer, not during\n"); - rprintf(F," --delete-during receiver deletes during transfer (default)\n"); + rprintf(F," --delete-during receiver deletes during the transfer\n"); rprintf(F," --delete-delay find deletions during, delete after\n"); rprintf(F," --delete-after receiver deletes after transfer, not during\n"); rprintf(F," --delete-excluded also delete excluded files from destination dirs\n"); @@ -433,7 +433,7 @@ void usage(enum logcode F) rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); rprintf(F," --version print version number\n"); - rprintf(F,"(-h) --help show this help (-h works with no other options)\n"); + rprintf(F,"(-h) --help show this help (-h is --help only if used alone)\n"); rprintf(F,"\n"); rprintf(F,"Use \"rsync --daemon --help\" to see the daemon-mode command-line options.\n"); diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec index 35febab..37e26b1 100644 --- a/packaging/lsb/rsync.spec +++ b/packaging/lsb/rsync.spec @@ -1,6 +1,6 @@ Summary: A fast, versatile, remote (and local) file-copying tool Name: rsync -Version: 3.0.8 +Version: 3.0.9 %define fullversion %{version} Release: 1 %define srcdir src @@ -66,8 +66,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/rsyncd.conf.5* %changelog -* Sat Mar 26 2011 Wayne Davison -Released 3.0.8. +* Fri Sep 23 2011 Wayne Davison +Released 3.0.9. * Fri Mar 21 2008 Wayne Davison Added installation of /etc/xinetd.d/rsync file and some commented-out diff --git a/rsync.yo b/rsync.yo index 2b32232..4c07c8d 100644 --- a/rsync.yo +++ b/rsync.yo @@ -1,5 +1,5 @@ mailto(rsync-bugs@samba.org) -manpage(rsync)(1)(26 Mar 2011)()() +manpage(rsync)(1)(23 Sep 2011)()() manpagename(rsync)(a fast, versatile, remote (and local) file-copying tool) manpagesynopsis() @@ -281,6 +281,19 @@ daemon (including stand-alone and inetd configurations). If you're using one of the remote-shell transports for the transfer, there is no need to manually start an rsync daemon. +manpagesection(SORTED TRANSFER ORDER) + +Rsync always sorts the specified filenames into its internal transfer list. +This handles the merging together of the contents of identically named +directories, makes it easy to remove duplicate filenames, and may confuse +someone when the files are transferred in a different order than what was +given on the command-line. + +If you need a particular file to be transferred prior to another, either +separate the files into different rsync calls, or consider using +bf(--delay-updates) (which doesn't affect the sorted transfer order, but +does make the final file-updating phase happen much more rapidly). + manpagesection(EXAMPLES) Here are some examples of how I use rsync. @@ -367,10 +380,10 @@ to the detailed description below for a complete description. verb( --remove-source-files sender removes synchronized files (non-dir) --del an alias for --delete-during --delete delete extraneous files from dest dirs - --delete-before receiver deletes before transfer (default) - --delete-during receiver deletes during xfer, not before + --delete-before receiver deletes before xfer, not during + --delete-during receiver deletes during the transfer --delete-delay find deletions during, delete after - --delete-after receiver deletes after transfer, not before + --delete-after receiver deletes after transfer, not during --delete-excluded also delete excluded files from dest dirs --ignore-errors delete even if there are I/O errors --force force deletion of dirs even if not empty @@ -451,11 +464,17 @@ accepted: verb( manpageoptions() -rsync uses the GNU long options package. Many of the command line -options have two variants, one short and one long. These are shown -below, separated by commas. Some options only have a long variant. -The '=' for options that take a parameter is optional; whitespace -can be used instead. +Rsync accepts both long (double-dash + word) and short (single-dash + letter) +options. The full list of the available options are described below. If an +option can be specified in more than one way, the choices are comma-separated. +Some options only have a long variant, not a short. If the option takes a +parameter, the parameter is only listed after the long variant, even though it +must also be specified for the short. When specifying a parameter, you can +either use the form --option=param or replace the '=' with whitespace. The +parameter may need to be quoted in some manner for it to survive the shell's +command-line parsing. Keep in mind that a leading tilde (~) in a filename is +substituted by your shell, so --option=~/foo will not change the tilde into +your home directory (remove the '=' for that). startdit() dit(bf(--help)) Print a short help page describing the options @@ -991,7 +1010,7 @@ used by bf(--fake-super)) unless you repeat the option (e.g. -XX). This "copy all xattrs" mode cannot be used with bf(--fake-super). dit(bf(--chmod)) This option tells rsync to apply one or more -comma-separated "chmod" strings to the permission of the files in the +comma-separated "chmod" modes to the permission of the files in the transfer. The resulting value is treated as though it were the permissions that the sending side supplied for the file, which means that this option can seem to have no effect on existing files if bf(--perms) is not enabled. @@ -1174,6 +1193,16 @@ dit(bf(--remove-source-files)) This tells rsync to remove from the sending side the files (meaning non-directories) that are a part of the transfer and have been successfully duplicated on the receiving side. +Note that you should only use this option on source files that are quiescent. +If you are using this to move files that show up in a particular directory over +to another host, make sure that the finished files get renamed into the source +directory, not directly written into it, so that rsync can't possibly transfer +a file that is not yet fully written. If you can't first write the files into +a different directory, you should use a naming idiom that lets rsync avoid +transferring files that are not yet finished (e.g. name the file "foo.new" when +it is written, rename it to "foo" when it is done, and then use the option +bf(--exclude='*.new') for the rsync transfer). + dit(bf(--delete)) This tells rsync to delete extraneous files from the receiving side (ones that aren't on the sending side), but only for the directories that are being synchronized. You must have asked rsync to @@ -2996,7 +3025,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/) manpagesection(VERSION) -This man page is current for version 3.0.8 of rsync. +This man page is current for version 3.0.9 of rsync. manpagesection(INTERNAL OPTIONS) diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo index b749e09..921f6b4 100644 --- a/rsyncd.conf.yo +++ b/rsyncd.conf.yo @@ -1,5 +1,5 @@ mailto(rsync-bugs@samba.org) -manpage(rsyncd.conf)(5)(26 Mar 2011)()() +manpage(rsyncd.conf)(5)(23 Sep 2011)()() manpagename(rsyncd.conf)(configuration file for rsync in daemon mode) manpagesynopsis() @@ -127,6 +127,12 @@ dit(bf(path)) This parameter specifies the directory in the daemon's filesystem to make available in this module. You must specify this parameter for each module in tt(rsyncd.conf). +It is fine if the path includes internal spaces -- they will be retained +verbatim (which means that you shouldn't try to escape them). If your final +directory has a trailing space (and this is somehow not something you wish to +fix), append a trailing slash to the path to avoid losing the trailing +whitespace. + dit(bf(use chroot)) If "use chroot" is true, the rsync daemon will chroot to the "path" before starting the file transfer with the client. This has the advantage of extra protection against possible implementation security @@ -700,7 +706,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/) manpagesection(VERSION) -This man page is current for version 3.0.8 of rsync. +This man page is current for version 3.0.9 of rsync. manpagesection(CREDITS) diff --git a/runtests.sh b/runtests.sh index 41d566b..490795e 100755 --- a/runtests.sh +++ b/runtests.sh @@ -129,7 +129,10 @@ RUNSHFLAGS='-e' export RUNSHFLAGS # for Solaris -[ -d /usr/xpg4/bin ] && PATH="/usr/xpg4/bin/:$PATH" +if [ -d /usr/xpg4/bin ]; then + PATH="/usr/xpg4/bin/:$PATH" + export PATH +fi if [ "x$loglevel" != x ] && [ "$loglevel" -gt 8 ]; then if set -x; then diff --git a/socket.c b/socket.c index 89a636f..b0d5475 100644 --- a/socket.c +++ b/socket.c @@ -26,8 +26,12 @@ #include "rsync.h" #include "ifuncs.h" +#ifdef HAVE_NETINET_IN_SYSTM_H #include +#endif +#ifdef HAVE_NETINET_IP_H #include +#endif #include extern char *bind_address; @@ -297,22 +301,29 @@ int open_socket_out(char *host, int port, const char *bind_addr, s = -1; continue; } + if (verbose >= 3) { + char buf[2048]; + if ((error = getnameinfo(res->ai_addr, res->ai_addrlen, buf, sizeof buf, NULL, 0, NI_NUMERICHOST)) != 0) + snprintf(buf, sizeof buf, "*getnameinfo failure: %s*", gai_strerror(error)); + rprintf(FINFO, "Connected to %s (%s)\n", h, buf); + } break; } - freeaddrinfo(res0); - if (s < 0) { + if (s < 0 || verbose >= 3) { char buf[2048]; for (res = res0, j = 0; res; res = res->ai_next, j++) { if (errnos[j] == 0) continue; - if (inet_ntop(res->ai_family, res->ai_addr->sa_data + 2, buf, sizeof buf) == NULL) - strlcpy(buf, "*inet_ntop failed*", sizeof buf); + if ((error = getnameinfo(res->ai_addr, res->ai_addrlen, buf, sizeof buf, NULL, 0, NI_NUMERICHOST)) != 0) + snprintf(buf, sizeof buf, "*getnameinfo failure: %s*", gai_strerror(error)); rsyserr(FERROR, errnos[j], "failed to connect to %s (%s)", h, buf); } - s = -1; + if (s < 0) + s = -1; } + freeaddrinfo(res0); free(errnos); return s; @@ -635,7 +646,9 @@ struct } socket_options[] = { {"SO_KEEPALIVE", SOL_SOCKET, SO_KEEPALIVE, 0, OPT_BOOL}, {"SO_REUSEADDR", SOL_SOCKET, SO_REUSEADDR, 0, OPT_BOOL}, +#ifdef SO_BROADCAST {"SO_BROADCAST", SOL_SOCKET, SO_BROADCAST, 0, OPT_BOOL}, +#endif #ifdef TCP_NODELAY {"TCP_NODELAY", IPPROTO_TCP, TCP_NODELAY, 0, OPT_BOOL}, #endif diff --git a/support/lsh b/support/lsh index 65488dc..8ccc5a2 100755 --- a/support/lsh +++ b/support/lsh @@ -7,7 +7,6 @@ # command. user='' -prefix='' do_cd=y # Default path is user's home dir, just like ssh. while : ; do @@ -22,14 +21,13 @@ while : ; do done if [ "$user" ]; then - prefix="sudo -H -u '$user'" + prefix='' if [ $do_cd = y ]; then home=`perl -e "print((getpwnam('$user'))[7])"` - # Yeah, this may fail, but attempts to get sudo to cd are harder. - cd $home + prefix="cd '$home' ;" fi -elif [ $do_cd = y ]; then - cd + sudo -H -u "$user" sh -c "$prefix $*" +else + [ $do_cd = y ] && cd + eval "${@}" fi - -eval $prefix "${@}" diff --git a/support/mnt-excl b/support/mnt-excl index e741865..b2926db 100755 --- a/support/mnt-excl +++ b/support/mnt-excl @@ -18,7 +18,7 @@ # easily adapted to read /etc/mtab or similar. # # ADDENDUM: The addition of the --filter option (which has support for -# absolute-anchored excludes) can make this screen unneeded in some +# absolute-anchored excludes) can make this script unneeded in some # scenarios. If you don't need delete protection on the receiving side # (or if the destination path is identical to the source path), then you # can exclude some absolute paths from the transfer based on the mount diff --git a/tweak_manpage b/tweak_manpage index f10d2a0..4c55c51 100755 --- a/tweak_manpage +++ b/tweak_manpage @@ -1,19 +1,10 @@ #!/usr/bin/perl -i -p -# Make some hyphens unbreakable. -s{(--\w[-\w]+)}{ $x = $1; $x =~ s/-/\\-/g; $x }eg; -s/(?items; + if (!xalp->malloced) + return; + for (i = 0; i < xalp->count; i++) { free(rxas[i].datum); /*free(rxas[i].name);*/ } - xalp->count = 0; + free(xalp->items); } void free_xattr(stat_x *sxp) @@ -772,10 +775,8 @@ void uncache_tmp_xattrs(void) item_list *xattr_start = xattr_item + prior_xattr_count; xattr_item += rsync_xal_l.count; rsync_xal_l.count = prior_xattr_count; - while (xattr_item-- > xattr_start) { + while (xattr_item-- > xattr_start) rsync_xal_free(xattr_item); - free(xattr_item->items); - } prior_xattr_count = (size_t)-1; } } diff -upN a/config.h.in b/config.h.in --- a/config.h.in +++ b/config.h.in @@ -265,6 +265,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NETDB_H +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IN_SYSTM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETINET_IP_H + /* Define to 1 if you have the `nl_langinfo' function. */ #undef HAVE_NL_LANGINFO @@ -695,6 +701,9 @@ #undef inline #endif +/* Define to `unsigned int' if does not define. */ +#undef size_t + /* type to use in place of socklen_t if not defined */ #undef socklen_t diff -upN a/configure.sh b/configure.sh --- a/configure.sh +++ b/configure.sh @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67. +# Generated by GNU Autoconf 2.68. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -89,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -214,11 +215,18 @@ IFS=$as_save_IFS # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -1094,7 +1102,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1404,7 +1412,7 @@ test -n "$ac_init_help" && exit $ac_stat if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1450,7 +1458,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1487,7 +1495,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1529,7 +1537,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1575,7 +1583,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1589,7 +1597,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1607,7 +1615,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1619,10 +1627,10 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1685,7 +1693,7 @@ $as_echo "$as_me: WARNING: $2: proceedin esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1694,7 +1702,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1871,7 +1879,7 @@ rm -f core *.core core.conftest.* gmon.o rm -f conftest.val fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_compute_int @@ -1885,7 +1893,7 @@ ac_fn_c_check_type () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -1926,7 +1934,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -1939,7 +1947,7 @@ ac_fn_c_check_member () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 $as_echo_n "checking for $2.$3... " >&6; } -if eval "test \"\${$4+set}\"" = set; then : +if eval \${$4+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1983,7 +1991,7 @@ fi eval ac_res=\$$4 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_member @@ -1995,7 +2003,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2050,7 +2058,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func cat >config.log <<_ACEOF @@ -2058,7 +2066,7 @@ This file contains any messages produced running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2316,7 +2324,7 @@ $as_echo "$as_me: loading site script $a || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2411,7 +2419,7 @@ ac_config_headers="$ac_config_headers co -RSYNC_VERSION=3.0.8 +RSYNC_VERSION=3.0.9 { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring rsync $RSYNC_VERSION" >&5 $as_echo "$as_me: Configuring rsync $RSYNC_VERSION" >&6;} @@ -2459,7 +2467,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/d { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -2475,7 +2483,7 @@ fi $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2493,7 +2501,7 @@ case $build_os in *\ *) build_os=`echo " { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -2508,7 +2516,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2558,7 +2566,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2598,7 +2606,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2651,7 +2659,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2691,7 +2699,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2750,7 +2758,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2794,7 +2802,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2849,7 +2857,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2964,7 +2972,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3007,7 +3015,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3066,7 +3074,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3077,7 +3085,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_ex ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3118,7 +3126,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3128,7 +3136,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3165,7 +3173,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3243,7 +3251,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3350,7 +3358,7 @@ if test -n "$CPP" && test -d "$CPP"; the CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -3466,7 +3474,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -3477,7 +3485,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -3540,7 +3548,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -3622,7 +3630,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3704,7 +3712,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA= *) : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 $as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if test "${ac_cv_prog_cc_c99+set}" = set; then : +if ${ac_cv_prog_cc_c99+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c99=no @@ -3879,7 +3887,7 @@ if test "x$ac_cv_prog_cc_c99" != xno; th else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3975,7 +3983,7 @@ fi esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5 $as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; } - if test "${ac_cv_prog_cc_stdc+set}" = set; then : + if ${ac_cv_prog_cc_stdc+:} false; then : $as_echo_n "(cached) " >&6 fi @@ -4094,7 +4102,7 @@ fi set dummy remsh; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_HAVE_REMSH+set}" = set; then : +if ${ac_cv_prog_HAVE_REMSH+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$HAVE_REMSH"; then @@ -4149,7 +4157,7 @@ _ACEOF set dummy yodl2man; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_HAVE_YODL2MAN+set}" = set; then : +if ${ac_cv_prog_HAVE_YODL2MAN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$HAVE_YODL2MAN"; then @@ -4224,7 +4232,7 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken largefile support" >&5 $as_echo_n "checking for broken largefile support... " >&6; } -if test "${rsync_cv_HAVE_BROKEN_LARGEFILE+set}" = set; then : +if ${rsync_cv_HAVE_BROKEN_LARGEFILE+:} false; then : $as_echo_n "(cached) " >&6 else @@ -4289,7 +4297,7 @@ if test "$enable_largefile" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 $as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if test "${ac_cv_sys_largefile_CC+set}" = set; then : +if ${ac_cv_sys_largefile_CC+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no @@ -4340,7 +4348,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test "${ac_cv_sys_file_offset_bits+set}" = set; then : +if ${ac_cv_sys_file_offset_bits+:} false; then : $as_echo_n "(cached) " >&6 else while :; do @@ -4409,7 +4417,7 @@ rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if test "${ac_cv_sys_large_files+set}" = set; then : +if ${ac_cv_sys_large_files+:} false; then : $as_echo_n "(cached) " >&6 else while :; do @@ -4681,7 +4689,7 @@ $as_echo "$ipv6type" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5 $as_echo_n "checking for library containing getaddrinfo... " >&6; } -if test "${ac_cv_search_getaddrinfo+set}" = set; then : +if ${ac_cv_search_getaddrinfo+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -4715,11 +4723,11 @@ for ac_lib in '' inet6; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_getaddrinfo+set}" = set; then : + if ${ac_cv_search_getaddrinfo+:} false; then : break fi done -if test "${ac_cv_search_getaddrinfo+set}" = set; then : +if ${ac_cv_search_getaddrinfo+:} false; then : else ac_cv_search_getaddrinfo=no @@ -4763,7 +4771,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4892,7 +4900,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then : +if ${ac_cv_c_bigendian+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown @@ -5111,7 +5119,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUI ;; #( *) as_fn_error $? "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac ac_header_dirent=no @@ -5119,7 +5127,7 @@ for ac_hdr in dirent.h sys/ndir.h sys/di as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if eval "test \"\${$as_ac_Header+set}\"" = set; then : +if eval \${$as_ac_Header+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5159,7 +5167,7 @@ done if test $ac_header_dirent = dirent.h; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 $as_echo_n "checking for library containing opendir... " >&6; } -if test "${ac_cv_search_opendir+set}" = set; then : +if ${ac_cv_search_opendir+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -5193,11 +5201,11 @@ for ac_lib in '' dir; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_opendir+set}" = set; then : + if ${ac_cv_search_opendir+:} false; then : break fi done -if test "${ac_cv_search_opendir+set}" = set; then : +if ${ac_cv_search_opendir+:} false; then : else ac_cv_search_opendir=no @@ -5216,7 +5224,7 @@ fi else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 $as_echo_n "checking for library containing opendir... " >&6; } -if test "${ac_cv_search_opendir+set}" = set; then : +if ${ac_cv_search_opendir+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -5250,11 +5258,11 @@ for ac_lib in '' x; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_opendir+set}" = set; then : + if ${ac_cv_search_opendir+:} false; then : break fi done -if test "${ac_cv_search_opendir+set}" = set; then : +if ${ac_cv_search_opendir+:} false; then : else ac_cv_search_opendir=no @@ -5274,7 +5282,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if test "${ac_cv_header_time+set}" = set; then : +if ${ac_cv_header_time+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5309,7 +5317,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if test "${ac_cv_header_sys_wait_h+set}" = set; then : +if ${ac_cv_header_sys_wait_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5354,7 +5362,7 @@ for ac_header in sys/fcntl.h sys/select. sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \ netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \ sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \ - popt.h popt/popt.h + popt.h popt/popt.h netinet/in_systm.h netinet/ip.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -5369,7 +5377,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 $as_echo_n "checking whether sys/types.h defines makedev... " >&6; } -if test "${ac_cv_header_sys_types_h_makedev+set}" = set; then : +if ${ac_cv_header_sys_types_h_makedev+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5397,7 +5405,7 @@ $as_echo "$ac_cv_header_sys_types_h_make if test $ac_cv_header_sys_types_h_makedev = no; then ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_mkdev_h" = x""yes; then : +if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : $as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h @@ -5407,7 +5415,7 @@ fi if test $ac_cv_header_sys_mkdev_h = no; then ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then : +if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h @@ -5420,7 +5428,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if makedev takes 3 args" >&5 $as_echo_n "checking if makedev takes 3 args... " >&6; } -if test "${rsync_cv_MAKEDEV_TAKES_3_ARGS+set}" = set; then : +if ${rsync_cv_MAKEDEV_TAKES_3_ARGS+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5473,7 +5481,7 @@ fi # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 $as_echo_n "checking size of int... " >&6; } -if test "${ac_cv_sizeof_int+set}" = set; then : +if ${ac_cv_sizeof_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : @@ -5483,7 +5491,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (int) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int=0 fi @@ -5506,7 +5514,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 $as_echo_n "checking size of long... " >&6; } -if test "${ac_cv_sizeof_long+set}" = set; then : +if ${ac_cv_sizeof_long+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : @@ -5516,7 +5524,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long=0 fi @@ -5539,7 +5547,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 $as_echo_n "checking size of long long... " >&6; } -if test "${ac_cv_sizeof_long_long+set}" = set; then : +if ${ac_cv_sizeof_long_long+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : @@ -5549,7 +5557,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long long) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_long=0 fi @@ -5572,7 +5580,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 $as_echo_n "checking size of short... " >&6; } -if test "${ac_cv_sizeof_short+set}" = set; then : +if ${ac_cv_sizeof_short+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : @@ -5582,7 +5590,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (short) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_short=0 fi @@ -5605,7 +5613,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int16_t" >&5 $as_echo_n "checking size of int16_t... " >&6; } -if test "${ac_cv_sizeof_int16_t+set}" = set; then : +if ${ac_cv_sizeof_int16_t+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int16_t))" "ac_cv_sizeof_int16_t" "$ac_includes_default"; then : @@ -5615,7 +5623,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (int16_t) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int16_t=0 fi @@ -5638,7 +5646,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint16_t" >&5 $as_echo_n "checking size of uint16_t... " >&6; } -if test "${ac_cv_sizeof_uint16_t+set}" = set; then : +if ${ac_cv_sizeof_uint16_t+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint16_t))" "ac_cv_sizeof_uint16_t" "$ac_includes_default"; then : @@ -5648,7 +5656,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (uint16_t) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_uint16_t=0 fi @@ -5671,7 +5679,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int32_t" >&5 $as_echo_n "checking size of int32_t... " >&6; } -if test "${ac_cv_sizeof_int32_t+set}" = set; then : +if ${ac_cv_sizeof_int32_t+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int32_t))" "ac_cv_sizeof_int32_t" "$ac_includes_default"; then : @@ -5681,7 +5689,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (int32_t) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int32_t=0 fi @@ -5704,7 +5712,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint32_t" >&5 $as_echo_n "checking size of uint32_t... " >&6; } -if test "${ac_cv_sizeof_uint32_t+set}" = set; then : +if ${ac_cv_sizeof_uint32_t+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint32_t))" "ac_cv_sizeof_uint32_t" "$ac_includes_default"; then : @@ -5714,7 +5722,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (uint32_t) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_uint32_t=0 fi @@ -5737,7 +5745,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int64_t" >&5 $as_echo_n "checking size of int64_t... " >&6; } -if test "${ac_cv_sizeof_int64_t+set}" = set; then : +if ${ac_cv_sizeof_int64_t+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int64_t))" "ac_cv_sizeof_int64_t" "$ac_includes_default"; then : @@ -5747,7 +5755,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (int64_t) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int64_t=0 fi @@ -5770,7 +5778,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 $as_echo_n "checking size of off_t... " >&6; } -if test "${ac_cv_sizeof_off_t+set}" = set; then : +if ${ac_cv_sizeof_off_t+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then : @@ -5780,7 +5788,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (off_t) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_off_t=0 fi @@ -5803,7 +5811,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off64_t" >&5 $as_echo_n "checking size of off64_t... " >&6; } -if test "${ac_cv_sizeof_off64_t+set}" = set; then : +if ${ac_cv_sizeof_off64_t+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off64_t))" "ac_cv_sizeof_off64_t" "$ac_includes_default"; then : @@ -5813,7 +5821,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (off64_t) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_off64_t=0 fi @@ -5836,7 +5844,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 $as_echo_n "checking size of time_t... " >&6; } -if test "${ac_cv_sizeof_time_t+set}" = set; then : +if ${ac_cv_sizeof_time_t+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default"; then : @@ -5846,7 +5854,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (time_t) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_time_t=0 fi @@ -5866,7 +5874,7 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : +if ${ac_cv_c_inline+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no @@ -5910,7 +5918,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double with more range or precision than double" >&5 $as_echo_n "checking for long double with more range or precision than double... " >&6; } -if test "${ac_cv_type_long_double_wider+set}" = set; then : +if ${ac_cv_type_long_double_wider+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5968,7 +5976,7 @@ $as_echo "#define HAVE_LONG_DOUBLE 1" >> { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 $as_echo_n "checking return type of signal handlers... " >&6; } -if test "${ac_cv_type_signal+set}" = set; then : +if ${ac_cv_type_signal+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6001,7 +6009,7 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 $as_echo_n "checking for uid_t in sys/types.h... " >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then : +if ${ac_cv_type_uid_t+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6030,7 +6038,7 @@ $as_echo "#define gid_t int" >>confdefs. fi ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" -if test "x$ac_cv_type_mode_t" = x""yes; then : +if test "x$ac_cv_type_mode_t" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_MODE_T 1 @@ -6039,7 +6047,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = x""yes; then : +if test "x$ac_cv_type_off_t" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_OFF_T 1 @@ -6048,7 +6056,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = x""yes; then : +if test "x$ac_cv_type_size_t" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SIZE_T 1 @@ -6057,7 +6065,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = x""yes; then : +if test "x$ac_cv_type_pid_t" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PID_T 1 @@ -6066,7 +6074,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "id_t" "ac_cv_type_id_t" "$ac_includes_default" -if test "x$ac_cv_type_id_t" = x""yes; then : +if test "x$ac_cv_type_id_t" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_ID_T 1 @@ -6077,7 +6085,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking type of array argument to getgroups" >&5 $as_echo_n "checking type of array argument to getgroups... " >&6; } -if test "${ac_cv_type_getgroups+set}" = set; then : +if ${ac_cv_type_getgroups+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -6143,7 +6151,7 @@ _ACEOF ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default" -if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then : +if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_RDEV 1 @@ -6157,13 +6165,13 @@ fi ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#include #include " -if test "x$ac_cv_type_socklen_t" = x""yes; then : +if test "x$ac_cv_type_socklen_t" = xyes; then : else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t equivalent" >&5 $as_echo_n "checking for socklen_t equivalent... " >&6; } - if test "${rsync_cv_socklen_t_equiv+set}" = set; then : + if ${rsync_cv_socklen_t_equiv+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6220,7 +6228,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno in errno.h" >&5 $as_echo_n "checking for errno in errno.h... " >&6; } -if test "${rsync_cv_errno+set}" = set; then : +if ${rsync_cv_errno+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6261,7 +6269,7 @@ fi for ac_func in connect do : ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -if test "x$ac_cv_func_connect" = x""yes; then : +if test "x$ac_cv_func_connect" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_CONNECT 1 _ACEOF @@ -6274,7 +6282,7 @@ if test x"$ac_cv_func_connect" = x"no"; *-lnsl*) ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for printf in -lnsl_s" >&5 $as_echo_n "checking for printf in -lnsl_s... " >&6; } -if test "${ac_cv_lib_nsl_s_printf+set}" = set; then : +if ${ac_cv_lib_nsl_s_printf+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6308,7 +6316,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_s_printf" >&5 $as_echo "$ac_cv_lib_nsl_s_printf" >&6; } -if test "x$ac_cv_lib_nsl_s_printf" = x""yes; then : +if test "x$ac_cv_lib_nsl_s_printf" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL_S 1 _ACEOF @@ -6322,7 +6330,7 @@ fi *-lnsl*) ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for printf in -lnsl" >&5 $as_echo_n "checking for printf in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_printf+set}" = set; then : +if ${ac_cv_lib_nsl_printf+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6356,7 +6364,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_printf" >&5 $as_echo "$ac_cv_lib_nsl_printf" >&6; } -if test "x$ac_cv_lib_nsl_printf" = x""yes; then : +if test "x$ac_cv_lib_nsl_printf" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL 1 _ACEOF @@ -6370,7 +6378,7 @@ fi *-lsocket*) ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 $as_echo_n "checking for connect in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_connect+set}" = set; then : +if ${ac_cv_lib_socket_connect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6404,7 +6412,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 $as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = x""yes; then : +if test "x$ac_cv_lib_socket_connect" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 _ACEOF @@ -6418,7 +6426,7 @@ fi *-linet*) ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -linet" >&5 $as_echo_n "checking for connect in -linet... " >&6; } -if test "${ac_cv_lib_inet_connect+set}" = set; then : +if ${ac_cv_lib_inet_connect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6452,7 +6460,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet_connect" >&5 $as_echo "$ac_cv_lib_inet_connect" >&6; } -if test "x$ac_cv_lib_inet_connect" = x""yes; then : +if test "x$ac_cv_lib_inet_connect" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBINET 1 _ACEOF @@ -6474,7 +6482,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5 $as_echo_n "checking for library containing inet_ntop... " >&6; } -if test "${ac_cv_search_inet_ntop+set}" = set; then : +if ${ac_cv_search_inet_ntop+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -6508,11 +6516,11 @@ for ac_lib in '' resolv; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_inet_ntop+set}" = set; then : + if ${ac_cv_search_inet_ntop+:} false; then : break fi done -if test "${ac_cv_search_inet_ntop+set}" = set; then : +if ${ac_cv_search_inet_ntop+:} false; then : else ac_cv_search_inet_ntop=no @@ -6534,7 +6542,7 @@ fi # the former to the latter. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing iconv_open" >&5 $as_echo_n "checking for library containing iconv_open... " >&6; } -if test "${ac_cv_search_iconv_open+set}" = set; then : +if ${ac_cv_search_iconv_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -6568,11 +6576,11 @@ for ac_lib in '' iconv; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_iconv_open+set}" = set; then : + if ${ac_cv_search_iconv_open+:} false; then : break fi done -if test "${ac_cv_search_iconv_open+set}" = set; then : +if ${ac_cv_search_iconv_open+:} false; then : else ac_cv_search_iconv_open=no @@ -6590,7 +6598,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing libiconv_open" >&5 $as_echo_n "checking for library containing libiconv_open... " >&6; } -if test "${ac_cv_search_libiconv_open+set}" = set; then : +if ${ac_cv_search_libiconv_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -6624,11 +6632,11 @@ for ac_lib in '' iconv; do fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_libiconv_open+set}" = set; then : + if ${ac_cv_search_libiconv_open+:} false; then : break fi done -if test "${ac_cv_search_libiconv_open+set}" = set; then : +if ${ac_cv_search_libiconv_open+:} false; then : else ac_cv_search_libiconv_open=no @@ -6647,7 +6655,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5 $as_echo_n "checking for iconv declaration... " >&6; } -if test "${am_cv_proto_iconv+set}" = set; then : +if ${am_cv_proto_iconv+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6698,7 +6706,7 @@ _ACEOF for ac_func in inet_ntop do : ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" -if test "x$ac_cv_func_inet_ntop" = x""yes; then : +if test "x$ac_cv_func_inet_ntop" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_INET_NTOP 1 _ACEOF @@ -6716,7 +6724,7 @@ done for ac_func in inet_pton do : ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton" -if test "x$ac_cv_func_inet_pton" = x""yes; then : +if test "x$ac_cv_func_inet_pton" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_INET_PTON 1 _ACEOF @@ -6737,7 +6745,7 @@ done cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5 $as_echo_n "checking for struct addrinfo... " >&6; } -if eval "test \"\${ac_cv_type_$cv+set}\"" = set; then : +if eval \${ac_cv_type_$cv+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6767,7 +6775,7 @@ if test "$ac_foo" = yes; then ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'` if false; then ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "$ac_includes_default" -if test "x$ac_cv_type_struct_addrinfo" = x""yes; then : +if test "x$ac_cv_type_struct_addrinfo" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_ADDRINFO 1 @@ -6789,7 +6797,7 @@ fi cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5 $as_echo_n "checking for struct sockaddr_storage... " >&6; } -if eval "test \"\${ac_cv_type_$cv+set}\"" = set; then : +if eval \${ac_cv_type_$cv+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6820,7 +6828,7 @@ if test "$ac_foo" = yes; then ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'` if false; then ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "$ac_includes_default" -if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then : +if test "x$ac_cv_type_struct_sockaddr_storage" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_SOCKADDR_STORAGE 1 @@ -6842,7 +6850,7 @@ fi # builtin getaddrinfo if one of the defines don't exist { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether defines needed by getaddrinfo exist" >&5 $as_echo_n "checking whether defines needed by getaddrinfo exist... " >&6; } -if test "${rsync_cv_HAVE_GETADDR_DEFINES+set}" = set; then : +if ${rsync_cv_HAVE_GETADDR_DEFINES+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6874,7 +6882,7 @@ if test x"$rsync_cv_HAVE_GETADDR_DEFINES for ac_func in getaddrinfo do : ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" -if test "x$ac_cv_func_getaddrinfo" = x""yes; then : +if test "x$ac_cv_func_getaddrinfo" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_GETADDRINFO 1 _ACEOF @@ -6930,7 +6938,7 @@ ac_fn_c_check_member "$LINENO" "struct s #include " -if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then : +if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then : $as_echo "#define HAVE_SOCKADDR_LEN 1" >>confdefs.h @@ -6943,7 +6951,7 @@ ac_fn_c_check_member "$LINENO" "struct s #include " -if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = x""yes; then : +if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes; then : $as_echo "#define HAVE_SOCKADDR_IN_LEN 1" >>confdefs.h @@ -6956,7 +6964,7 @@ ac_fn_c_check_member "$LINENO" "struct s #include " -if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = x""yes; then : +if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = xyes; then : $as_echo "#define HAVE_SOCKADDR_UN_LEN 1" >>confdefs.h @@ -6969,7 +6977,7 @@ ac_fn_c_check_member "$LINENO" "struct s #include " -if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = x""yes; then : +if test "x$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" = xyes; then : $as_echo "#define HAVE_SOCKADDR_IN6_SCOPE_ID 1" >>confdefs.h @@ -6981,7 +6989,7 @@ fi cv=`echo "struct stat64" | sed 'y%./+- %__p__%'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct stat64" >&5 $as_echo_n "checking for struct stat64... " >&6; } -if eval "test \"\${ac_cv_type_$cv+set}\"" = set; then : +if eval \${ac_cv_type_$cv+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7026,7 +7034,7 @@ if test "$ac_foo" = yes; then ac_tr_hdr=HAVE_`echo struct stat64 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'` if false; then ac_fn_c_check_type "$LINENO" "struct stat64" "ac_cv_type_struct_stat64" "$ac_includes_default" -if test "x$ac_cv_type_struct_stat64" = x""yes; then : +if test "x$ac_cv_type_struct_stat64" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT64 1 @@ -7049,7 +7057,7 @@ fi for ac_func in strcasecmp do : ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" -if test "x$ac_cv_func_strcasecmp" = x""yes; then : +if test "x$ac_cv_func_strcasecmp" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STRCASECMP 1 _ACEOF @@ -7060,7 +7068,7 @@ done if test x"$ac_cv_func_strcasecmp" = x"no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp in -lresolv" >&5 $as_echo_n "checking for strcasecmp in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then : +if ${ac_cv_lib_resolv_strcasecmp+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7094,7 +7102,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_strcasecmp" >&5 $as_echo "$ac_cv_lib_resolv_strcasecmp" >&6; } -if test "x$ac_cv_lib_resolv_strcasecmp" = x""yes; then : +if test "x$ac_cv_lib_resolv_strcasecmp" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBRESOLV 1 _ACEOF @@ -7108,7 +7116,7 @@ fi for ac_func in aclsort do : ac_fn_c_check_func "$LINENO" "aclsort" "ac_cv_func_aclsort" -if test "x$ac_cv_func_aclsort" = x""yes; then : +if test "x$ac_cv_func_aclsort" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_ACLSORT 1 _ACEOF @@ -7119,7 +7127,7 @@ done if test x"$ac_cv_func_aclsort" = x"no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aclsort in -lsec" >&5 $as_echo_n "checking for aclsort in -lsec... " >&6; } -if test "${ac_cv_lib_sec_aclsort+set}" = set; then : +if ${ac_cv_lib_sec_aclsort+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7153,7 +7161,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_aclsort" >&5 $as_echo "$ac_cv_lib_sec_aclsort" >&6; } -if test "x$ac_cv_lib_sec_aclsort" = x""yes; then : +if test "x$ac_cv_lib_sec_aclsort" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBSEC 1 _ACEOF @@ -7187,7 +7195,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether utime accepts a null argument" >&5 $as_echo_n "checking whether utime accepts a null argument... " >&6; } -if test "${ac_cv_func_utime_null+set}" = set; then : +if ${ac_cv_func_utime_null+:} false; then : $as_echo_n "(cached) " >&6 else rm -f conftest.data; >conftest.data @@ -7234,11 +7242,22 @@ $as_echo "#define HAVE_UTIME_NULL 1" >>c fi rm -f conftest.data +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = xyes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF + +fi + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 $as_echo_n "checking for working alloca.h... " >&6; } -if test "${ac_cv_working_alloca_h+set}" = set; then : +if ${ac_cv_working_alloca_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7271,7 +7290,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 $as_echo_n "checking for alloca... " >&6; } -if test "${ac_cv_func_alloca_works+set}" = set; then : +if ${ac_cv_func_alloca_works+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7290,7 +7309,7 @@ else #pragma alloca # else # ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); +void *alloca (size_t); # endif # endif # endif @@ -7334,7 +7353,7 @@ $as_echo "#define C_ALLOCA 1" >>confdefs { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -if test "${ac_cv_os_cray+set}" = set; then : +if ${ac_cv_os_cray+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7375,7 +7394,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 $as_echo_n "checking stack direction for C alloca... " >&6; } -if test "${ac_cv_c_stack_direction+set}" = set; then : +if ${ac_cv_c_stack_direction+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -7445,7 +7464,7 @@ done if test x"$ac_cv_func_iconv_open" != x"yes"; then ac_fn_c_check_func "$LINENO" "libiconv_open" "ac_cv_func_libiconv_open" -if test "x$ac_cv_func_libiconv_open" = x""yes; then : +if test "x$ac_cv_func_libiconv_open" = xyes; then : ac_cv_func_iconv_open=yes; $as_echo "#define HAVE_ICONV_OPEN 1" >>confdefs.h fi @@ -7467,7 +7486,7 @@ done if test $ac_cv_func_getpgrp = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5 $as_echo_n "checking whether getpgrp requires zero arguments... " >&6; } -if test "${ac_cv_func_getpgrp_void+set}" = set; then : +if ${ac_cv_func_getpgrp_void+:} false; then : $as_echo_n "(cached) " >&6 else # Use it with a single arg. @@ -7539,7 +7558,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether chown() modifies symlinks" >&5 $as_echo_n "checking whether chown() modifies symlinks... " >&6; } -if test "${rsync_cv_chown_modifies_symlink+set}" = set; then : +if ${rsync_cv_chown_modifies_symlink+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7582,7 +7601,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether link() can hard-link symlinks" >&5 $as_echo_n "checking whether link() can hard-link symlinks... " >&6; } -if test "${rsync_cv_can_hardlink_symlink+set}" = set; then : +if ${rsync_cv_can_hardlink_symlink+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7625,7 +7644,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether link() can hard-link special files" >&5 $as_echo_n "checking whether link() can hard-link special files... " >&6; } -if test "${rsync_cv_can_hardlink_special+set}" = set; then : +if ${rsync_cv_can_hardlink_special+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7668,7 +7687,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working socketpair" >&5 $as_echo_n "checking for working socketpair... " >&6; } -if test "${rsync_cv_HAVE_SOCKETPAIR+set}" = set; then : +if ${rsync_cv_HAVE_SOCKETPAIR+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7683,7 +7702,11 @@ else main() { int fd[2]; +#ifdef __CYGWIN__ + exit(1); +#else exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1); +#endif } _ACEOF if ac_fn_c_try_run "$LINENO"; then : @@ -7707,7 +7730,7 @@ fi if test x"$with_included_popt" != x"yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poptGetContext in -lpopt" >&5 $as_echo_n "checking for poptGetContext in -lpopt... " >&6; } -if test "${ac_cv_lib_popt_poptGetContext+set}" = set; then : +if ${ac_cv_lib_popt_poptGetContext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7741,7 +7764,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptGetContext" >&5 $as_echo "$ac_cv_lib_popt_poptGetContext" >&6; } -if test "x$ac_cv_lib_popt_poptGetContext" = x""yes; then : +if test "x$ac_cv_lib_popt_poptGetContext" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBPOPT 1 _ACEOF @@ -7784,7 +7807,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned char" >&5 $as_echo_n "checking for unsigned char... " >&6; } -if test "${rsync_cv_SIGNED_CHAR_OK+set}" = set; then : +if ${rsync_cv_SIGNED_CHAR_OK+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7816,7 +7839,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken readdir" >&5 $as_echo_n "checking for broken readdir... " >&6; } -if test "${rsync_cv_HAVE_BROKEN_READDIR+set}" = set; then : +if ${rsync_cv_HAVE_BROKEN_READDIR+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7851,7 +7874,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utimbuf" >&5 $as_echo_n "checking for utimbuf... " >&6; } -if test "${rsync_cv_HAVE_STRUCT_UTIMBUF+set}" = set; then : +if ${rsync_cv_HAVE_STRUCT_UTIMBUF+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7884,7 +7907,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gettimeofday takes tz argument" >&5 $as_echo_n "checking if gettimeofday takes tz argument... " >&6; } -if test "${rsync_cv_HAVE_GETTIMEOFDAY_TZ+set}" = set; then : +if ${rsync_cv_HAVE_GETTIMEOFDAY_TZ+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7917,7 +7940,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 vsnprintf" >&5 $as_echo_n "checking for C99 vsnprintf... " >&6; } -if test "${rsync_cv_HAVE_C99_VSNPRINTF+set}" = set; then : +if ${rsync_cv_HAVE_C99_VSNPRINTF+:} false; then : $as_echo_n "(cached) " >&6 else @@ -7967,7 +7990,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for secure mkstemp" >&5 $as_echo_n "checking for secure mkstemp... " >&6; } -if test "${rsync_cv_HAVE_SECURE_MKSTEMP+set}" = set; then : +if ${rsync_cv_HAVE_SECURE_MKSTEMP+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8020,7 +8043,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if mknod creates FIFOs" >&5 $as_echo_n "checking if mknod creates FIFOs... " >&6; } -if test "${rsync_cv_MKNOD_CREATES_FIFOS+set}" = set; then : +if ${rsync_cv_MKNOD_CREATES_FIFOS+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8058,7 +8081,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if mknod creates sockets" >&5 $as_echo_n "checking if mknod creates sockets... " >&6; } -if test "${rsync_cv_MKNOD_CREATES_SOCKETS+set}" = set; then : +if ${rsync_cv_MKNOD_CREATES_SOCKETS+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8099,7 +8122,7 @@ fi # { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -c -o works" >&5 $as_echo_n "checking whether -c -o works... " >&6; } -if test "${rsync_cv_DASHC_WORKS_WITH_DASHO+set}" = set; then : +if ${rsync_cv_DASHC_WORKS_WITH_DASHO+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8232,7 +8255,7 @@ $as_echo "#define HAVE_OSX_ACLS 1" >>con $as_echo "running tests:" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5 $as_echo_n "checking for acl_get_file in -lacl... " >&6; } -if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then : +if ${ac_cv_lib_acl_acl_get_file+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -8266,7 +8289,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5 $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; } -if test "x$ac_cv_lib_acl_acl_get_file" = x""yes; then : +if test "x$ac_cv_lib_acl_acl_get_file" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBACL 1 _ACEOF @@ -8277,7 +8300,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL support" >&5 $as_echo_n "checking for ACL support... " >&6; } -if test "${samba_cv_HAVE_POSIX_ACLS+set}" = set; then : +if ${samba_cv_HAVE_POSIX_ACLS+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8315,7 +8338,7 @@ $as_echo "#define HAVE_POSIX_ACLS 1" >>c { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_perm_np" >&5 $as_echo_n "checking for acl_get_perm_np... " >&6; } -if test "${samba_cv_HAVE_ACL_GET_PERM_NP+set}" = set; then : +if ${samba_cv_HAVE_ACL_GET_PERM_NP+:} false; then : $as_echo_n "(cached) " >&6 else @@ -8386,9 +8409,6 @@ $as_echo "#define HAVE_LINUX_XATTRS 1" > $as_echo "#define SUPPORT_XATTRS 1" >>confdefs.h - -$as_echo "#define NO_SYMLINK_XATTRS 1" >>confdefs.h - ;; darwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OS X xattrs" >&5 @@ -8414,6 +8434,12 @@ $as_echo "#define HAVE_FREEBSD_XATTRS 1" $as_echo "#define SUPPORT_XATTRS 1" >>confdefs.h ;; + solaris*) + # Better Solaris support coming in 3.1.0... + +$as_echo "#define NO_SYMLINK_XATTRS 1" >>confdefs.h + + ;; *) if test x"$enable_xattr_support" = x"yes"; then as_fn_error $? "Failed to find extended attribute support" "$LINENO" 5 @@ -8529,10 +8555,21 @@ $as_echo "$as_me: WARNING: cache variabl :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -8565,7 +8602,7 @@ LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -8666,6 +8703,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -8973,7 +9011,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9035,7 +9073,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.67, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" Copyright (C) 2010 Free Software Foundation, Inc. @@ -9163,7 +9201,7 @@ do "popt/dummy") CONFIG_FILES="$CONFIG_FILES popt/dummy" ;; "shconfig") CONFIG_FILES="$CONFIG_FILES shconfig" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -9185,9 +9223,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -9195,12 +9234,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -9222,7 +9262,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -9250,7 +9290,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -9298,7 +9338,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -9330,7 +9370,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -9364,7 +9404,7 @@ fi # test -n "$CONFIG_FILES" # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -9376,8 +9416,8 @@ _ACEOF # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 @@ -9478,7 +9518,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -9497,7 +9537,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -9506,7 +9546,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -9532,8 +9572,8 @@ $as_echo "$as_me: creating $ac_file" >&6 esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -9663,21 +9703,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddi s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -9688,20 +9729,20 @@ which seems to be undefined. Please mak if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ + mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi ;; diff -upN a/rsync.1 b/rsync.1 --- a/rsync.1 +++ b/rsync.1 @@ -1,6 +1,6 @@ -.TH "rsync" "1" "26 Mar 2011" "" "" +.TH "rsync" "1" "23 Sep 2011" "" "" .SH "NAME" -rsync \(em a fast, versatile, remote (and local) file\-copying tool +rsync \- a fast, versatile, remote (and local) file\-copying tool .SH "SYNOPSIS" .PP @@ -346,6 +346,20 @@ daemon (including stand\-alone and inetd If you\(cq\&re using one of the remote\-shell transports for the transfer, there is no need to manually start an rsync daemon. .PP +.SH "SORTED TRANSFER ORDER" + +.PP +Rsync always sorts the specified filenames into its internal transfer list. +This handles the merging together of the contents of identically named +directories, makes it easy to remove duplicate filenames, and may confuse +someone when the files are transferred in a different order than what was +given on the command\-line. +.PP +If you need a particular file to be transferred prior to another, either +separate the files into different rsync calls, or consider using +\fB\-\-delay\-updates\fP (which doesn\(cq\&t affect the sorted transfer order, but +does make the final file\-updating phase happen much more rapidly). +.PP .SH "EXAMPLES" .PP @@ -442,10 +456,10 @@ to the detailed description below for a \-\-remove\-source\-files sender removes synchronized files (non\-dir) \-\-del an alias for \-\-delete\-during \-\-delete delete extraneous files from dest dirs - \-\-delete\-before receiver deletes before transfer (default) - \-\-delete\-during receiver deletes during xfer, not before + \-\-delete\-before receiver deletes before xfer, not during + \-\-delete\-during receiver deletes during the transfer \-\-delete\-delay find deletions during, delete after - \-\-delete\-after receiver deletes after transfer, not before + \-\-delete\-after receiver deletes after transfer, not during \-\-delete\-excluded also delete excluded files from dest dirs \-\-ignore\-errors delete even if there are I/O errors \-\-force force deletion of dirs even if not empty @@ -533,11 +547,17 @@ accepted: .SH "OPTIONS" .PP -rsync uses the GNU long options package. Many of the command line -options have two variants, one short and one long. These are shown -below, separated by commas. Some options only have a long variant. -The \(cq\&=\(cq\& for options that take a parameter is optional; whitespace -can be used instead. +Rsync accepts both long (double\-dash + word) and short (single\-dash + letter) +options. The full list of the available options are described below. If an +option can be specified in more than one way, the choices are comma\-separated. +Some options only have a long variant, not a short. If the option takes a +parameter, the parameter is only listed after the long variant, even though it +must also be specified for the short. When specifying a parameter, you can +either use the form \-\-option=param or replace the \(cq\&=\(cq\& with whitespace. The +parameter may need to be quoted in some manner for it to survive the shell\(cq\&s +command\-line parsing. Keep in mind that a leading tilde (~) in a filename is +substituted by your shell, so \-\-option=~/foo will not change the tilde into +your home directory (remove the \(cq\&=\(cq\& for that). .PP .IP "\fB\-\-help\fP" Print a short help page describing the options @@ -1144,7 +1164,7 @@ used by \fB\-\-fake\-super\fP) unless yo .IP .IP "\fB\-\-chmod\fP" This option tells rsync to apply one or more -comma\-separated \(dq\&chmod\(dq\& strings to the permission of the files in the +comma\-separated \(dq\&chmod\(dq\& modes to the permission of the files in the transfer. The resulting value is treated as though it were the permissions that the sending side supplied for the file, which means that this option can seem to have no effect on existing files if \fB\-\-perms\fP is not enabled. @@ -1349,6 +1369,16 @@ This tells rsync to remove from the send side the files (meaning non\-directories) that are a part of the transfer and have been successfully duplicated on the receiving side. .IP +Note that you should only use this option on source files that are quiescent. +If you are using this to move files that show up in a particular directory over +to another host, make sure that the finished files get renamed into the source +directory, not directly written into it, so that rsync can\(cq\&t possibly transfer +a file that is not yet fully written. If you can\(cq\&t first write the files into +a different directory, you should use a naming idiom that lets rsync avoid +transferring files that are not yet finished (e.g. name the file \(dq\&foo.new\(dq\& when +it is written, rename it to \(dq\&foo\(dq\& when it is done, and then use the option +\fB\-\-exclude='\&*.new'\&\fP for the rsync transfer). +.IP .IP "\fB\-\-delete\fP" This tells rsync to delete extraneous files from the receiving side (ones that aren\(cq\&t on the sending side), but only for the @@ -3501,7 +3531,7 @@ http://rsync.samba.org/ .SH "VERSION" .PP -This man page is current for version 3.0.8 of rsync. +This man page is current for version 3.0.9 of rsync. .PP .SH "INTERNAL OPTIONS" diff -upN a/rsyncd.conf.5 b/rsyncd.conf.5 --- a/rsyncd.conf.5 +++ b/rsyncd.conf.5 @@ -1,6 +1,6 @@ -.TH "rsyncd.conf" "5" "26 Mar 2011" "" "" +.TH "rsyncd.conf" "5" "23 Sep 2011" "" "" .SH "NAME" -rsyncd.conf \(em configuration file for rsync in daemon mode +rsyncd.conf \- configuration file for rsync in daemon mode .SH "SYNOPSIS" .PP @@ -143,6 +143,12 @@ This parameter specifies the directory i filesystem to make available in this module. You must specify this parameter for each module in \f(CWrsyncd.conf\fP. .IP +It is fine if the path includes internal spaces \-\- they will be retained +verbatim (which means that you shouldn\(cq\&t try to escape them). If your final +directory has a trailing space (and this is somehow not something you wish to +fix), append a trailing slash to the path to avoid losing the trailing +whitespace. +.IP .IP "\fBuse chroot\fP" If \(dq\&use chroot\(dq\& is true, the rsync daemon will chroot to the \(dq\&path\(dq\& before starting the file transfer with the client. This has @@ -376,7 +382,7 @@ subtree; the easiest way to do this is w .IP The \(dq\&filter\(dq\& parameter takes a space\-separated list of daemon filter rules, though it is smart enough to know not to split a token at an internal space in -a rule (e.g. \(dq\&\- /foo \(em /bar\(dq\& is parsed as two rules). You may specify one or +a rule (e.g. \(dq\&\- /foo \- /bar\(dq\& is parsed as two rules). You may specify one or more merge\-file rules using the normal syntax. Only one \(dq\&filter\(dq\& parameter can apply to a given module in the config file, so put all the rules you want in a single parameter. Note that per\-directory merge\-file rules do not provide as @@ -822,7 +828,7 @@ http://rsync.samba.org/ .SH "VERSION" .PP -This man page is current for version 3.0.8 of rsync. +This man page is current for version 3.0.9 of rsync. .PP .SH "CREDITS"