Changed rprintf() calls that included strerror() to use rsyserr().
authorWayne Davison <wayned@samba.org>
Sat, 15 May 2004 19:31:10 +0000 (19:31 +0000)
committerWayne Davison <wayned@samba.org>
Sat, 15 May 2004 19:31:10 +0000 (19:31 +0000)
main.c

diff --git a/main.c b/main.c
index 3586ce7..915d1df 100644 (file)
--- a/main.c
+++ b/main.c
@@ -324,8 +324,8 @@ static char *get_local_name(struct file_list *flist,char *name)
        if (do_stat(name,&st) == 0) {
                if (S_ISDIR(st.st_mode)) {
                        if (!push_dir(name)) {
-                               rprintf(FERROR, "push_dir %s failed: %s (1)\n",
-                                       full_fname(name), strerror(errno));
+                               rsyserr(FERROR, errno, "push_dir#1 %s failed",
+                                       full_fname(name));
                                exit_cleanup(RERR_FILESELECT);
                        }
                        return NULL;
@@ -341,8 +341,7 @@ static char *get_local_name(struct file_list *flist,char *name)
                return name;
 
        if (do_mkdir(name,0777 & ~orig_umask) != 0) {
-               rprintf(FERROR, "mkdir %s failed: %s\n",
-                       full_fname(name), strerror(errno));
+               rsyserr(FERROR, errno, "mkdir %s failed", full_fname(name));
                exit_cleanup(RERR_FILEIO);
        } else {
                if (verbose > 0)
@@ -350,8 +349,8 @@ static char *get_local_name(struct file_list *flist,char *name)
        }
 
        if (!push_dir(name)) {
-               rprintf(FERROR, "push_dir %s failed: %s (2)\n",
-                       full_fname(name), strerror(errno));
+               rsyserr(FERROR, errno, "push_dir#2 %s failed",
+                       full_fname(name));
                exit_cleanup(RERR_FILESELECT);
        }
 
@@ -371,8 +370,8 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
        }
 
        if (!relative_paths && !push_dir(dir)) {
-               rprintf(FERROR, "push_dir %s failed: %s (3)\n",
-                       full_fname(dir), strerror(errno));
+               rsyserr(FERROR, errno, "push_dir#3 %s failed",
+                       full_fname(dir));
                exit_cleanup(RERR_FILESELECT);
        }
        argc--;
@@ -508,8 +507,8 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
                argc--;
                argv++;
                if (!am_daemon && !push_dir(dir)) {
-                       rprintf(FERROR, "push_dir %s failed: %s (4)\n",
-                               full_fname(dir), strerror(errno));
+                       rsyserr(FERROR, errno, "push_dir#4 %s failed",
+                               full_fname(dir));
                        exit_cleanup(RERR_FILESELECT);
                }
        }