Split code to generate "rwx-----" strings into lib/permstring.c so it

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 4ad3096..d9b0da7 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -1,6 +1,7 @@
 /* 
    Copyright (C) Andrew Tridgell 1996
    Copyright (C) Paul Mackerras 1996
+   Copyright (C) 2001 by Martin Pool <mbp@samba.org>
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -47,6 +48,9 @@ extern int remote_version;
 extern int io_error;
 extern int sanitize_paths;
 
+extern int read_batch;
+extern int write_batch;
+
 static char topsrcname[MAXPATHLEN];
 
 static struct exclude_struct **local_exclude_list;
@@ -108,24 +112,14 @@ static char *string_area_strdup(struct string_area **ap, const char *src)
 
 static void list_file_entry(struct file_struct *f)
 {
-       char perms[11] = "----------";
-       char *perm_map = "rwxrwxrwx";
-       int i;
+       char perms[11];
 
        if (!f->basename)
                /* this can happen if duplicate names were removed */
                return;
 
-       for (i=0;i<9;i++) {
-               if (f->mode & (1<<i)) perms[9-i] = perm_map[8-i];
-       }
-       if (S_ISLNK(f->mode)) perms[0] = 'l';
-       if (S_ISDIR(f->mode)) perms[0] = 'd';
-       if (S_ISBLK(f->mode)) perms[0] = 'b';
-       if (S_ISCHR(f->mode)) perms[0] = 'c';
-       if (S_ISSOCK(f->mode)) perms[0] = 's';
-       if (S_ISFIFO(f->mode)) perms[0] = 'p';
-       
+       permstring(perms, f->mode);
+
        if (preserve_links && S_ISLNK(f->mode)) {
                rprintf(FINFO,"%s %11.0f %s %s -> %s\n", 
                        perms, 
@@ -150,7 +144,7 @@ int readlink_stat(const char *Path, STRUCT_STAT *Buffer, char *Linkbuf)
        }
        if (S_ISLNK(Buffer->st_mode)) {
                int l;
-               if ((l = readlink(Path,Linkbuf,MAXPATHLEN-1)) == -1) {
+               if ((l = readlink((char *) Path, Linkbuf, MAXPATHLEN-1))== -1) {
                        return -1;
                }
                Linkbuf[l] = 0;
@@ -182,14 +176,18 @@ int link_stat(const char *Path, STRUCT_STAT *Buffer)
   This function is used to check if a file should be included/excluded
   from the list of files based on its name and type etc
  */
-static int match_file_name(char *fname,STRUCT_STAT *st)
+static int check_exclude_file(int f,char *fname,STRUCT_STAT *st)
 {
-  if (check_exclude(fname,local_exclude_list,st)) {
-    if (verbose > 2)
-      rprintf(FINFO,"excluding file %s\n",fname);
-    return 0;
-  }
-  return 1;
+       extern int delete_excluded;
+
+       /* f is set to -1 when calculating deletion file list */
+       if ((f == -1) && delete_excluded) {
+               return 0;
+       }
+       if (check_exclude(fname,local_exclude_list,st)) {
+               return 1;
+       }
+       return 0;
 }
 
 /* used by the one_file_system code */
@@ -205,7 +203,7 @@ static void set_filesystem(char *fname)
 
 static int to_wire_mode(mode_t mode)
 {
-       if (S_ISLNK(mode) && (S_IFLNK != 0120000)) {
+       if (S_ISLNK(mode) && (_S_IFLNK != 0120000)) {
                return (mode & ~(_S_IFMT)) | 0120000;
        }
        return (int)mode;
@@ -213,8 +211,8 @@ static int to_wire_mode(mode_t mode)
 
 static mode_t from_wire_mode(int mode)
 {
-       if ((mode & (_S_IFMT)) == 0120000 && (S_IFLNK != 0120000)) {
-               return (mode & ~(_S_IFMT)) | S_IFLNK;
+       if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000)) {
+               return (mode & ~(_S_IFMT)) | _S_IFLNK;
        }
        return (mode_t)mode;
 }
@@ -478,7 +476,6 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap,
        char *p;
        char cleaned_name[MAXPATHLEN];
        char linkbuf[MAXPATHLEN];
-       extern int delete_excluded;
        extern int module_id;
 
        strlcpy(cleaned_name, fname, MAXPATHLEN);
@@ -492,9 +489,18 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap,
        memset(sum,0,SUM_LENGTH);
 
        if (readlink_stat(fname,&st,linkbuf) != 0) {
+               int save_errno = errno;
+               if ((errno == ENOENT) && copy_links && !noexcludes) {
+                       /* symlink pointing nowhere, see if excluded */
+                       memset((char *)&st, 0, sizeof(st));
+                       if (check_exclude_file(f,fname,&st)) {
+                               /* file is excluded anyway, ignore silently */
+                               return NULL;
+                       }
+               }
                io_error = 1;
                rprintf(FERROR,"readlink %s: %s\n",
-                       fname,strerror(errno));
+                       fname,strerror(save_errno));
                return NULL;
        }
 
@@ -511,8 +517,7 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap,
                        return NULL;
        }
        
-       /* f is set to -1 when calculating deletion file list */
-       if (((f != -1) || !delete_excluded) && !match_file_name(fname,&st))
+       if (check_exclude_file(f,fname,&st))
                return NULL;
 
 
@@ -615,6 +620,9 @@ void send_file_name(int f,struct file_list *flist,char *fname,
                  out_of_memory("send_file_name");
   }
 
+  if (write_batch) /*  dw  */
+    file->flags = FLAG_DELETE;
+
   if (strcmp(file->basename,"")) {
     flist->files[flist->count++] = file;
     send_file_entry(file,f,base_flags);
@@ -700,6 +708,8 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
 
        if (verbose && recurse && !am_server && f != -1) {
                rprintf(FINFO,"building file list ... ");
+                if (verbose > 1)
+                        rprintf(FINFO, "\n");
                rflush(FINFO);
        }
 
@@ -841,6 +851,8 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                io_end_buffering(f);
                stats.flist_size = stats.total_written - start_write;
                stats.num_files = flist->count;
+               if (write_batch) /*  dw  */
+                   write_batch_flist_info(flist->count, flist->files);
        }
 
        if (verbose > 2)
@@ -918,7 +930,7 @@ struct file_list *recv_file_list(int f)
   }
 
   /* if protocol version is >= 17 then recv the io_error flag */
-  if (f != -1 && remote_version >= 17) {
+  if (f != -1 && remote_version >= 17  && !read_batch) {  /* dw-added readbatch */
          extern int module_id;
          extern int ignore_errors;
          if (lp_ignore_errors(module_id) || ignore_errors) {
@@ -1096,10 +1108,10 @@ static void clean_flist(struct file_list *flist, int strip_root)
 
        for (i=0;i<flist->count;i++) {
                rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%.0f\n",
-                       getpid(), i, 
+                       (int) getpid(), i, 
                        NS(flist->files[i]->dirname),
                        NS(flist->files[i]->basename),
-                       flist->files[i]->mode,
+                       (int) flist->files[i]->mode,
                        (double)flist->files[i]->length);
        }
 }