./configure
make
+based-on: a59a7b242393699fedeb4f66911e3fc9b4fadd73
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
-@@ -36,7 +36,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
- util.o main.o checksum.o match.o syscall.o log.o backup.o
+@@ -37,7 +37,7 @@ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+ util.o main.o checksum.o match.o syscall.o log.o backup.o delete.o
OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
-OBJS3=progress.o pipe.o
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -71,6 +71,7 @@ extern int sender_symlink_iconv;
- extern int unsort_ndx;
+@@ -72,6 +72,7 @@ extern int unsort_ndx;
+ extern uid_t our_uid;
extern struct stats stats;
extern char *filesfrom_host;
+extern char *link_by_hash_dir;
+ extern char *usermap, *groupmap;
extern char curr_dir[MAXPATHLEN];
-
-@@ -844,7 +845,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -902,7 +903,7 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
extra_len += EXTRA_LEN;
#endif
new file mode 100644
--- /dev/null
+++ b/hashlink.c
-@@ -0,0 +1,336 @@
+@@ -0,0 +1,339 @@
+/*
+ Copyright (C) Cronosys, LLC 2004
+
+ }
+ *dst = 0;
+
-+ asprintf(&dst,"%s/%s",link_by_hash_dir,hash);
++ if (asprintf(&dst,"%s/%s",link_by_hash_dir,hash) < 0)
++ out_of_memory("make_hash_name");
+ return dst;
+}
+
+ *fnbr = this_fnbr;
+
+ hashfile = new_array(struct hashfile_struct, 1);
-+ asprintf(&hashfile->name,"%s/%s",hashname,
-+ di->d_name);
++ if (asprintf(&hashfile->name,"%s/%s",hashname, di->d_name) < 0)
++ out_of_memory("find_hashfiles");
+ if (do_stat(hashfile->name,&st) == -1) {
+ rsyserr(FERROR, errno, "stat failed: %s", hashfile->name);
+ kill_hashfile(hashfile);
+ }
+
+ first = 1;
-+ asprintf(&linkname,"%s/0",hashname);
++ if (asprintf(&linkname,"%s/0",hashname) < 0)
++ out_of_memory("link_by_hash");
+ rprintf(FINFO, "(1) linkname = %s\n", linkname);
+ } else {
+ struct hashfile_struct *hashfiles, *hashfile;
+
+ if (hashfiles == NULL) {
+ first = 1;
-+ asprintf(&linkname,"%s/0",hashname);
++ if (asprintf(&linkname,"%s/0",hashname) < 0)
++ out_of_memory("link_by_hash");
+ rprintf(FINFO, "(2) linkname = %s\n", linkname);
+ } else {
+ int fd;
+ kill_hashfile(hashfile);
+ } else {
+ first = 1;
-+ asprintf(&linkname, "%s/%ld", hashname,
-+ last_fnbr + 1);
++ if (asprintf(&linkname, "%s/%ld", hashname, last_fnbr + 1) < 0)
++ out_of_memory("link_by_hash");
+ rprintf(FINFO, "(4) linkname = %s\n", linkname);
+ }
+ }
+ if (errno == EMLINK) {
+ first = 1;
+ free(linkname);
-+ asprintf(&linkname,"%s/%ld",hashname,
-+ last_fnbr + 1);
++ if (asprintf(&linkname,"%s/%ld",hashname, last_fnbr + 1) < 0)
++ out_of_memory("link_by_hash");
+ rprintf(FINFO, "(5) linkname = %s\n", linkname);
+ rprintf(FINFO,"link-by-hash: max link count exceeded, starting new file \"%s\".\n", linkname);
+ } else {
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -157,6 +157,7 @@ char *backup_suffix = NULL;
+@@ -159,6 +159,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 *logfile_name = NULL;
-@@ -395,6 +396,7 @@ void usage(enum logcode F)
+@@ -758,6 +759,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," --skip-compress=LIST skip compressing files with a suffix in LIST\n");
-@@ -447,7 +449,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -810,7 +812,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
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_NO_D, OPT_APPEND, OPT_NO_ICONV,
-+ OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_LINK_BY_HASH,
+- OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG,
++ OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_LINK_BY_HASH,
+ OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_BWLIMIT,
OPT_SERVER, OPT_REFUSED_BASE = 9000};
- static struct poptOption long_options[] = {
-@@ -579,6 +581,7 @@ static struct poptOption long_options[] = {
+@@ -954,6 +956,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_VAL, &fuzzy_basis, 1, 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
-@@ -1261,6 +1264,21 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1780,6 +1783,21 @@ int parse_arguments(int *argc_p, const char ***argv_p)
return 0;
#endif
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -2038,6 +2056,11 @@ void server_options(char **args, int *argc_p)
+@@ -2662,6 +2680,11 @@ void server_options(char **args, int *argc_p)
} else if (inplace)
args[ac++] = "--inplace";
diff --git a/receiver.c b/receiver.c
--- a/receiver.c
+++ b/receiver.c
-@@ -163,12 +163,14 @@ int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
+@@ -225,11 +225,13 @@ int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
}
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+ const char *md4)
{
static char file_sum1[MAX_DIGEST_LEN];
- static char file_sum2[MAX_DIGEST_LEN];
struct map_struct *mapbuf;
struct sum_struct sum;
+ md_context mdfour_data;
- int32 len, sum_len;
+ int32 len;
OFF_T offset = 0;
OFF_T offset2;
-@@ -188,6 +190,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -265,6 +267,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
} else
mapbuf = NULL;
sum_init(checksum_seed);
if (append_mode > 0) {
-@@ -232,6 +237,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -312,6 +317,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
cleanup_got_literal = 1;
sum_update(data, i);
if (fd != -1 && write_file(fd,data,i) != i)
goto report_write_error;
-@@ -258,6 +265,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -339,6 +346,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
see_token(map, len);
sum_update(map, len);
}
if (updating_basis_or_equiv) {
-@@ -303,6 +312,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
- }
+@@ -392,6 +401,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+ if (sum_end(file_sum1) != checksum_len)
+ overflow_exit("checksum_len"); /* Impossible... */
- sum_len = sum_end(file_sum1);
+ if (md4)
+ mdfour_result(&mdfour_data, (uchar*)md4);
-
++
if (mapbuf)
unmap_file(mapbuf);
-@@ -318,7 +329,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+
+@@ -406,7 +418,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
static void discard_receive_data(int f_in, OFF_T length)
{
}
static void handle_delayed_updates(char *local_name)
-@@ -708,7 +719,7 @@ int recv_files(int f_in, char *local_name)
+@@ -836,7 +848,7 @@ int recv_files(int f_in, int f_out, char *local_name)
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
- fname, fd2, F_LENGTH(file));
+ fname, fd2, F_LENGTH(file), F_SUM(file));
- log_item(log_code, file, &initial_stats, iflags, NULL);
+ log_item(log_code, file, iflags, NULL);
diff --git a/rsync.c b/rsync.c
--- a/rsync.c
+++ b/rsync.c
-@@ -48,6 +48,7 @@ extern int inplace;
- extern int flist_eof;
+@@ -47,6 +47,7 @@ extern int flist_eof;
+ extern int file_old_total;
extern int keep_dirlinks;
extern int make_backups;
+extern char *link_by_hash_dir;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct chmod_mode_struct *daemon_chmod_modes;
#ifdef ICONV_OPTION
-@@ -578,8 +579,15 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -648,7 +649,12 @@ int finish_transfer(const char *fname, const char *fnametmp,
/* move tmp file over real file */
- if (verbose > 2)
+ if (DEBUG_GTE(RECV, 1))
rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
-- ret = robust_rename(fnametmp, fname, temp_copy_name,
-- file->mode & INITACCESSPERMS);
+- ret = robust_rename(fnametmp, fname, temp_copy_name, file->mode);
+#ifdef HAVE_LINK
+ if (link_by_hash_dir)
+ ret = link_by_hash(fnametmp, fname, file);
+ else
+#endif
-+ {
-+ ret = robust_rename(fnametmp, fname, temp_copy_name,
-+ file->mode & INITACCESSPERMS);
-+ }
++ ret = robust_rename(fnametmp, fname, temp_copy_name, file->mode);
if (ret < 0) {
rsyserr(FERROR_XFER, errno, "%s %s -> \"%s\"",
ret == -2 ? "copy" : "rename",
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
-@@ -830,6 +830,14 @@ struct stats {
- int num_transferred_files;
+@@ -909,6 +909,14 @@ struct stats {
+ int xferred_files;
};
+struct hashfile_struct {
diff --git a/rsync.yo b/rsync.yo
--- a/rsync.yo
+++ b/rsync.yo
-@@ -392,6 +392,7 @@ to the detailed description below for a complete description. verb(
+@@ -402,6 +402,7 @@ to the detailed description below for a complete description. verb(
--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
git.samba.org / rsync-patches.git / blobdiff