Changed remote_filesfrom_file to filesfrom_host.

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index c1f3897..454b276 100644 (file)
--- a/io.c
+++ b/io.c
@@ -51,7 +51,7 @@ extern int eol_nulls;
 extern int csum_length;
 extern int checksum_seed;
 extern int protocol_version;
-extern char *remote_filesfrom_file;
+extern char *filesfrom_host;
 extern struct stats stats;
 
 const char phase_unknown[] = "unknown";
@@ -376,9 +376,11 @@ void io_set_filesfrom_fds(int f_in, int f_out)
 static void whine_about_eof(int fd)
 {
        if (kluge_around_eof && fd == sock_f_in) {
+               int i;
                if (kluge_around_eof > 0)
                        exit_cleanup(0);
-               while (1)
+               /* If we're still here after 10 seconds, exit with an error. */
+               for (i = 10*1000/20; i--; )
                        msleep(20);
        }
 
@@ -564,7 +566,7 @@ int read_filesfrom_line(int fd, char *fname)
 {
        char ch, *s, *eob = fname + MAXPATHLEN - 1;
        int cnt;
-       int reading_remotely = remote_filesfrom_file != NULL;
+       int reading_remotely = filesfrom_host != NULL;
        int nulls = eol_nulls || reading_remotely;
 
   start: