Fixed compilation errors/warnings.

diff --git a/acls.diff b/acls.diff
index 1038d73..071b63e 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -292,7 +292,7 @@ To use this patch, run these commands for a successful build:
 +              if (type == SMB_ACL_TYPE_ACCESS)
 +                      F_ACL(file) = ndx;
 +              else
-+                      F_DEF_ACL(file) = ndx;
++                      F_DIR_DEFACL(file) = ndx;
 +              racl_list = &default_acl_list;
 +      } while (BUMP_TYPE(type) && S_ISDIR(file->mode));
 +}
@@ -314,7 +314,7 @@ To use this patch, run these commands for a successful build:
        if (S_ISDIR(file->mode))
 --- old/compat.c
 +++ new/compat.c
-@@ -148,13 +148,6 @@ void setup_protocol(int f_out,int f_in)
+@@ -163,13 +163,6 @@ void setup_protocol(int f_out,int f_in)
        if (protocol_version < 30) {
                if (append_mode == 1)
                        append_mode = 2;

diff --git a/detect-renamed.diff b/detect-renamed.diff
index b861477..954dfad 100644 (file)
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -42,7 +42,7 @@ TODO:
  extern int make_backups;
  extern char *shell_cmd; /* contains VER.SUB string if client is a pre-release */
  extern char *backup_dir, *backup_suffix;
-@@ -225,7 +226,7 @@ void setup_protocol(int f_out,int f_in)
+@@ -221,7 +222,7 @@ void setup_protocol(int f_out,int f_in)
        } else if (protocol_version >= 30) {
                if (recurse && allow_inc_recurse
                 && !delete_before && !delete_after && !delay_updates
@@ -121,8 +121,8 @@ TODO:
                rprintf(FINFO, "send_file_list done\n");
  
 +      if (detect_renamed) {
-+              int j = flist->count;
-+              the_fattr_list.count = j;
++              int j = flist->used;
++              the_fattr_list.used = j;
 +              the_fattr_list.files = new_array(struct file_struct *, j);
 +              if (!the_fattr_list.files)
 +                      out_of_memory("recv_file_list");
@@ -486,7 +486,7 @@ TODO:
                rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
  
 +      if (detect_renamed) {
-+              delayed_bits = bitbag_create(cur_flist->count);
++              delayed_bits = bitbag_create(cur_flist->used);
 +              if (!delete_before && !delete_during)
 +                      delete_during = -1;
 +      }

diff --git a/downdate.diff b/downdate.diff
index 3484b20..08598d1 100644 (file)
--- a/downdate.diff
+++ b/downdate.diff
@@ -17,12 +17,12 @@ To use this patch, run these commands for a successful build:
  extern int ignore_existing;
  extern int ignore_non_existing;
  extern int inplace;
-@@ -1513,6 +1514,13 @@ static void recv_generator(char *fname, 
+@@ -1528,6 +1529,13 @@ static void recv_generator(char *fname, 
                goto cleanup;
        }
  
 +      if (downdate_only && statret == 0
-+          && cmp_time(st.st_mtime, file->modtime) < 0) {
++          && cmp_time(sx.st.st_mtime, file->modtime) < 0) {
 +              if (verbose > 1)
 +                      rprintf(FINFO, "%s is older\n", fname);
 +              return;
@@ -31,7 +31,7 @@ To use this patch, run these commands for a successful build:
        fnamecmp = fname;
        fnamecmp_type = FNAMECMP_FNAME;
  
-@@ -1806,6 +1814,7 @@ void check_for_finished_files(int itemiz
+@@ -1825,6 +1833,7 @@ void check_for_finished_files(int itemiz
                ignore_existing = -ignore_existing;
                ignore_non_existing = -ignore_non_existing;
                update_only = -update_only;
@@ -39,7 +39,7 @@ To use this patch, run these commands for a successful build:
                always_checksum = -always_checksum;
                size_only = -size_only;
                append_mode = -append_mode;
-@@ -1831,6 +1840,7 @@ void check_for_finished_files(int itemiz
+@@ -1850,6 +1859,7 @@ void check_for_finished_files(int itemiz
                ignore_existing = -ignore_existing;
                ignore_non_existing = -ignore_non_existing;
                update_only = -update_only;
@@ -57,7 +57,7 @@ To use this patch, run these commands for a successful build:
  int cvs_exclude = 0;
  int dry_run = 0;
  int do_xfers = 1;
-@@ -317,6 +318,7 @@ void usage(enum logcode F)
+@@ -318,6 +319,7 @@ void usage(enum logcode F)
    rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
    rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
    rprintf(F," -u, --update                skip files that are newer on the receiver\n");
@@ -65,7 +65,7 @@ To use this patch, run these commands for a successful build:
    rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
    rprintf(F,"     --append                append data onto shorter files\n");
    rprintf(F,"     --append-verify         like --append, but with old data in file checksum\n");
-@@ -517,6 +519,7 @@ static struct poptOption long_options[] 
+@@ -522,6 +524,7 @@ static struct poptOption long_options[] 
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
    {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
    {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },

diff --git a/ignore-case.diff b/ignore-case.diff
index c33e82b..7754f98 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -55,16 +55,15 @@ TODO:
  extern int ignore_errors;
  extern int numeric_ids;
  extern int recurse;
-@@ -2493,7 +2494,7 @@ static int found_prefix;
- int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -2494,6 +2495,7 @@ int f_name_cmp(const struct file_struct 
  {
        int dif;
--      const uchar *c1, *c2;
-+      const uchar *c1, *c2, ch1, ch2;
+       const uchar *c1, *c2;
++      uchar ch1, ch2;
        enum fnc_state state1, state2;
        enum fnc_type type1, type2;
        enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
-@@ -2604,7 +2605,15 @@ int f_name_cmp(const struct file_struct 
+@@ -2604,7 +2606,15 @@ int f_name_cmp(const struct file_struct 
                        if (type1 != type2)
                                return type1 == t_PATH ? 1 : -1;
                }
@@ -184,7 +183,7 @@ TODO:
    rprintf(F,"     --files-from=FILE       read list of source-file names from FILE\n");
    rprintf(F," -0, --from0                 all *-from/filter files are delimited by 0s\n");
    rprintf(F," -s, --protect-args          no space-splitting; only wildcard special-chars\n");
-@@ -590,6 +592,8 @@ static struct poptOption long_options[] 
+@@ -593,6 +595,8 @@ static struct poptOption long_options[] 
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
    {"write-batch",      0,  POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
    {"only-write-batch", 0,  POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
@@ -193,7 +192,7 @@ TODO:
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
    {"from0",           '0', POPT_ARG_VAL,    &eol_nulls, 1, 0, 0},
    {"no-from0",         0,  POPT_ARG_VAL,    &eol_nulls, 0, 0, 0},
-@@ -1896,6 +1900,9 @@ void server_options(char **args, int *ar
+@@ -1907,6 +1911,9 @@ void server_options(char **args, int *ar
                args[ac++] = arg;
        }
  

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 9a9c9ae..b6b7802 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -33,7 +33,7 @@ To use this patch, run these commands for a successful build:
  
  extern char curr_dir[MAXPATHLEN];
  
-@@ -834,7 +835,7 @@ static struct file_struct *recv_file_ent
+@@ -830,7 +831,7 @@ static struct file_struct *recv_file_ent
                extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
  #endif
  
@@ -264,7 +264,7 @@ To use this patch, run these commands for a successful build:
 +}
 +
 +
-+int link_by_hash(char *fnametmp,char *fname,struct file_struct *file)
++int link_by_hash(const char *fnametmp, const char *fname, struct file_struct *file)
 +{
 +      STRUCT_STAT st;
 +      char *hashname = make_hash_name(file);
@@ -408,7 +408,7 @@ To use this patch, run these commands for a successful build:
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -558,6 +560,7 @@ static struct poptOption long_options[] 
+@@ -561,6 +563,7 @@ static struct poptOption long_options[] 
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@ -416,7 +416,7 @@ To use this patch, run these commands for a successful build:
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
    {"compress",        'z', POPT_ARG_NONE,   0, 'z', 0, 0 },
    {"no-compress",      0,  POPT_ARG_VAL,    &do_compression, 0, 0, 0 },
-@@ -1216,6 +1219,21 @@ int parse_arguments(int *argc_p, const c
+@@ -1219,6 +1222,21 @@ int parse_arguments(int *argc_p, const c
                        return 0;
  #endif
  
@@ -438,7 +438,7 @@ To use this patch, run these commands for a successful build:
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1954,6 +1972,11 @@ void server_options(char **args, int *ar
+@@ -1965,6 +1983,11 @@ void server_options(char **args, int *ar
        } else if (inplace)
                args[ac++] = "--inplace";
  
@@ -533,7 +533,7 @@ To use this patch, run these commands for a successful build:
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  extern struct chmod_mode_struct *daemon_chmod_modes;
  #ifdef ICONV_OPTION
-@@ -457,8 +458,15 @@ void finish_transfer(const char *fname, 
+@@ -529,8 +530,15 @@ void finish_transfer(const char *fname, 
        /* move tmp file over real file */
        if (verbose > 2)
                rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index 4f94491..c34614c 100644 (file)
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -40,7 +40,7 @@ To use this patch, run these commands for a successful build:
  extern int size_only;
  extern OFF_T max_size;
  extern OFF_T min_size;
-@@ -620,7 +621,7 @@ void itemize(const char *fnamecmp, struc
+@@ -619,7 +620,7 @@ void itemize(const char *fnamecmp, struc
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
  int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  {
@@ -51,7 +51,7 @@ To use this patch, run these commands for a successful build:
        /* if always checksum is set then we use the checksum instead
 --- old/main.c
 +++ new/main.c
-@@ -127,7 +127,7 @@ pid_t wait_process(pid_t pid, int *statu
+@@ -132,7 +132,7 @@ pid_t wait_process(pid_t pid, int *statu
  }
  
  /* Wait for a process to exit, calling io_flush while waiting. */
@@ -62,7 +62,7 @@ To use this patch, run these commands for a successful build:
        int status;
 --- old/options.c
 +++ new/options.c
-@@ -101,6 +101,7 @@ int keep_partial = 0;
+@@ -102,6 +102,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int size_only = 0;
@@ -70,7 +70,7 @@ To use this patch, run these commands for a successful build:
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
-@@ -152,6 +153,8 @@ char *logfile_name = NULL;
+@@ -159,6 +160,8 @@ char *logfile_name = NULL;
  char *logfile_format = NULL;
  char *stdout_format = NULL;
  char *password_file = NULL;
@@ -79,7 +79,7 @@ To use this patch, run these commands for a successful build:
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
-@@ -370,6 +373,7 @@ void usage(enum logcode F)
+@@ -379,6 +382,7 @@ void usage(enum logcode F)
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
    rprintf(F,"     --size-only             skip files that match in size\n");
@@ -87,7 +87,7 @@ To use this patch, run these commands for a successful build:
    rprintf(F,"     --modify-window=NUM     compare mod-times with reduced accuracy\n");
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
-@@ -407,6 +411,8 @@ void usage(enum logcode F)
+@@ -418,6 +422,8 @@ void usage(enum logcode F)
    rprintf(F,"     --write-batch=FILE      write a batched update to FILE\n");
    rprintf(F,"     --only-write-batch=FILE like --write-batch but w/o updating destination\n");
    rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
@@ -96,7 +96,7 @@ To use this patch, run these commands for a successful build:
    rprintf(F,"     --protocol=NUM          force an older protocol version to be used\n");
  #ifdef ICONV_OPTION
    rprintf(F,"     --iconv=CONVERT_SPEC    request charset conversion of filesnames\n");
-@@ -506,6 +512,7 @@ static struct poptOption long_options[] 
+@@ -520,6 +526,7 @@ static struct poptOption long_options[] 
    {"chmod",            0,  POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
@@ -104,7 +104,7 @@ To use this patch, run these commands for a successful build:
    {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
    {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
    {"existing",         0,  POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },
-@@ -601,6 +608,8 @@ static struct poptOption long_options[] 
+@@ -619,6 +626,8 @@ static struct poptOption long_options[] 
    {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
    {"blocking-io",      0,  POPT_ARG_VAL,    &blocking_io, 1, 0, 0 },
    {"no-blocking-io",   0,  POPT_ARG_VAL,    &blocking_io, 0, 0, 0 },
@@ -113,7 +113,7 @@ To use this patch, run these commands for a successful build:
    {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
    {"checksum-seed",    0,  POPT_ARG_INT,    &checksum_seed, 0, 0, 0 },
    {"server",           0,  POPT_ARG_NONE,   0, OPT_SERVER, 0, 0 },
-@@ -1531,6 +1540,16 @@ int parse_arguments(int *argc, const cha
+@@ -1575,6 +1584,16 @@ int parse_arguments(int *argc_p, const c
                }
        }
  
@@ -130,8 +130,8 @@ To use this patch, run these commands for a successful build:
        if (files_from) {
                char *h, *p;
                int q;
-@@ -1840,6 +1859,25 @@ void server_options(char **args,int *arg
-                       args[ac++] = "--size-only";
+@@ -1895,6 +1914,25 @@ void server_options(char **args, int *ar
+               }
        }
  
 +      if (times_only && am_sender)
@@ -158,7 +158,7 @@ To use this patch, run these commands for a successful build:
                        goto oom;
 --- old/pipe.c
 +++ new/pipe.c
-@@ -163,3 +163,77 @@ pid_t local_child(int argc, char **argv,
+@@ -164,3 +164,77 @@ pid_t local_child(int argc, char **argv,
  
        return pid;
  }
@@ -169,7 +169,7 @@ To use this patch, run these commands for a successful build:
 +      int pipefds[2];
 +      
 +      if (verbose >= 2)
-+              print_child_argv(command);
++              print_child_argv("opening connection using:", command);
 +
 +      if (pipe(pipefds) < 0) {
 +              rsyserr(FERROR, errno, "pipe");
@@ -213,7 +213,7 @@ To use this patch, run these commands for a successful build:
 +      pid_t pid;
 +      
 +      if (verbose >= 2)
-+              print_child_argv(command);
++              print_child_argv("opening connection using:", command);
 +
 +      pid = do_fork();
 +      if (pid == -1) {
@@ -238,7 +238,7 @@ To use this patch, run these commands for a successful build:
 +}
 --- old/receiver.c
 +++ new/receiver.c
-@@ -51,6 +51,7 @@ extern int delay_updates;
+@@ -52,6 +52,7 @@ extern int delay_updates;
  extern mode_t orig_umask;
  extern struct stats stats;
  extern char *tmpdir;
@@ -246,7 +246,7 @@ To use this patch, run these commands for a successful build:
  extern char *partial_dir;
  extern char *basis_dir[];
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
-@@ -354,6 +355,8 @@ int recv_files(int f_in, char *local_nam
+@@ -357,6 +358,8 @@ int recv_files(int f_in, char *local_nam
        const char *parent_dirname = "";
  #endif
        int ndx, recv_ok;
@@ -255,7 +255,7 @@ To use this patch, run these commands for a successful build:
  
        if (verbose > 2)
                rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);
-@@ -363,6 +366,23 @@ int recv_files(int f_in, char *local_nam
+@@ -366,6 +369,23 @@ int recv_files(int f_in, char *local_nam
  
        updating_basis = inplace;
  
@@ -279,7 +279,7 @@ To use this patch, run these commands for a successful build:
        while (1) {
                cleanup_disable();
  
-@@ -658,6 +678,9 @@ int recv_files(int f_in, char *local_nam
+@@ -663,6 +683,9 @@ int recv_files(int f_in, char *local_nam
                else if (!am_server && verbose && do_progress)
                        rprintf(FINFO, "%s\n", fname);
  
@@ -289,7 +289,7 @@ To use this patch, run these commands for a successful build:
                /* recv file data */
                recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
                                       fname, fd2, F_LENGTH(file));
-@@ -672,6 +695,16 @@ int recv_files(int f_in, char *local_nam
+@@ -677,6 +700,16 @@ int recv_files(int f_in, char *local_nam
                        exit_cleanup(RERR_FILEIO);
                }
  
@@ -308,7 +308,7 @@ To use this patch, run these commands for a successful build:
                        if (partialptr == fname)
 --- old/rsync.h
 +++ new/rsync.h
-@@ -126,6 +126,7 @@
+@@ -128,6 +128,7 @@
  #define IOERR_DEL_LIMIT (1<<2)
  
  #define MAX_ARGS 1000
@@ -318,7 +318,7 @@ To use this patch, run these commands for a successful build:
  
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -370,6 +370,7 @@ to the detailed description below for a 
+@@ -386,6 +386,7 @@ to the detailed description below for a 
       --timeout=TIME          set I/O timeout in seconds
   -I, --ignore-times          don't skip files that match size and time
       --size-only             skip files that match in size
@@ -326,7 +326,7 @@ To use this patch, run these commands for a successful build:
       --modify-window=NUM     compare mod-times with reduced accuracy
   -T, --temp-dir=DIR          create temporary files in directory DIR
   -y, --fuzzy                 find similar file for basis if no dest file
-@@ -407,6 +408,8 @@ to the detailed description below for a 
+@@ -424,6 +425,8 @@ to the detailed description below for a 
       --write-batch=FILE      write a batched update to FILE
       --only-write-batch=FILE like --write-batch but w/o updating dest
       --read-batch=FILE       read a batched update from FILE
@@ -335,7 +335,7 @@ To use this patch, run these commands for a successful build:
       --protocol=NUM          force an older protocol version to be used
       --iconv=CONVERT_SPEC    request charset conversion of filesnames
       --checksum-seed=NUM     set block/file checksum seed (advanced)
-@@ -1865,6 +1868,33 @@ file previously generated by bf(--write-
+@@ -1936,6 +1939,33 @@ file previously generated by bf(--write-
  If em(FILE) is bf(-), the batch data will be read from standard input.
  See the "BATCH MODE" section for details.
  
@@ -371,7 +371,7 @@ To use this patch, run these commands for a successful build:
  version of rsync.  For instance, if rsync 2.6.4 is being used with the
 --- old/sender.c
 +++ new/sender.c
-@@ -42,6 +42,7 @@ extern int do_progress;
+@@ -43,6 +43,7 @@ extern int do_progress;
  extern int inplace;
  extern int batch_fd;
  extern int write_batch;
@@ -379,7 +379,7 @@ To use this patch, run these commands for a successful build:
  extern struct stats stats;
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  
-@@ -180,6 +181,26 @@ void send_files(int f_in, int f_out)
+@@ -181,6 +182,26 @@ void send_files(int f_in, int f_out)
        enum logcode log_code = log_before_transfer ? FLOG : FINFO;
        int f_xfer = write_batch < 0 ? batch_fd : f_out;
        int ndx, j;
@@ -406,7 +406,7 @@ To use this patch, run these commands for a successful build:
  
        if (verbose > 2)
                rprintf(FINFO, "send_files starting\n");
-@@ -283,6 +304,7 @@ void send_files(int f_in, int f_out)
+@@ -284,6 +305,7 @@ void send_files(int f_in, int f_out)
                        exit_cleanup(RERR_PROTOCOL);
                }
  
@@ -414,7 +414,7 @@ To use this patch, run these commands for a successful build:
                fd = do_open(fname, O_RDONLY, 0);
                if (fd == -1) {
                        if (errno == ENOENT) {
-@@ -313,6 +335,33 @@ void send_files(int f_in, int f_out)
+@@ -314,6 +336,33 @@ void send_files(int f_in, int f_out)
                        exit_cleanup(RERR_PROTOCOL);
                }
  
@@ -448,7 +448,7 @@ To use this patch, run these commands for a successful build:
                if (st.st_size) {
                        int32 read_size = MAX(s->blength * 3, MAX_MAP_SIZE);
                        mbuf = map_file(fd, st.st_size, read_size, s->blength);
-@@ -354,6 +403,8 @@ void send_files(int f_in, int f_out)
+@@ -355,6 +404,8 @@ void send_files(int f_in, int f_out)
                        }
                }
                close(fd);