X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/b3ea475798bdb7fe0bded242e4c6aa65a9ecdc9d..6100b16e5e0e2591621d9c419fc5c0cd6907f0e4:/ODBC-dblog.diff diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff index 4182aff..68078cb 100644 --- a/ODBC-dblog.diff +++ b/ODBC-dblog.diff @@ -1,22 +1,23 @@ Add support for logging daemon messages to an SQL database. -After applying this patch, run these commands for a successful build: +To use this patch, run these commands for a successful build: + patch -p1 length); ++ snprintf(strFileSize, sizeof strFileSize, "%.0f", (double)F_LENGTH(file)); + if (am_sender) { + intBytesTransferred = stats.total_written - initial_stats->total_written; + } else { @@ -1050,7 +1051,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 { +@@ -95,7 +95,7 @@ struct { /* * Map from rsync error code to name, or return NULL. */ @@ -1061,7 +1062,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 -@@ -110,6 +110,10 @@ static int get_tmpname(char *fnametmp, c +@@ -110,6 +110,10 @@ int get_tmpname(char *fnametmp, char *fn if (maxname < 1) { rprintf(FERROR, "temporary filename too long: %s\n", fname); @@ -1105,7 +1106,7 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_FILEIO); } -@@ -298,6 +314,12 @@ static void handle_delayed_updates(struc +@@ -298,6 +314,12 @@ static void handle_delayed_updates(char rsyserr(FERROR, errno, "rename failed for %s (from %s)", full_fname(fname), partialptr); @@ -1117,8 +1118,8 @@ See the file "instructions" (after applying this patch) for more info. +#endif } else { if (remove_source_files - || (preserve_hard_links -@@ -422,6 +444,9 @@ int recv_files(int f_in, struct file_lis + || (preserve_hard_links && F_IS_HLINKED(file))) +@@ -431,6 +453,9 @@ int recv_files(int f_in, char *local_nam if (server_filter_list.head && check_filter(&server_filter_list, fname, 0) < 0) { rprintf(FERROR, "attempt to hack rsync failed.\n"); @@ -1128,7 +1129,7 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_PROTOCOL); } -@@ -478,6 +503,11 @@ int recv_files(int f_in, struct file_lis +@@ -487,6 +512,11 @@ int recv_files(int f_in, char *local_nam rprintf(FERROR, "invalid basis_dir index: %d.\n", fnamecmp_type); @@ -1140,37 +1141,37 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_PROTOCOL); } pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, -@@ -526,6 +556,9 @@ int recv_files(int f_in, struct file_lis +@@ -535,6 +565,9 @@ int recv_files(int f_in, char *local_nam } else if (do_fstat(fd1,&st) != 0) { rsyserr(FERROR, errno, "fstat %s failed", full_fname(fnamecmp)); +#ifdef HAVE_LIBODBC + db_log_error(FERROR, 19,"fstat %s failed",full_fname(fnamecmp)); +#endif - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); close(fd1); continue; -@@ -539,6 +572,9 @@ int recv_files(int f_in, struct file_lis +@@ -548,6 +581,9 @@ int recv_files(int f_in, char *local_nam */ rprintf(FERROR,"recv_files: %s is a directory\n", full_fname(fnamecmp)); +#ifdef HAVE_LIBODBC + db_log_error(FERROR,20,"recv_files: %s is a directory",full_fname(fnamecmp)); +#endif - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); close(fd1); continue; -@@ -562,6 +598,9 @@ int recv_files(int f_in, struct file_lis +@@ -571,6 +607,9 @@ int recv_files(int f_in, char *local_nam if (fd2 == -1) { rsyserr(FERROR, errno, "open %s failed", full_fname(fname)); +#ifdef HAVE_LIBODBC + db_log_error(FERROR,22, "open %s failed", full_fname(fname)); +#endif - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); if (fd1 != -1) close(fd1); -@@ -595,6 +634,10 @@ int recv_files(int f_in, struct file_lis +@@ -604,6 +643,10 @@ int recv_files(int f_in, char *local_nam if (fd2 == -1) { rsyserr(FERROR, errno, "mkstemp %s failed", full_fname(fnametmp)); @@ -1178,11 +1179,11 @@ See the file "instructions" (after applying this patch) for more info. + db_log_error(FERROR, 22, "mkstemp %s failed", + full_fname(fnametmp)); +#endif - discard_receive_data(f_in, file->length); + discard_receive_data(f_in, F_LENGTH(file)); if (fd1 != -1) close(fd1); -@@ -615,12 +658,19 @@ int recv_files(int f_in, struct file_lis - fname, fd2, file->length); +@@ -624,12 +667,19 @@ int recv_files(int f_in, char *local_nam + fname, fd2, F_LENGTH(file)); log_item(log_code, file, &initial_stats, iflags, NULL); +#ifdef HAVE_LIBODBC @@ -1201,7 +1202,7 @@ See the file "instructions" (after applying this patch) for more info. exit_cleanup(RERR_FILEIO); } -@@ -679,6 +729,12 @@ int recv_files(int f_in, struct file_lis +@@ -686,6 +736,12 @@ int recv_files(int f_in, char *local_nam rprintf(msgtype, "%s: %s failed verification -- update %s%s.\n", errstr, fname, keptstr, redostr); @@ -1212,11 +1213,11 @@ See the file "instructions" (after applying this patch) for more info. + keptstr, redostr); +#endif } - if (!phase) { - SIVAL(numbuf, 0, i); + if (!phase || incremental) { + send_msg_int(MSG_REDO, ndx); --- old/sender.c +++ new/sender.c -@@ -355,6 +355,9 @@ void send_files(struct file_list *flist, +@@ -326,6 +326,9 @@ void send_files(int f_in, int f_out) end_progress(st.st_size); log_item(log_code, file, &initial_stats, iflags, NULL);