Log items that are unchanged if verbose > 1.
authorWayne Davison <wayned@samba.org>
Sat, 19 Feb 2005 02:39:33 +0000 (02:39 +0000)
committerWayne Davison <wayned@samba.org>
Sat, 19 Feb 2005 02:39:33 +0000 (02:39 +0000)
receiver.c
sender.c

index 85086f6541c53463c086188640c7b61d87fcbbf4..9ee747bbca9808dea49c07332768df59445d477c 100644 (file)
@@ -371,11 +371,11 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
                file = flist->files[i];
 
                if (protocol_version >= 29) {
-                       iflags = read_short(f_in);
+                       iflags = read_shortint(f_in);
                        if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
                                if (am_server)
                                        ; /* do nothing */
-                               else if (itemize_changes
+                               else if (itemize_changes || verbose > 1
                                    || iflags & ITEM_UPDATING
                                    || (S_ISDIR(file->mode)
                                     && iflags & ITEM_REPORT_TIME))
index e1bee3677a1f370d9058f035a0e4a65bb5ac0d06..a0ff6d9d35658ad6ae7459adeb0e367cb79de6a6 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -145,12 +145,12 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                file = flist->files[i];
 
                if (protocol_version >= 29) {
-                       iflags = read_short(f_in);
+                       iflags = read_shortint(f_in);
                        if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
                                if (am_server) {
                                        write_int(f_out, i);
-                                       write_short(f_out, iflags);
-                               } else if (itemize_changes
+                                       write_shortint(f_out, iflags);
+                               } else if (itemize_changes || verbose > 1
                                    || iflags & ITEM_UPDATING
                                    || (S_ISDIR(file->mode)
                                     && iflags & ITEM_REPORT_TIME))
@@ -193,7 +193,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                                log_send(file, &stats, iflags);
                        write_int(f_out, i);
                        if (protocol_version >= 29)
-                               write_short(f_out, iflags);
+                               write_shortint(f_out, iflags);
                        continue;
                }
 
@@ -246,7 +246,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                write_int(f_out, i);
                if (protocol_version >= 29)
-                       write_short(f_out, iflags);
+                       write_shortint(f_out, iflags);
                write_sum_head(f_out, s);
 
                if (verbose > 2) {