Print strerror when a system error occurs; add a new function rsyserr

[rsync/rsync.git] / authenticate.c

diff --git a/authenticate.c b/authenticate.c
index f87fcee..842a59e 100644 (file)
--- a/authenticate.c
+++ b/authenticate.c
@@ -85,7 +85,7 @@ static int get_secret(int module, char *user, char *secret, int len)
        if (fd == -1) return 0;
 
        if (do_stat(fname, &st) == -1) {
-               rprintf(FERROR,"stat(%s) : %s\n", fname, strerror(errno));
+               rsyserr(FERROR, errno, "stat(%s)", fname);
                ok = 0;
        } else if (lp_strict_modes(module)) {
                if ((st.st_mode & 06) != 0) {
@@ -135,7 +135,6 @@ static int get_secret(int module, char *user, char *secret, int len)
 static char *getpassf(char *filename)
 {
        char buffer[100];
-       int len=0;
        int fd=0;
        STRUCT_STAT st;
        int ok = 1;
@@ -151,7 +150,7 @@ static char *getpassf(char *filename)
        }
        
        if (do_stat(filename, &st) == -1) {
-               rprintf(FERROR,"stat(%s) : %s\n", filename, strerror(errno));
+               rsyserr(FERROR, errno, "stat(%s)", filename);
                ok = 0;
        } else if ((st.st_mode & 06) != 0) {
                rprintf(FERROR,"password file must not be other-accessible\n");
@@ -170,7 +169,7 @@ static char *getpassf(char *filename)
        if (envpw) rprintf(FERROR,"RSYNC_PASSWORD environment variable ignored\n");
 
        buffer[sizeof(buffer)-1]='\0';
-       if ( (len=read(fd,buffer,sizeof(buffer)-1)) > 0)
+       if (read(fd,buffer,sizeof(buffer)-1) > 0)
        {
                char *p = strtok(buffer,"\n\r");
                close(fd);