use mkstemp on systems where it is secure

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 4209165..1082c40 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -55,7 +55,7 @@ static struct file_struct null_file;
 
 static void clean_flist(struct file_list *flist, int strip_root);
 
-struct string_area *string_area_new(int size)
+static struct string_area *string_area_new(int size)
 {
        struct string_area *a;
 
@@ -65,12 +65,12 @@ struct string_area *string_area_new(int size)
        a->current = a->base = malloc(size);
        if (!a->current) out_of_memory("string_area_new buffer");
        a->end = a->base + size;
-       a->next = 0;
+       a->next = NULL;
 
        return a;
 }
 
-void string_area_free(struct string_area *a)
+static void string_area_free(struct string_area *a)
 {
        struct string_area *next;
 
@@ -80,7 +80,7 @@ void string_area_free(struct string_area *a)
        }
 }
 
-char *string_area_malloc(struct string_area **ap, int size)
+static char *string_area_malloc(struct string_area **ap, int size)
 {
        char *p;
        struct string_area *a;
@@ -100,7 +100,7 @@ char *string_area_malloc(struct string_area **ap, int size)
        return p;
 }
 
-char *string_area_strdup(struct string_area **ap, const char *src)
+static char *string_area_strdup(struct string_area **ap, const char *src)
 {
        char* dest = string_area_malloc(ap, strlen(src) + 1);
        return strcpy(dest, src);
@@ -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;
@@ -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);
        }
 
@@ -1015,7 +1015,7 @@ struct file_list *flist_new()
 #if ARENA_SIZE > 0
        flist->string_area = string_area_new(0);
 #else
-       flist->string_area = 0;
+       flist->string_area = NULL;
 #endif
        return flist;
 }