slightly better error messages, add extra error check

SCCS-vsn: usr.bin/ftp/ruserpass.c 5.4

diff --git a/usr/src/usr.bin/ftp/ruserpass.c b/usr/src/usr.bin/ftp/ruserpass.c
index a265464..df462ac 100644 (file)
--- a/usr/src/usr.bin/ftp/ruserpass.c
+++ b/usr/src/usr.bin/ftp/ruserpass.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ruserpass.c        5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)ruserpass.c        5.4 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -118,8 +118,9 @@ next:
                        if (strcmp(*aname, "anonymous") &&
                            fstat(fileno(cfile), &stb) >= 0 &&
                            (stb.st_mode & 077) != 0) {
                        if (strcmp(*aname, "anonymous") &&
                            fstat(fileno(cfile), &stb) >= 0 &&
                            (stb.st_mode & 077) != 0) {

-       fprintf(stderr, "Error - .netrc file not correct mode.\n");
-       fprintf(stderr, "Remove password or correct mode.\n");
+       fprintf(stderr, "Error: .netrc file is readable by others.\n");
+       fprintf(stderr, 
+               "Remove password or make file unreadable by others.\n\n");

                                goto bad;
                        }
                        if (token() && *apass == 0) {
                                goto bad;
                        }
                        if (token() && *apass == 0) {


@@ -130,8 +131,9 @@ next:
                case ACCOUNT:
                        if (fstat(fileno(cfile), &stb) >= 0
                            && (stb.st_mode & 077) != 0) {
                case ACCOUNT:
                        if (fstat(fileno(cfile), &stb) >= 0
                            && (stb.st_mode & 077) != 0) {

-       fprintf(stderr, "Error - .netrc file not correct mode.\n");
-       fprintf(stderr, "Remove account or correct mode.\n");
+       fprintf(stderr, "Error: .netrc file is readable by others.\n");
+       fprintf(stderr, 
+               "Remove account or make file unreadable by others.\n\n");

                                goto bad;
                        }
                        if (token() && *aacct == 0) {
                                goto bad;
                        }
                        if (token() && *aacct == 0) {


@@ -219,7 +221,7 @@ token()
        int c;
        struct toktab *t;
 
        int c;
        struct toktab *t;
 

-       if (feof(cfile))
+       if (feof(cfile) || ferror(cfile))

                return (0);
        while ((c = getc(cfile)) != EOF &&
            (c == '\n' || c == '\t' || c == ' ' || c == ','))
                return (0);
        while ((c = getc(cfile)) != EOF &&
            (c == '\n' || c == '\t' || c == ' ' || c == ','))