Use the new names for the transmit-flag defines.

diff --git a/batch.c b/batch.c
index 456bbb9..dc96c1d 100644 (file)
--- a/batch.c
+++ b/batch.c
@@ -45,8 +45,10 @@ void write_batch_flist_info(int flist_count, struct file_struct **files)
        write_int(f, protocol_version);
        write_int(f, flist_count);
 
        write_int(f, protocol_version);
        write_int(f, flist_count);
 

-       for (i = 0; i < flist_count; i++)
-               send_file_entry(files[i], f, files[i]->flags & LIVE_FLAGS);
+       for (i = 0; i < flist_count; i++) {
+               send_file_entry(files[i], f, files[i]->flags & FLAG_TOP_DIR ?
+                               XMIT_TOP_DIR : 0);
+       }

        send_file_entry(NULL, f, 0);
 
        protocol_version = save_pv;
        send_file_entry(NULL, f, 0);
 
        protocol_version = save_pv;


@@ -149,7 +151,7 @@ struct file_list *create_flist_from_batch(void)
                out_of_memory("create_flist_from_batch");
 
        for (i = 0; (flags = read_byte(f)) != 0; i++) {
                out_of_memory("create_flist_from_batch");
 
        for (i = 0; (flags = read_byte(f)) != 0; i++) {

-               if (protocol_version >= 28 && (flags & EXTENDED_FLAGS))
+               if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))

                        flags |= read_byte(f) << 8;
                receive_file_entry(&batch_flist->files[i], flags, f);
        }
                        flags |= read_byte(f) << 8;
                receive_file_entry(&batch_flist->files[i], flags, f);
        }

diff --git a/receiver.c b/receiver.c
index b3e2f23..71897a9 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -91,8 +91,9 @@ void delete_files(struct file_list *flist)
        }
 
        for (j = 0;j < flist->count; j++) {
        }
 
        for (j = 0;j < flist->count; j++) {

-               if (!S_ISDIR(flist->files[j]->mode) ||
-                   !(flist->files[j]->flags & FLAG_DELETE)) continue;
+               if (!(flist->files[j]->flags & FLAG_TOP_DIR)
+                   || !S_ISDIR(flist->files[j]->mode))
+                       continue;

 
                argv[0] = f_name_to(flist->files[j], fbuf);
 
 
                argv[0] = f_name_to(flist->files[j], fbuf);