-/*
- Copyright (C) Andrew Tridgell 1996
+/* -*- c-file-style: "linux" -*-
+
+ Copyright (C) 1996-2000 by Andrew Tridgell
Copyright (C) Paul Mackerras 1996
This program is free software; you can redistribute it and/or modify
extern char *backup_suffix;
static struct delete_list {
- dev_t dev;
- INO_T inode;
+ DEV64_T dev;
+ INO64_T inode;
} *delete_list;
static int dlist_len, dlist_alloc_len;
{
if (!S_ISDIR(f->mode)) {
if (robust_unlink(f_name(f)) != 0) {
- rprintf(FERROR,"unlink %s : %s\n",f_name(f),strerror(errno));
+ rprintf(FERROR,"delete_one: unlink %s: %s\n",f_name(f),strerror(errno));
} else if (verbose) {
rprintf(FINFO,"deleting %s\n",f_name(f));
}
} else {
if (do_rmdir(f_name(f)) != 0) {
if (errno != ENOTEMPTY && errno != EEXIST)
- rprintf(FERROR,"rmdir %s : %s\n",f_name(f),strerror(errno));
+ rprintf(FERROR,"delete_one: rmdir %s: %s\n",
+ f_name(f), strerror(errno));
} else if (verbose) {
rprintf(FINFO,"deleting directory %s\n",f_name(f));
}
/* this deletes any files on the receiving side that are not present
on the sending side. For version 1.6.4 I have changed the behaviour
to match more closely what most people seem to expect of this option */
-static void delete_files(struct file_list *flist)
+void delete_files(struct file_list *flist)
{
struct file_list *local_file_list;
int i, j;
char *name;
extern int module_id;
+ extern int ignore_errors;
extern int max_delete;
static int deletion_count;
if (cvs_exclude)
add_cvs_excludes();
- if (io_error && !lp_ignore_errors(module_id)) {
+ if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
rprintf(FINFO,"IO error encountered - skipping file deletion\n");
return;
}
rprintf(FERROR,"filename too long\n");
return 0;
}
- slprintf(fnametmp,MAXPATHLEN, "%s/.%s.XXXXXX",tmpdir,f);
+ snprintf(fnametmp,MAXPATHLEN, "%s/.%s.XXXXXX",tmpdir,f);
return 1;
}
if (f) {
*f = 0;
- slprintf(fnametmp,MAXPATHLEN,"%s/.%s.XXXXXX",
+ snprintf(fnametmp,MAXPATHLEN,"%s/.%s.XXXXXX",
fname,f+1);
*f = '/';
} else {
- slprintf(fnametmp,MAXPATHLEN,".%s.XXXXXX",fname);
+ snprintf(fnametmp,MAXPATHLEN,".%s.XXXXXX",fname);
}
return 1;
static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
OFF_T total_size)
{
- int i,n,remainder,len,count;
+ int i;
+ unsigned int n,remainder,len,count;
OFF_T offset = 0;
OFF_T offset2;
char *data;
i = -(i+1);
offset2 = i*(OFF_T)n;
len = n;
- if (i == count-1 && remainder != 0)
+ if (i == (int) count-1 && remainder != 0)
len = remainder;
stats.matched_data += len;
rprintf(FINFO,"chunk[%d] of size %d at %.0f offset=%.0f\n",
i,len,(double)offset2,(double)offset);
- map = map_ptr(buf,offset2,len);
+ if (buf) {
+ map = map_ptr(buf,offset2,len);
- see_token(map, len);
- sum_update(map,len);
+ see_token(map, len);
+ sum_update(map,len);
+ }
- if (fd != -1 && write_file(fd,map,len) != len) {
+ if (fd != -1 && write_file(fd,map,len) != (int) len) {
rprintf(FERROR,"write failed on %s : %s\n",
fname,strerror(errno));
exit_cleanup(RERR_FILEIO);
offset += len;
}
- end_progress();
+ end_progress(total_size);
if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
rprintf(FERROR,"write failed on %s : %s\n",
}
-/* main routine for receiver process. Receiver process runs on the
- same host as the generator process. */
-
+/**
+ * main routine for receiver process.
+ *
+ * Receiver process runs on the same host as the generator process. */
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
{
int fd1,fd2;
STRUCT_STAT st;
char *fname;
+ char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
extern struct stats stats;
extern int preserve_perms;
extern int delete_after;
+ extern int orig_umask;
struct stats initial_stats;
if (verbose > 2) {
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
}
- if (!delete_after) {
- if (recurse && delete_mode && !local_name && flist->count>0) {
- delete_files(flist);
- }
- }
-
while (1) {
cleanup_disable();
fname = local_name;
if (dry_run) {
- if (!am_server) {
- log_transfer(file, fname);
+ if (!am_server && verbose) { /* log transfer */
+ rprintf(FINFO, "%s\n", fname);
}
continue;
}
if ((fd1 == -1) && (compare_dest != NULL)) {
/* try the file at compare_dest instead */
- slprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",
+ snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",
compare_dest,fname);
fnamecmp = fnamecmpbuf;
fd1 = do_open(fnamecmp, O_RDONLY, 0);
}
if (fd1 != -1 && !preserve_perms) {
- /* if the file exists already and we aren't perserving
- presmissions then act as though the remote end sent
+ /* if the file exists already and we aren't preserving
+ permissions then act as though the remote end sent
us the file permissions we already have */
file->mode = st.st_mode;
}
continue;
}
- /* mktemp is deliberately used here instead of mkstemp.
- because O_EXCL is used on the open, the race condition
- is not a problem or a security hole, and we want to
- control the access permissions on the created file. */
- if (NULL == do_mktemp(fnametmp)) {
- rprintf(FERROR,"mktemp %s failed\n",fnametmp);
- receive_data(f_in,buf,-1,NULL,file->length);
- if (buf) unmap_file(buf);
- if (fd1 != -1) close(fd1);
- continue;
- }
+ strlcpy(template, fnametmp, sizeof(template));
/* we initially set the perms without the
setuid/setgid bits to ensure that there is no race
the lchown. Thanks to snabb@epipe.fi for pointing
this out. We also set it initially without group
access because of a similar race condition. */
- fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
- file->mode & INITACCESSPERMS);
+ fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
/* in most cases parent directories will already exist
because their information should have been previously
transferred, but that may not be the case with -R */
if (fd2 == -1 && relative_paths && errno == ENOENT &&
- create_directory_path(fnametmp) == 0) {
- fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
- file->mode & INITACCESSPERMS);
+ create_directory_path(fnametmp, orig_umask) == 0) {
+ strlcpy(fnametmp, template, sizeof(fnametmp));
+ fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
}
if (fd2 == -1) {
- rprintf(FERROR,"cannot create %s : %s\n",fnametmp,strerror(errno));
+ rprintf(FERROR,"mkstemp %s failed: %s\n",fnametmp,strerror(errno));
receive_data(f_in,buf,-1,NULL,file->length);
if (buf) unmap_file(buf);
if (fd1 != -1) close(fd1);
cleanup_set(fnametmp, fname, file, buf, fd1, fd2);
- if (!am_server) {
- log_transfer(file, fname);
+ if (!am_server && verbose) { /* log transfer */
+ rprintf(FINFO, "%s\n", fname);
}
/* recv file data */
}
if (preserve_hard_links)
- do_hard_links(flist);
+ do_hard_links();
/* now we need to fix any directory permissions that were
modified during the transfer */
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff