struct dirent *di;
char buf[MAXPATHLEN];
extern int force_delete;
- struct stat st;
+ STRUCT_STAT st;
int ret;
if (do_unlink(fname) == 0 || errno == ENOENT) return 0;
#if SUPPORT_LINKS
- ret = lstat(fname, &st);
+ ret = do_lstat(fname, &st);
#else
- ret = stat(fname, &st);
+ ret = do_stat(fname, &st);
#endif
if (ret) {
fprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno));
generate approximately one checksum every n bytes
*/
-static struct sum_struct *generate_sums(struct map_struct *buf,off_t len,int n)
+static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n)
{
int i;
struct sum_struct *s;
int count;
int block_len = n;
int remainder = (len%block_len);
- off_t offset = 0;
+ OFF_T offset = 0;
count = (len+(block_len-1))/block_len;
{
struct sum_struct *s;
int i;
- off_t offset = 0;
+ OFF_T offset = 0;
s = (struct sum_struct *)malloc(sizeof(*s));
if (!s) out_of_memory("receive_sums");
}
-static int set_perms(char *fname,struct file_struct *file,struct stat *st,
+static int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
int report)
{
int updated = 0;
- struct stat st2;
+ STRUCT_STAT st2;
if (dry_run) return 0;
/* choose whether to skip a particular file */
static int skip_file(char *fname,
- struct file_struct *file, struct stat *st)
+ struct file_struct *file, STRUCT_STAT *st)
{
if (st->st_size != file->length) {
return 0;
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
{
int fd;
- struct stat st;
+ STRUCT_STAT st;
struct map_struct *buf;
struct sum_struct *s;
int statret;
static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname)
{
int i,n,remainder,len,count;
- off_t offset = 0;
- off_t offset2;
+ OFF_T offset = 0;
+ OFF_T offset2;
char *data;
static char file_sum1[MD4_SUM_LENGTH];
static char file_sum2[MD4_SUM_LENGTH];
sum_update(data,i);
- if (fd != -1 && write_sparse(fd,data,i) != i) {
+ if (fd != -1 && write_file(fd,data,i) != i) {
fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
exit_cleanup(1);
}
see_token(map, len);
sum_update(map,len);
- if (fd != -1 && write_sparse(fd,map,len) != len) {
+ if (fd != -1 && write_file(fd,map,len) != len) {
fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
exit_cleanup(1);
}
}
-/* yuck! This function wouldn't have been necessary if I had the sorting
- algorithm right. Unfortunately fixing the sorting algorithm would introduce
- a backward incompatibility as file list indexes are sent over the link.
- The aim is to see if a directory has already had the deletion algorithm applied
- to it (due to recursion), and if so to skip it. The bisection is to
- prevent this being an n^2 algorithm */
-static int delete_already_done(struct file_list *flist,int j)
+static struct delete_list {
+ dev_t dev;
+ ino_t inode;
+} *delete_list;
+static int dlist_len, dlist_alloc_len;
+
+static void add_delete_entry(struct file_struct *file)
{
- int low=0,high=j-1;
- char *name;
- char *p;
+ if (dlist_len == dlist_alloc_len) {
+ dlist_alloc_len += 1024;
+ if (!delete_list) {
+ delete_list = (struct delete_list *)malloc(sizeof(delete_list[0])*dlist_alloc_len);
+ } else {
+ delete_list = (struct delete_list *)realloc(delete_list, sizeof(delete_list[0])*dlist_alloc_len);
+ }
+ if (!delete_list) out_of_memory("add_delete_entry");
+ }
- if (j == 0) return 0;
+ delete_list[dlist_len].dev = file->dev;
+ delete_list[dlist_len].inode = file->inode;
+ dlist_len++;
- name = strdup(f_name(flist->files[j]));
+ if (verbose > 3)
+ fprintf(FINFO,"added %s to delete list\n", f_name(file));
+}
- if (!name) {
- fprintf(FERROR,"out of memory in delete_already_done");
- exit_cleanup(1);
- }
+/* yuck! This function wouldn't have been necessary if I had the sorting
+ algorithm right. Unfortunately fixing the sorting algorithm would introduce
+ a backward incompatibility as file list indexes are sent over the link.
+*/
+static int delete_already_done(struct file_list *flist,int j)
+{
+ int i;
+ STRUCT_STAT st;
- p = strrchr(name,'/');
- if (!p) {
- free(name);
- return 0;
- }
- *p = 0;
+ if (link_stat(f_name(flist->files[j]), &st)) return 1;
- while (low != high) {
- int mid = (low+high)/2;
- int ret = strcmp(f_name(flist->files[flist_up(flist, mid)]),name);
- if (ret == 0) {
- free(name);
+ for (i=0;i<dlist_len;i++) {
+ if (st.st_ino == delete_list[i].inode &&
+ st.st_dev == delete_list[i].dev)
return 1;
- }
- if (ret > 0) {
- high=mid;
- } else {
- low=mid+1;
- }
- }
-
- low = flist_up(flist, low);
-
- if (strcmp(f_name(flist->files[low]),name) == 0) {
- free(name);
- return 1;
}
- free(name);
return 0;
}
to match more closely what most people seem to expect of this option */
static void delete_files(struct file_list *flist)
{
- struct file_list *local_file_list;
- int i, j;
+ struct file_list *local_file_list;
+ int i, j;
+ char *name;
- if (cvs_exclude)
- add_cvs_excludes();
+ if (cvs_exclude)
+ add_cvs_excludes();
- if (io_error) {
- fprintf(FINFO,"IO error encountered - skipping file deletion\n");
- return;
- }
+ if (io_error) {
+ fprintf(FINFO,"IO error encountered - skipping file deletion\n");
+ return;
+ }
- for (j=0;j<flist->count;j++) {
- char *name = f_name(flist->files[j]);
+ for (j=0;j<flist->count;j++) {
+ if (!S_ISDIR(flist->files[j]->mode) ||
+ !(flist->files[j]->flags & FLAG_DELETE)) continue;
- if (!S_ISDIR(flist->files[j]->mode)) continue;
+ if (delete_already_done(flist, j)) continue;
- if (delete_already_done(flist, j)) continue;
+ name = strdup(f_name(flist->files[j]));
- if (!(local_file_list = send_file_list(-1,1,&name)))
- continue;
+ if (!(local_file_list = send_file_list(-1,1,&name))) {
+ free(name);
+ continue;
+ }
- if (verbose > 1)
- fprintf(FINFO,"deleting in %s\n", name);
+ if (verbose > 1)
+ fprintf(FINFO,"deleting in %s\n", name);
- for (i=local_file_list->count-1;i>=0;i--) {
- if (!local_file_list->files[i]->basename) continue;
- if (-1 == flist_find(flist,local_file_list->files[i])) {
- delete_one(local_file_list->files[i]);
- }
- }
- flist_free(local_file_list);
- }
+ for (i=local_file_list->count-1;i>=0;i--) {
+ if (!local_file_list->files[i]->basename) continue;
+ if (S_ISDIR(local_file_list->files[i]->mode))
+ add_delete_entry(local_file_list->files[i]);
+ if (-1 == flist_find(flist,local_file_list->files[i])) {
+ delete_one(local_file_list->files[i]);
+ }
+ }
+ flist_free(local_file_list);
+ free(name);
+ }
}
static char *cleanup_fname;
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
{
int fd1,fd2;
- struct stat st;
+ STRUCT_STAT st;
char *fname;
char fnametmp[MAXPATHLEN];
struct map_struct *buf;
/* open the file */
fd1 = open(fname,O_RDONLY);
- if (fd1 != -1 && fstat(fd1,&st) != 0) {
+ if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
fprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno));
receive_data(f_in,NULL,-1,NULL);
close(fd1);
int fd;
struct sum_struct *s;
struct map_struct *buf;
- struct stat st;
+ STRUCT_STAT st;
char fname[MAXPATHLEN];
int i;
struct file_struct *file;
}
/* map the local file */
- if (fstat(fd,&st) != 0) {
+ if (do_fstat(fd,&st) != 0) {
io_error = 1;
fprintf(FERROR,"fstat failed : %s\n",strerror(errno));
free_sums(s);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff