Correct over-zealous edit for UNICOS.

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 5393392..bb6149e 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -150,7 +150,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;
@@ -185,8 +185,6 @@ int link_stat(const char *Path, STRUCT_STAT *Buffer)
 static int match_file_name(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;
@@ -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;
 }
@@ -534,7 +532,7 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap,
                if (lastdir && strcmp(fname, lastdir)==0) {
                        file->dirname = lastdir;
                } else {
-                       file->dirname = STRDUP(ap, fname);
+                       file->dirname = strdup(fname);
                        lastdir = file->dirname;
                }
                file->basename = STRDUP(ap, p+1);
@@ -579,7 +577,7 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap,
                if (lastdir && strcmp(lastdir, flist_dir)==0) {
                        file->basedir = lastdir;
                } else {
-                       file->basedir = STRDUP(ap, flist_dir);
+                       file->basedir = strdup(flist_dir);
                        lastdir = file->basedir;
                }
        } else {
@@ -700,6 +698,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);
        }