Updated for rolled-back trunk.

[rsync/rsync-patches.git] / ODBC-dblog.diff

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index c388112..c75e5bb 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -10,7 +10,7 @@ See the file "instructions" (after applying this patch) for more info.
 
 --- old/Makefile.in
 +++ new/Makefile.in
-@@ -31,7 +31,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/
+@@ -32,7 +32,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/
  ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
        zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
@@ -56,7 +56,7 @@ See the file "instructions" (after applying this patch) for more info.
  
  #ifdef HAVE_PUTENV
        if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
-@@ -628,6 +631,9 @@ static int rsync_module(int f_in, int f_
+@@ -629,6 +632,9 @@ static int rsync_module(int f_in, int f_
                        rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n",
                                am_sender ? "on" : "to",
                                request, auth_user, host, addr);
@@ -68,7 +68,7 @@ See the file "instructions" (after applying this patch) for more info.
                                am_sender ? "on" : "to",
 --- old/configure.in
 +++ new/configure.in
-@@ -577,6 +577,12 @@ if test x"$with_included_popt" != x"yes"
+@@ -610,6 +610,12 @@ if test x"$with_included_popt" != x"yes"
      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
  fi
  
@@ -1050,7 +1050,7 @@ See the file "instructions" (after applying this patch) for more info.
  FN_LOCAL_BOOL(lp_list, list)
 --- old/log.c
 +++ new/log.c
-@@ -92,7 +92,7 @@ struct {
+@@ -94,7 +94,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
   */
@@ -1061,7 +1061,7 @@ See the file "instructions" (after applying this patch) for more info.
        for (i = 0; rerr_names[i].name; i++) {
 --- old/receiver.c
 +++ new/receiver.c
-@@ -109,6 +109,10 @@ static int get_tmpname(char *fnametmp, c
+@@ -111,6 +111,10 @@ static int get_tmpname(char *fnametmp, c
  
        if (maxname < 1) {
                rprintf(FERROR, "temporary filename too long: %s\n", fname);
@@ -1072,7 +1072,7 @@ See the file "instructions" (after applying this patch) for more info.
                fnametmp[0] = '\0';
                return 0;
        }
-@@ -170,6 +174,10 @@ static int receive_data(int f_in, char *
+@@ -172,6 +176,10 @@ static int receive_data(int f_in, char *
                if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {
                        rsyserr(FERROR, errno, "lseek of %s returned %.0f, not %.0f",
                                full_fname(fname), (double)j, (double)offset);
@@ -1083,7 +1083,7 @@ See the file "instructions" (after applying this patch) for more info.
                        exit_cleanup(RERR_FILEIO);
                }
        }
-@@ -227,6 +235,11 @@ static int receive_data(int f_in, char *
+@@ -229,6 +237,11 @@ static int receive_data(int f_in, char *
                                                "lseek of %s returned %.0f, not %.0f",
                                                full_fname(fname),
                                                (double)pos, (double)offset);
@@ -1095,7 +1095,7 @@ See the file "instructions" (after applying this patch) for more info.
                                        exit_cleanup(RERR_FILEIO);
                                }
                                continue;
-@@ -252,6 +265,9 @@ static int receive_data(int f_in, char *
+@@ -254,6 +267,9 @@ static int receive_data(int f_in, char *
            report_write_error:
                rsyserr(FERROR, errno, "write failed on %s",
                        full_fname(fname));
@@ -1105,7 +1105,7 @@ See the file "instructions" (after applying this patch) for more info.
                exit_cleanup(RERR_FILEIO);
        }
  
-@@ -295,6 +311,12 @@ static void handle_delayed_updates(struc
+@@ -297,6 +313,12 @@ static void handle_delayed_updates(struc
                                rsyserr(FERROR, errno,
                                        "rename failed for %s (from %s)",
                                        full_fname(fname), partialptr);
@@ -1116,9 +1116,9 @@ See the file "instructions" (after applying this patch) for more info.
 +                                      partialptr);
 +#endif
                        } else {
-                               if (remove_sent_files
+                               if (remove_source_files
                                    || (preserve_hard_links
-@@ -417,6 +439,9 @@ int recv_files(int f_in, struct file_lis
+@@ -421,6 +443,9 @@ int recv_files(int f_in, struct file_lis
                if (server_filter_list.head
                    && check_filter(&server_filter_list, fname, 0) < 0) {
                        rprintf(FERROR, "attempt to hack rsync failed.\n");
@@ -1128,7 +1128,7 @@ See the file "instructions" (after applying this patch) for more info.
                        exit_cleanup(RERR_PROTOCOL);
                }
  
-@@ -471,6 +496,11 @@ int recv_files(int f_in, struct file_lis
+@@ -477,6 +502,11 @@ int recv_files(int f_in, struct file_lis
                                        rprintf(FERROR,
                                                "invalid basis_dir index: %d.\n",
                                                fnamecmp_type);
@@ -1140,7 +1140,7 @@ See the file "instructions" (after applying this patch) for more info.
                                        exit_cleanup(RERR_PROTOCOL);
                                }
                                pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-@@ -516,6 +546,9 @@ int recv_files(int f_in, struct file_lis
+@@ -522,6 +552,9 @@ int recv_files(int f_in, struct file_lis
                if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
                        rsyserr(FERROR, errno, "fstat %s failed",
                                full_fname(fnamecmp));
@@ -1150,7 +1150,7 @@ See the file "instructions" (after applying this patch) for more info.
                        discard_receive_data(f_in, file->length);
                        close(fd1);
                        continue;
-@@ -529,6 +562,9 @@ int recv_files(int f_in, struct file_lis
+@@ -535,6 +568,9 @@ int recv_files(int f_in, struct file_lis
                         */
                        rprintf(FERROR,"recv_files: %s is a directory\n",
                                full_fname(fnamecmp));
@@ -1160,7 +1160,7 @@ See the file "instructions" (after applying this patch) for more info.
                        discard_receive_data(f_in, file->length);
                        close(fd1);
                        continue;
-@@ -552,6 +588,9 @@ int recv_files(int f_in, struct file_lis
+@@ -558,6 +594,9 @@ int recv_files(int f_in, struct file_lis
                        if (fd2 == -1) {
                                rsyserr(FERROR, errno, "open %s failed",
                                        full_fname(fname));
@@ -1170,7 +1170,7 @@ See the file "instructions" (after applying this patch) for more info.
                                discard_receive_data(f_in, file->length);
                                if (fd1 != -1)
                                        close(fd1);
-@@ -585,6 +624,10 @@ int recv_files(int f_in, struct file_lis
+@@ -591,6 +630,10 @@ int recv_files(int f_in, struct file_lis
                        if (fd2 == -1) {
                                rsyserr(FERROR, errno, "mkstemp %s failed",
                                        full_fname(fnametmp));
@@ -1181,7 +1181,7 @@ See the file "instructions" (after applying this patch) for more info.
                                discard_receive_data(f_in, file->length);
                                if (fd1 != -1)
                                        close(fd1);
-@@ -605,12 +648,19 @@ int recv_files(int f_in, struct file_lis
+@@ -611,12 +654,19 @@ int recv_files(int f_in, struct file_lis
                                       fname, fd2, file->length);
  
                log_item(log_code, file, &initial_stats, iflags, NULL);
@@ -1201,7 +1201,7 @@ See the file "instructions" (after applying this patch) for more info.
                        exit_cleanup(RERR_FILEIO);
                }
  
-@@ -669,6 +719,12 @@ int recv_files(int f_in, struct file_lis
+@@ -675,6 +725,12 @@ int recv_files(int f_in, struct file_lis
                                rprintf(msgtype,
                                        "%s: %s failed verification -- update %s%s.\n",
                                        errstr, fname, keptstr, redostr);
@@ -1216,7 +1216,7 @@ See the file "instructions" (after applying this patch) for more info.
                                SIVAL(numbuf, 0, i);
 --- old/sender.c
 +++ new/sender.c
-@@ -353,6 +353,9 @@ void send_files(struct file_list *flist,
+@@ -355,6 +355,9 @@ void send_files(struct file_list *flist,
                        end_progress(st.st_size);
  
                log_item(log_code, file, &initial_stats, iflags, NULL);