the file's name.
---- Makefile.in 2 May 2004 17:04:14 -0000 1.100
-+++ Makefile.in 13 May 2004 19:04:49 -0000
+--- Makefile.in 15 May 2004 00:48:11 -0000 1.101
++++ Makefile.in 21 May 2004 09:07:58 -0000
@@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
main.o checksum.o match.o syscall.o log.o backup.o
OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
popt/popthelp.o popt/poptparse.o
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ hashlink.c 13 May 2004 19:04:49 -0000
-@@ -0,0 +1,351 @@
++++ hashlink.c 21 May 2004 09:07:59 -0000
+@@ -0,0 +1,342 @@
+/*
+ Copyright (C) Cronosys, LLC 2004
+
+ /* Build a list of potential candidates and open
+ * them. */
+ if ((d = opendir(hashname)) == NULL) {
-+ rprintf(FERROR,"opendir \"%s\": %s\n",
-+ hashname, strerror(errno));
++ rsyserr(FERROR, errno, "opendir \"%s\"", hashname);
+ free(hashname);
+ return NULL;
+ }
+ asprintf(&hashfile->name,"%s/%s",hashname,
+ di->d_name);
+ if (do_stat(hashfile->name,&st) == -1) {
-+ rprintf(FERROR,"%s: %s", hashfile->name,
-+ strerror(errno));
++ rsyserr(FERROR, errno, "%s: %s", hashfile->name);
+ kill_hashfile(hashfile);
+ continue;
+ }
+ hashfile->nlink = st.st_nlink;
+ hashfile->fd = open(hashfile->name,O_RDONLY|O_BINARY);
+ if (hashfile->fd == -1) {
-+ rprintf(FERROR,"%s: %s\n", hashfile->name,
-+ strerror(errno));
++ rsyserr(FERROR, errno, "%s", hashfile->name);
+ kill_hashfile(hashfile);
+ continue;
+ }
+ }
+
+ if (amt == -1) {
-+ rprintf(FERROR,"%s",strerror(errno));
++ rsyserr(FERROR, errno, "%s");
+ kill_hashfiles(files);
+ return NULL;
+ }
+ dirname = strdup(hashname);
+ *strrchr(dirname,'/') = 0;
+ if (do_mkdir(dirname, 0755) == -1 && errno != EEXIST) {
-+ rprintf(FERROR, "mkdir %s: %s\n", dirname,
-+ strerror(errno));
++ rsyserr(FERROR, errno, "mkdir %s", dirname);
+ free(hashname);
+ free(dirname);
+ return robust_rename(fnametmp,fname,0644);
+ free(dirname);
+
+ if (do_mkdir(hashname, 0755) == -1 && errno != EEXIST) {
-+ rprintf(FERROR, "mkdir %s: %s\n", hashname,
-+ strerror(errno));
++ rsyserr(FERROR, errno, "mkdir %s", hashname);
+ free(hashname);
+ return robust_rename(fnametmp,fname,0644);
+ }
+ int fd;
+
+ if (do_stat(fnametmp,&st) == -1) {
-+ rprintf(FERROR,"%s: %s\n",fname,strerror(errno));
++ rsyserr(FERROR, errno, "%s", fname);
+ return -1;
+ }
+ hashfiles = find_hashfiles(hashname, st.st_size, &last_fnbr);
+
+ /* Search for one identical to us. */
+ if ((fd = open(fnametmp,O_RDONLY|O_BINARY)) == -1) {
-+ rprintf(FERROR,"%s: %s\n",fnametmp,
-+ strerror(errno));
++ rsyserr(FERROR, errno, "%s", fnametmp);
+ kill_hashfiles(hashfiles);
+ return -1;
+ }
+ rprintf(FINFO, "(5) linkname = %s\n", linkname);
+ rprintf(FINFO,"link-by-hash: max link count exceeded, starting new file \"%s\".\n", linkname);
+ } else {
-+ rprintf(FERROR,"link \"%s\" -> %s: %s\n",
-+ linkname,full_fname(fname),
-+ strerror(errno));
++ rsyserr(FERROR, errno, "link \"%s\" -> \"%s\"",
++ linkname, full_fname(fname));
+ robust_unlink(fname);
+ rc = robust_rename(fnametmp,fname,0644);
+ }
+
+ rc = robust_rename(fnametmp,fname,0644);
+ if (rc != 0) {
-+ rprintf(FERROR,"rename \"%s\" -> \"%s\": %s\n",
-+ full_fname(fnametmp),full_fname(fname),
-+ strerror(errno));
++ rsyserr(FERROR, errno, "rename \"%s\" -> \"%s\"",
++ full_fname(fnametmp), full_fname(fname));
+ }
+ rc = do_link(fname,linkname);
+ if (rc != 0) {
-+ rprintf(FERROR,"link \"%s\" -> \"%s\": %s\n",
-+ full_fname(fname),linkname,
-+ strerror(errno));
++ rsyserr(FERROR, errno, "link \"%s\" -> \"%s\"",
++ full_fname(fname), linkname);
+ }
+ }
+
+
+#endif
--- options.c 6 May 2004 21:08:01 -0000 1.148
-+++ options.c 13 May 2004 19:04:49 -0000
++++ options.c 21 May 2004 09:07:59 -0000
@@ -121,6 +121,7 @@ char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
default:
/* A large opt value means that set_refuse_options()
* turned this option off (opt-BASE is its index). */
-@@ -951,6 +967,11 @@ void server_options(char **args,int *arg
- */
- args[ac++] = link_dest ? "--link-dest" : "--compare-dest";
+@@ -953,6 +969,11 @@ void server_options(char **args,int *arg
args[ac++] = compare_dest;
-+ }
-+
+ }
+
+ if (link_by_hash_dir && am_sender) {
+ args[ac++] = "--link-by-hash";
+ args[ac++] = link_by_hash_dir;
- }
-
++ }
++
if (files_from && (!am_sender || remote_filesfrom_file)) {
---- receiver.c 13 May 2004 07:08:22 -0000 1.77
-+++ receiver.c 13 May 2004 19:04:49 -0000
-@@ -46,6 +46,7 @@ extern int module_id;
- extern int ignore_errors;
+ if (remote_filesfrom_file) {
+ args[ac++] = "--files-from";
+--- receiver.c 21 May 2004 08:27:04 -0000 1.79
++++ receiver.c 21 May 2004 09:07:59 -0000
+@@ -47,6 +47,7 @@ extern int ignore_errors;
extern int orig_umask;
extern int keep_partial;
+ extern int checksum_seed;
+extern char *link_by_hash_dir;
static void delete_one(char *fn, int is_dir)
{
-@@ -191,10 +192,11 @@ static int get_tmpname(char *fnametmp, c
+@@ -193,10 +194,11 @@ static int get_tmpname(char *fnametmp, c
static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
unsigned int len;
OFF_T offset = 0;
OFF_T offset2;
-@@ -204,7 +206,9 @@ static int receive_data(int f_in,struct
- char *map=NULL;
+@@ -207,6 +209,9 @@ static int receive_data(int f_in,struct
read_sum_head(f_in, &sum);
--
+
+ if (md4)
+ mdfour_begin(&mdfour_data);
-+
- sum_init();
++
+ sum_init(checksum_seed);
while ((i = recv_token(f_in, &data)) != 0) {
-@@ -221,6 +225,8 @@ static int receive_data(int f_in,struct
+@@ -223,6 +228,8 @@ static int receive_data(int f_in,struct
cleanup_got_literal = 1;
sum_update(data,i);
+ mdfour_update(&mdfour_data,data,i);
if (fd != -1 && write_file(fd,data,i) != i) {
- rprintf(FERROR, "write failed on %s: %s\n",
-@@ -248,6 +254,8 @@ static int receive_data(int f_in,struct
+ rsyserr(FERROR, errno, "write failed on %s",
+@@ -250,6 +257,8 @@ static int receive_data(int f_in,struct
see_token(map, len);
sum_update(map,len);
}
if (fd != -1 && write_file(fd,map,len) != (int) len) {
-@@ -270,6 +278,8 @@ static int receive_data(int f_in,struct
+@@ -272,6 +281,8 @@ static int receive_data(int f_in,struct
}
sum_end(file_sum1);
read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
if (verbose > 2) {
-@@ -373,7 +383,7 @@ int recv_files(int f_in,struct file_list
+@@ -375,7 +386,7 @@ int recv_files(int f_in,struct file_list
if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
- rprintf(FERROR, "fstat %s failed: %s\n",
- full_fname(fnamecmp), strerror(errno));
+ rsyserr(FERROR, errno, "fstat %s failed",
+ full_fname(fnamecmp));
- receive_data(f_in,NULL,-1,NULL,file->length);
+ receive_data(f_in,NULL,-1,NULL,file->length,NULL);
close(fd1);
continue;
}
-@@ -386,7 +396,7 @@ int recv_files(int f_in,struct file_list
+@@ -388,7 +399,7 @@ int recv_files(int f_in,struct file_list
*/
rprintf(FERROR,"recv_files: %s is a directory\n",
full_fname(fnamecmp));
close(fd1);
continue;
}
-@@ -438,7 +448,7 @@ int recv_files(int f_in,struct file_list
+@@ -440,7 +451,7 @@ int recv_files(int f_in,struct file_list
if (fd2 == -1) {
- rprintf(FERROR, "mkstemp %s failed: %s\n",
- full_fname(fnametmp), strerror(errno));
+ rsyserr(FERROR, errno, "mkstemp %s failed",
+ full_fname(fnametmp));
- receive_data(f_in,mapbuf,-1,NULL,file->length);
+ receive_data(f_in,mapbuf,-1,NULL,file->length,NULL);
if (mapbuf) unmap_file(mapbuf);
if (fd1 != -1) close(fd1);
continue;
-@@ -451,7 +461,12 @@ int recv_files(int f_in,struct file_list
+@@ -453,7 +464,11 @@ int recv_files(int f_in,struct file_list
}
/* recv file data */
- recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length);
+#ifdef HAVE_LINK
-+ if (link_by_hash_dir) {
-+ file->u.sum = (char*)malloc (MD4_SUM_LENGTH);
-+ }
++ if (link_by_hash_dir)
++ file->u.sum = (char*)malloc(MD4_SUM_LENGTH);
+#endif
+ recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length,file->u.sum);
log_recv(file, &initial_stats);
---- rsync.c 13 May 2004 18:51:22 -0000 1.138
-+++ rsync.c 13 May 2004 19:04:49 -0000
-@@ -31,6 +31,7 @@ extern int am_generator;
- extern int preserve_uid;
- extern int preserve_gid;
+--- rsync.c 21 May 2004 08:43:03 -0000 1.140
++++ rsync.c 21 May 2004 09:07:59 -0000
+@@ -34,6 +34,7 @@ extern int force_delete;
+ extern int recurse;
extern int make_backups;
+ extern char *backup_dir;
+extern char *link_by_hash_dir;
/*
-@@ -236,8 +237,12 @@ void finish_transfer(char *fname, char *
+@@ -239,8 +240,12 @@ void finish_transfer(char *fname, char *
if (make_backups && !make_backup(fname))
return;
- ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
+#ifdef HAVE_LINK
+ if (link_by_hash_dir)
-+ ret = link_by_hash(fnametmp,fname,file);
++ ret = link_by_hash(fnametmp, fname, file);
+ else
+#endif
+ ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
if (ret < 0) {
- rprintf(FERROR, "%s %s -> \"%s\": %s\n",
+ rsyserr(FERROR, errno, "%s %s -> \"%s\"",
ret == -2 ? "copy" : "rename",
---- rsync.h 13 May 2004 18:51:22 -0000 1.203
-+++ rsync.h 13 May 2004 19:04:50 -0000
-@@ -521,6 +521,14 @@ struct stats {
+--- rsync.h 16 May 2004 07:28:24 -0000 1.204
++++ rsync.h 21 May 2004 09:07:59 -0000
+@@ -522,6 +522,14 @@ struct stats {
int current_file_index;
};
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff