Cleaned up whitespace/indentation.

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 2e11766..969a4d6 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -795,7 +795,7 @@ void send_file_name(int f, struct file_list *flist, char *fname,
        if (write_batch)        /*  dw  */
                file->flags = FLAG_DELETE;
 
-       if (strcmp(file->basename, "")) {
+       if (file->basename[0]) {
                flist->files[flist->count++] = file;
                send_file_entry(file, f, base_flags);
        }
@@ -859,7 +859,8 @@ static void send_directory(int f, struct file_list *flist, char *dir)
 
        for (di = readdir(d); di; di = readdir(d)) {
                char *dname = d_name(di);
-               if (strcmp(dname, ".") == 0 || strcmp(dname, "..") == 0)
+               if (dname[0] == '.' && (dname[1] == '\0' ||
+                   (dname[1] == '.' && dname[2] == '\0')))
                        continue;
                strlcpy(p, dname, MAXPATHLEN - l);
                send_file_name(f, flist, fname, recurse, 0);
@@ -1042,12 +1043,12 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
        /* now send the uid/gid list. This was introduced in protocol
           version 15 */
-       if (f != -1 && remote_version >= 15) {
+       if (f != -1) {
                send_uid_list(f);
        }
 
-       /* if protocol version is >= 17 then send the io_error flag */
-       if (f != -1 && remote_version >= 17) {
+       /* send the io_error flag */
+       if (f != -1) {
                extern int module_id;
                write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
        }
@@ -1122,12 +1123,12 @@ struct file_list *recv_file_list(int f)
        }
 
        /* now recv the uid/gid list. This was introduced in protocol version 15 */
-       if (f != -1 && remote_version >= 15) {
+       if (f != -1) {
                recv_uid_list(f, flist);
        }
 
-       /* if protocol version is >= 17 then recv the io_error flag */
-       if (f != -1 && remote_version >= 17 && !read_batch) {   /* dw-added readbatch */
+       /* recv the io_error flag */
+       if (f != -1 && !read_batch) {   /* dw-added readbatch */
                extern int module_id;
                extern int ignore_errors;
                if (lp_ignore_errors(module_id) || ignore_errors) {