Fixed --delete-delay by making the fprintf() output an unsigned short

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 536302f..3607f2e 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -50,7 +50,6 @@ extern int delete_during;
 extern int delete_after;
 extern int module_id;
 extern int ignore_errors;
-extern int flist_extra_ndx;
 extern int remove_source_files;
 extern int delay_updates;
 extern int update_only;
@@ -86,7 +85,6 @@ extern long block_size; /* "long" because popt can't set an int32. */
 extern int max_delete;
 extern int force_delete;
 extern int one_file_system;
-extern int file_struct_len;
 extern struct stats stats;
 extern dev_t filesystem_dev;
 extern char *backup_dir;
@@ -100,6 +98,7 @@ int non_perishable_cnt = 0;
 
 static int deletion_count = 0; /* used to implement --max-delete */
 static FILE *delete_delay_fp = NULL;
+static BOOL solo_file = 0;
 
 /* For calling delete_item() and delete_dir_contents(). */
 #define DEL_RECURSE            (1<<1) /* recurse */
@@ -246,7 +245,7 @@ static enum delret delete_dir_contents(char *fname, int flags)
                        continue;
                }
 
-               strlcpy(p, fp->basename, remainder);
+               strlcpy(p, F_BASENAME(fp), remainder);
                /* Save stack by recursing to ourself directly. */
                if (S_ISDIR(fp->mode)
                 && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
@@ -393,7 +392,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
         * from the filesystem. */
        for (i = dirlist->count; i--; ) {
                struct file_struct *fp = dirlist->files[i];
-               if (!fp->basename)
+               if (!F_IS_ACTIVE(fp))
                        continue;
                if (fp->flags & FLAG_MOUNT_DIR) {
                        if (verbose > 1)
@@ -404,7 +403,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
                if (flist_find(flist, fp) < 0) {
                        f_name(fp, delbuf);
                        if (delete_delay_fp)
-                               fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0');
+                               fprintf(delete_delay_fp, "%o %s%c", fp->mode, delbuf, '\0');
                        else
                                delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
                }
@@ -470,7 +469,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
                    : S_ISDIR(file->mode) ? !omit_dir_times
                    : !S_ISLNK(file->mode);
 
-               if (S_ISREG(file->mode) && file->length != st->st_size)
+               if (S_ISREG(file->mode) && F_LENGTH(file) != st->st_size)
                        iflags |= ITEM_REPORT_SIZE;
                if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
                  && !(iflags & ITEM_MATCHED)
@@ -509,7 +508,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 /* Perform our quick-check heuristic for determining if a file is unchanged. */
 int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
 {
-       if (st->st_size != file->length)
+       if (st->st_size != F_LENGTH(file))
                return 0;
 
        /* if always checksum is set then we use the checksum instead
@@ -666,7 +665,7 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 {
        int fname_len, fname_suf_len;
-       const char *fname_suf, *fname = file->basename;
+       const char *fname_suf, *fname = F_BASENAME(file);
        uint32 lowest_dist = 25 << 16; /* ignore a distance greater than 25 */
        int j, lowest_j = -1;
 
@@ -679,12 +678,12 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
                int len, suf_len;
                uint32 dist;
 
-               if (!S_ISREG(fp->mode) || !fp->length || fp->flags & FLAG_SENT)
+               if (!S_ISREG(fp->mode) || !F_LENGTH(fp) || fp->flags & FLAG_SENT)
                        continue;
 
-               name = fp->basename;
+               name = F_BASENAME(fp);
 
-               if (fp->length == file->length
+               if (F_LENGTH(fp) == F_LENGTH(file)
                    && cmp_time(fp->modtime, file->modtime) == 0) {
                        if (verbose > 4) {
                                rprintf(FINFO,
@@ -714,6 +713,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
        return lowest_j;
 }
 
+#ifdef SUPPORT_HARD_LINKS
 void check_for_finished_hlinks(int itemizing, enum logcode code)
 {
        struct file_struct *file;
@@ -724,12 +724,13 @@ void check_for_finished_hlinks(int itemizing, enum logcode code)
                        continue;
 
                file = the_file_list->files[ndx];
-               if (!IS_HLINKED(file))
+               if (!F_IS_HLINKED(file))
                        continue;
 
                hard_link_cluster(file, ndx, itemizing, code, -1);
        }
 }
+#endif
 
 /* This is only called for regular files.  We return -2 if we've finished
  * handling the file, -1 if no dest-linking occurred, or a non-negative
@@ -787,7 +788,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                        if (hard_link_one(file, ndx, fname, 0, stp,
                                          cmpbuf, 1, i, code) < 0)
                                goto try_a_copy;
-                       if (preserve_hard_links && IS_HLINKED(file))
+                       if (preserve_hard_links && F_IS_HLINKED(file))
                                hard_link_cluster(file, ndx, itemizing, code, j);
                } else
 #endif
@@ -818,8 +819,10 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                        rprintf(code, "%s%s\n", fname,
                                match_level == 3 ? " is uptodate" : "");
                }
-               if (preserve_hard_links && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+               if (preserve_hard_links && F_IS_HLINKED(file))
                        hard_link_cluster(file, ndx, itemizing, code, j);
+#endif
                return -2;
        }
 
@@ -836,6 +839,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
        char lnk[MAXPATHLEN];
        int best_match = -1;
        int match_level = 0;
+       uint32 *devp;
        enum nonregtype type;
        int len, j = 0;
 
@@ -893,7 +897,8 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
                        break;
                case TYPE_SPECIAL:
                case TYPE_DEVICE:
-                       if (stp->st_rdev != MAKEDEV(F_DMAJOR(file), F_DMINOR(file)))
+                       devp = F_RDEV_P(file);
+                       if (stp->st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
                                continue;
                        break;
 #ifdef SUPPORT_LINKS
@@ -943,7 +948,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
                                        cmpbuf, fname);
                                return j;
                        }
-                       if (preserve_hard_links && IS_HLINKED(file))
+                       if (preserve_hard_links && F_IS_HLINKED(file))
                                hard_link_cluster(file, ndx, itemizing, code, -1);
                } else
 #endif
@@ -1157,17 +1162,19 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                return;
        }
 
-       if (preserve_hard_links && IS_HLINKED(file)
+#ifdef SUPPORT_HARD_LINKS
+       if (preserve_hard_links && F_IS_HLINKED(file)
            && hard_link_check(file, ndx, fname, statret, &st,
                               itemizing, code, HL_CHECK_MASTER))
                return;
+#endif
 
        if (preserve_links && S_ISLNK(file->mode)) {
 #ifdef SUPPORT_LINKS
                const char *sl = F_SYMLINK(file);
                if (safe_symlinks && unsafe_symlink(sl, fname)) {
                        if (verbose) {
-                               if (the_file_list->count == 1)
+                               if (solo_file)
                                        fname = f_name(file, NULL);
                                rprintf(FINFO,
                                        "ignoring unsafe symlink %s -> \"%s\"\n",
@@ -1187,8 +1194,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                if (itemizing)
                                        itemize(file, ndx, 0, &st, 0, 0, NULL);
                                set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
-                               if (preserve_hard_links && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+                               if (preserve_hard_links && F_IS_HLINKED(file))
                                        hard_link_cluster(file, ndx, itemizing, code, -1);
+#endif
                                if (remove_source_files == 1)
                                        goto return_with_success;
                                return;
@@ -1213,10 +1222,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        } else if (j >= 0)
                                statret = 1;
                }
-               if (preserve_hard_links && IS_HLINKED(file)
+#ifdef SUPPORT_HARD_LINKS
+               if (preserve_hard_links && F_IS_HLINKED(file)
                    && hard_link_check(file, ndx, fname, -1, &st,
                                       itemizing, code, HL_SKIP))
                        return;
+#endif
                if (do_symlink(sl, fname) != 0) {
                        rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
                                full_fname(fname), sl);
@@ -1228,8 +1239,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        }
                        if (code != FNONE && verbose)
                                rprintf(code, "%s -> %s\n", fname, sl);
-                       if (preserve_hard_links && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+                       if (preserve_hard_links && F_IS_HLINKED(file))
                                hard_link_cluster(file, ndx, itemizing, code, -1);
+#endif
                        /* This does not check remove_source_files == 1
                         * because this is one of the items that the old
                         * --remove-sent-files option would remove. */
@@ -1242,7 +1255,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
        if ((am_root && preserve_devices && IS_DEVICE(file->mode))
         || (preserve_specials && IS_SPECIAL(file->mode))) {
-               dev_t rdev = MAKEDEV(F_DMAJOR(file), F_DMINOR(file));
+               uint32 *devp = F_RDEV_P(file);
+               dev_t rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
                if (statret == 0) {
                        char *t;
                        if (IS_DEVICE(file->mode)) {
@@ -1261,8 +1275,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                if (itemizing)
                                        itemize(file, ndx, 0, &st, 0, 0, NULL);
                                set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
-                               if (preserve_hard_links && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+                               if (preserve_hard_links && F_IS_HLINKED(file))
                                        hard_link_cluster(file, ndx, itemizing, code, -1);
+#endif
                                if (remove_source_files == 1)
                                        goto return_with_success;
                                return;
@@ -1285,13 +1301,16 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        } else if (j >= 0)
                                statret = 1;
                }
-               if (preserve_hard_links && IS_HLINKED(file)
+#ifdef SUPPORT_HARD_LINKS
+               if (preserve_hard_links && F_IS_HLINKED(file)
                    && hard_link_check(file, ndx, fname, -1, &st,
                                       itemizing, code, HL_SKIP))
                        return;
+#endif
                if (verbose > 2) {
-                       rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
-                               fname, (int)file->mode, (int)rdev);
+                       rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n",
+                               fname, (int)file->mode,
+                               (long)major(rdev), (long)minor(rdev));
                }
                if (do_mknod(fname, file->mode, rdev) < 0) {
                        rsyserr(FERROR, errno, "mknod %s failed",
@@ -1304,8 +1323,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        }
                        if (code != FNONE && verbose)
                                rprintf(code, "%s\n", fname);
-                       if (preserve_hard_links && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+                       if (preserve_hard_links && F_IS_HLINKED(file))
                                hard_link_cluster(file, ndx, itemizing, code, -1);
+#endif
                        if (remove_source_files == 1)
                                goto return_with_success;
                }
@@ -1313,23 +1334,23 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        }
 
        if (!S_ISREG(file->mode)) {
-               if (the_file_list->count == 1)
+               if (solo_file)
                        fname = f_name(file, NULL);
                rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
                return;
        }
 
-       if (max_size && file->length > max_size) {
+       if (max_size && F_LENGTH(file) > max_size) {
                if (verbose > 1) {
-                       if (the_file_list->count == 1)
+                       if (solo_file)
                                fname = f_name(file, NULL);
                        rprintf(FINFO, "%s is over max-size\n", fname);
                }
                return;
        }
-       if (min_size && file->length < min_size) {
+       if (min_size && F_LENGTH(file) < min_size) {
                if (verbose > 1) {
-                       if (the_file_list->count == 1)
+                       if (solo_file)
                                fname = f_name(file, NULL);
                        rprintf(FINFO, "%s is under min-size\n", fname);
                }
@@ -1394,7 +1415,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
                                        fname, fnamecmpbuf);
                        }
-                       st.st_size = fuzzy_file->length;
+                       st.st_size = F_LENGTH(fuzzy_file);
                        statret = 0;
                        fnamecmp = fnamecmpbuf;
                        fnamecmp_type = FNAMECMP_FUZZY;
@@ -1402,10 +1423,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        }
 
        if (statret != 0) {
-               if (preserve_hard_links && IS_HLINKED(file)
+#ifdef SUPPORT_HARD_LINKS
+               if (preserve_hard_links && F_IS_HLINKED(file)
                    && hard_link_check(file, ndx, fname, statret, &st,
                                       itemizing, code, HL_SKIP))
                        return;
+#endif
                if (stat_errno == ENOENT)
                        goto notify_others;
                rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
@@ -1413,7 +1436,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                return;
        }
 
-       if (append_mode && st.st_size > file->length)
+       if (append_mode && st.st_size > F_LENGTH(file))
                return;
 
        if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
@@ -1430,16 +1453,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                0, 0, NULL);
                }
                set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
-               if (preserve_hard_links && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+               if (preserve_hard_links && F_IS_HLINKED(file))
                        hard_link_cluster(file, ndx, itemizing, code, -1);
+#endif
                if (remove_source_files != 1)
                        return;
          return_with_success:
-               if (!dry_run) {
-                       char numbuf[4];
-                       SIVAL(numbuf, 0, ndx);
-                       send_msg(MSG_SUCCESS, numbuf, 4);
-               }
+               if (!dry_run)
+                       send_msg_int(MSG_SUCCESS, ndx);
                return;
        }
 
@@ -1468,10 +1490,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        full_fname(fnamecmp));
          pretend_missing:
                /* pretend the file didn't exist */
-               if (preserve_hard_links && IS_HLINKED(file)
+#ifdef SUPPORT_HARD_LINKS
+               if (preserve_hard_links && F_IS_HLINKED(file)
                    && hard_link_check(file, ndx, fname, statret, &st,
                                       itemizing, code, HL_SKIP))
                        return;
+#endif
                statret = real_ret = -1;
                goto notify_others;
        }
@@ -1524,12 +1548,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                if (fnamecmp_type == FNAMECMP_FUZZY)
                        iflags |= ITEM_XNAME_FOLLOWS;
                itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
-                       fuzzy_file ? fuzzy_file->basename : NULL);
+                       fuzzy_file ? F_BASENAME(fuzzy_file) : NULL);
        }
 
        if (!do_xfers) {
-               if (preserve_hard_links && IS_HLINKED(file))
+#ifdef SUPPORT_HARD_LINKS
+               if (preserve_hard_links && F_IS_HLINKED(file))
                        hard_link_cluster(file, ndx, itemizing, code, -1);
+#endif
                return;
        }
        if (read_batch)
@@ -1587,6 +1613,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                maybe_ATTRS_REPORT = ATTRS_REPORT;
                code = FINFO;
        }
+       solo_file = local_name != NULL;
 
        if (verbose > 2) {
                rprintf(FINFO, "generator starting pid=%ld count=%d\n",
@@ -1617,7 +1644,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
        for (i = 0; i < flist->count; i++) {
                struct file_struct *file = flist->files[i];
 
-               if (!file->basename)
+               if (!F_IS_ACTIVE(file))
                        continue;
 
                if (local_name)
@@ -1644,8 +1671,10 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                }
 #endif
 
+#ifdef SUPPORT_HARD_LINKS
                if (preserve_hard_links)
                        check_for_finished_hlinks(itemizing, code);
+#endif
 
                if (allowed_lull && !(i % lull_mod))
                        maybe_send_keepalive();
@@ -1666,7 +1695,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
        make_backups = 0; /* avoid a duplicate backup for inplace processing */
 
        if (verbose > 2)
-               rprintf(FINFO,"generate_files phase=%d\n",phase);
+               rprintf(FINFO, "generate_files phase=%d\n", phase);
 
        write_int(f_out, NDX_DONE);
 
@@ -1688,7 +1717,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
        make_backups = save_make_backups;
 
        if (verbose > 2)
-               rprintf(FINFO,"generate_files phase=%d\n",phase);
+               rprintf(FINFO, "generate_files phase=%d\n", phase);
 
        write_int(f_out, NDX_DONE);
        /* Reduce round-trip lag-time for a useless delay-updates phase. */
@@ -1721,8 +1750,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
                 * modified-time values. */
                for (i = 0; i < flist->count; i++) {
                        struct file_struct *file = flist->files[i];
-
-                       if (!file->basename || !S_ISDIR(file->mode))
+                       if (!F_IS_ACTIVE(file) || !S_ISDIR(file->mode))
                                continue;
                        if (!need_retouch_dir_times && file->mode & S_IWUSR)
                                continue;
@@ -1754,5 +1782,5 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
        }
 
        if (verbose > 2)
-               rprintf(FINFO,"generate_files finished\n");
+               rprintf(FINFO, "generate_files finished\n");
 }