Updated to work with latest io.c changes.

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

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index ae4e47d..d0daa19 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -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
-@@ -536,6 +536,12 @@ if test x"$with_included_popt" != x"yes"
+@@ -540,6 +540,12 @@ if test x"$with_included_popt" != x"yes"
      AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
  fi
  
@@ -1046,7 +1046,7 @@ See the file "instructions" (after applying this patch) for more info.
  FN_LOCAL_BOOL(lp_list, list)
 --- old/log.c
 +++ new/log.c
-@@ -93,7 +93,7 @@ struct {
+@@ -94,7 +94,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
   */
@@ -1069,7 +1069,7 @@ See the file "instructions" (after applying this patch) for more info.
        }
 --- old/receiver.c
 +++ new/receiver.c
-@@ -174,6 +174,10 @@ static int get_tmpname(char *fnametmp, c
+@@ -113,6 +113,10 @@ static int get_tmpname(char *fnametmp, c
  
        if (maxname < 1) {
                rprintf(FERROR, "temporary filename too long: %s\n", fname);
@@ -1080,7 +1080,7 @@ See the file "instructions" (after applying this patch) for more info.
                fnametmp[0] = '\0';
                return 0;
        }
-@@ -290,6 +294,11 @@ static int receive_data(int f_in, char *
+@@ -229,6 +233,11 @@ static int receive_data(int f_in, char *
                                        rsyserr(FERROR, errno,
                                                "lseek failed on %s",
                                                full_fname(fname));
@@ -1092,7 +1092,7 @@ See the file "instructions" (after applying this patch) for more info.
                                        exit_cleanup(RERR_FILEIO);
                                }
                                continue;
-@@ -315,6 +324,9 @@ static int receive_data(int f_in, char *
+@@ -254,6 +263,9 @@ static int receive_data(int f_in, char *
            report_write_error:
                rsyserr(FERROR, errno, "write failed on %s",
                        full_fname(fname));
@@ -1102,7 +1102,7 @@ See the file "instructions" (after applying this patch) for more info.
                exit_cleanup(RERR_FILEIO);
        }
  
-@@ -358,6 +370,12 @@ static void handle_delayed_updates(struc
+@@ -297,6 +309,12 @@ static void handle_delayed_updates(struc
                                rsyserr(FERROR, errno,
                                        "rename failed for %s (from %s)",
                                        full_fname(fname), partialptr);
@@ -1115,7 +1115,7 @@ See the file "instructions" (after applying this patch) for more info.
                        } else {
                                if (remove_sent_files
                                    || (preserve_hard_links
-@@ -480,6 +498,9 @@ int recv_files(int f_in, struct file_lis
+@@ -419,6 +437,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");
@@ -1125,7 +1125,7 @@ See the file "instructions" (after applying this patch) for more info.
                        exit_cleanup(RERR_PROTOCOL);
                }
  
-@@ -535,6 +556,11 @@ int recv_files(int f_in, struct file_lis
+@@ -474,6 +495,11 @@ int recv_files(int f_in, struct file_lis
                                        rprintf(FERROR,
                                                "invalid basis_dir index: %d.\n",
                                                fnamecmp_type);
@@ -1137,7 +1137,7 @@ See the file "instructions" (after applying this patch) for more info.
                                        exit_cleanup(RERR_PROTOCOL);
                                }
                                pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-@@ -580,6 +606,9 @@ int recv_files(int f_in, struct file_lis
+@@ -519,6 +545,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));
@@ -1147,7 +1147,7 @@ See the file "instructions" (after applying this patch) for more info.
                        discard_receive_data(f_in, file->length);
                        close(fd1);
                        continue;
-@@ -593,6 +622,9 @@ int recv_files(int f_in, struct file_lis
+@@ -532,6 +561,9 @@ int recv_files(int f_in, struct file_lis
                         */
                        rprintf(FERROR,"recv_files: %s is a directory\n",
                                full_fname(fnamecmp));
@@ -1157,7 +1157,7 @@ See the file "instructions" (after applying this patch) for more info.
                        discard_receive_data(f_in, file->length);
                        close(fd1);
                        continue;
-@@ -616,6 +648,9 @@ int recv_files(int f_in, struct file_lis
+@@ -555,6 +587,9 @@ int recv_files(int f_in, struct file_lis
                        if (fd2 == -1) {
                                rsyserr(FERROR, errno, "open %s failed",
                                        full_fname(fname));
@@ -1167,7 +1167,7 @@ See the file "instructions" (after applying this patch) for more info.
                                discard_receive_data(f_in, file->length);
                                if (fd1 != -1)
                                        close(fd1);
-@@ -649,6 +684,10 @@ int recv_files(int f_in, struct file_lis
+@@ -588,6 +623,10 @@ int recv_files(int f_in, struct file_lis
                        if (fd2 == -1) {
                                rsyserr(FERROR, errno, "mkstemp %s failed",
                                        full_fname(fnametmp));
@@ -1178,7 +1178,7 @@ See the file "instructions" (after applying this patch) for more info.
                                discard_receive_data(f_in, file->length);
                                if (fd1 != -1)
                                        close(fd1);
-@@ -671,12 +710,19 @@ int recv_files(int f_in, struct file_lis
+@@ -610,12 +649,19 @@ int recv_files(int f_in, struct file_lis
  
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);
@@ -1198,7 +1198,7 @@ See the file "instructions" (after applying this patch) for more info.
                        exit_cleanup(RERR_FILEIO);
                }
  
-@@ -730,6 +776,12 @@ int recv_files(int f_in, struct file_lis
+@@ -669,6 +715,12 @@ int recv_files(int f_in, struct file_lis
                                rprintf(msgtype,
                                        "%s: %s failed verification -- update %s%s.\n",
                                        errstr, fname, keptstr, redostr);