popt/popthelp.o popt/poptparse.o
--- old/hashlink.c
+++ new/hashlink.c
-@@ -0,0 +1,340 @@
+@@ -0,0 +1,339 @@
+/*
+ Copyright (C) Cronosys, LLC 2004
+
+ char *linkname;
+ long last_fnbr;
+
-+ if (file->length == 0) {
-+ return robust_rename(fnametmp,fname,0644);
-+ }
++ if (file->length == 0)
++ return robust_rename(fnametmp, fname, NULL, 0644);
+
+ if (do_stat(hashname, &st) == -1) {
+ char *dirname;
+ rsyserr(FERROR, errno, "mkdir failed: %s", dirname);
+ free(hashname);
+ free(dirname);
-+ return robust_rename(fnametmp,fname,0644);
++ return robust_rename(fnametmp, fname, NULL, 0644);
+ }
+ free(dirname);
+
+ if (do_mkdir(hashname, 0755) == -1 && errno != EEXIST) {
+ rsyserr(FERROR, errno, "mkdir failed: %s", hashname);
+ free(hashname);
-+ return robust_rename(fnametmp,fname,0644);
++ return robust_rename(fnametmp, fname, NULL, 0644);
+ }
+
+ first = 1;
+ } else {
+ rsyserr(FERROR, errno, "link \"%s\" -> \"%s\"",
+ linkname, full_fname(fname));
-+ rc = robust_rename(fnametmp,fname,0644);
++ rc = robust_rename(fnametmp, fname, NULL, 0644);
+ }
+ } else {
+ do_unlink(fnametmp);
+ rprintf(FINFO, "link-by-hash (new): %s -> \"%s\"\n",
+ full_fname(fname),linkname);
+
-+ rc = robust_rename(fnametmp,fname,0644);
++ rc = robust_rename(fnametmp, fname, NULL, 0644);
+ if (rc != 0) {
+ rsyserr(FERROR, errno, "rename \"%s\" -> \"%s\"",
+ full_fname(fnametmp), full_fname(fname));
+#endif
--- old/options.c
+++ new/options.c
-@@ -145,6 +145,7 @@ char *backup_suffix = NULL;
+@@ -144,6 +144,7 @@ char *backup_suffix = NULL;
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
char *config_file = NULL;
char *shell_cmd = NULL;
char *log_format = NULL;
-@@ -338,6 +339,7 @@ void usage(enum logcode F)
+@@ -337,6 +338,7 @@ void usage(enum logcode F)
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
rprintf(F," -z, --compress compress file data during the transfer\n");
rprintf(F," --compress-level=NUM explicitly set compression level\n");
rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n");
-@@ -385,7 +387,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -383,7 +385,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_SERVER, OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -480,6 +482,7 @@ static struct poptOption long_options[]
+@@ -477,6 +479,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 },
{"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },
{"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 },
{"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 },
-@@ -1060,6 +1063,21 @@ int parse_arguments(int *argc, const cha
+@@ -1062,6 +1065,21 @@ int parse_arguments(int *argc, const cha
usage(FINFO);
exit_cleanup(0);
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1708,6 +1726,11 @@ void server_options(char **args,int *arg
+@@ -1710,6 +1728,11 @@ void server_options(char **args,int *arg
}
}
args[ac++] = "--files-from";
--- old/receiver.c
+++ new/receiver.c
-@@ -54,6 +54,7 @@ extern int delay_updates;
+@@ -53,6 +53,7 @@ extern int delay_updates;
extern struct stats stats;
extern char *log_format;
extern char *tmpdir;
extern char *partial_dir;
extern char *basis_dir[];
extern struct file_list *the_file_list;
-@@ -125,12 +126,13 @@ static int get_tmpname(char *fnametmp, c
+@@ -124,12 +125,13 @@ static int get_tmpname(char *fnametmp, c
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
int32 len;
OFF_T offset = 0;
OFF_T offset2;
-@@ -150,6 +152,9 @@ static int receive_data(int f_in, char *
+@@ -149,6 +151,9 @@ static int receive_data(int f_in, char *
} else
mapbuf = NULL;
sum_init(checksum_seed);
if (append_mode) {
-@@ -192,6 +197,8 @@ static int receive_data(int f_in, char *
+@@ -191,6 +196,8 @@ static int receive_data(int f_in, char *
cleanup_got_literal = 1;
sum_update(data, i);
+ if (md4)
-+ mdfour_update(&mdfour_data,data,i);
++ mdfour_update(&mdfour_data, (uchar*)data, i);
if (fd != -1 && write_file(fd,data,i) != i)
goto report_write_error;
-@@ -218,6 +225,8 @@ static int receive_data(int f_in, char *
+@@ -217,6 +224,8 @@ static int receive_data(int f_in, char *
see_token(map, len);
sum_update(map, len);
+ if (md4)
-+ mdfour_update(&mdfour_data,map,len);
++ mdfour_update(&mdfour_data, (uchar*)map, len);
}
if (inplace) {
-@@ -258,6 +267,8 @@ static int receive_data(int f_in, char *
+@@ -257,6 +266,8 @@ static int receive_data(int f_in, char *
}
sum_end(file_sum1);
if (mapbuf)
unmap_file(mapbuf);
-@@ -273,7 +284,7 @@ static int receive_data(int f_in, char *
+@@ -272,7 +283,7 @@ static int receive_data(int f_in, char *
static void discard_receive_data(int f_in, OFF_T length)
{
}
static void handle_delayed_updates(struct file_list *flist, char *local_name)
-@@ -605,8 +616,12 @@ int recv_files(int f_in, struct file_lis
+@@ -604,8 +615,12 @@ int recv_files(int f_in, struct file_lis
rprintf(FINFO, "%s\n", fname);
/* recv file data */
log_item(file, &initial_stats, iflags, NULL);
--- old/rsync.c
+++ new/rsync.c
-@@ -50,6 +50,7 @@ extern int inplace;
+@@ -49,6 +49,7 @@ extern int inplace;
extern int keep_dirlinks;
extern int make_backups;
- extern struct stats stats;
+ extern mode_t orig_umask;
+extern char *link_by_hash_dir;
+ extern struct stats stats;
+ extern struct chmod_mode_struct *daemon_chmod_modes;
- #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
- iconv_t ic_chck = (iconv_t)-1;
-@@ -266,8 +267,15 @@ void finish_transfer(char *fname, char *
+@@ -269,8 +270,15 @@ void finish_transfer(char *fname, char *
/* move tmp file over real file */
if (verbose > 2)
rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
#include "byteorder.h"
--- old/rsync.yo
+++ new/rsync.yo
-@@ -361,6 +361,7 @@ to the detailed description below for a
+@@ -363,6 +363,7 @@ to the detailed description below for a
--compare-dest=DIR also compare received files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff