separate strerror() and make perror() call it.

SCCS-vsn: lib/libc/stdio/perror.c 5.8

diff --git a/usr/src/lib/libc/stdio/perror.c b/usr/src/lib/libc/stdio/perror.c
index f4749c2..18337f5 100644 (file)
--- a/usr/src/lib/libc/stdio/perror.c
+++ b/usr/src/lib/libc/stdio/perror.c
@@ -16,24 +16,21 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)perror.c   5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)perror.c   5.8 (Berkeley) %G%";

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

-int errno;
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-static char ebuf[20];
-

 perror(s)
        char *s;
 {
 perror(s)
        char *s;
 {

+       extern int errno;
+       register struct iovec *v;

        struct iovec iov[4];
        struct iovec iov[4];

-       register struct iovec *v = iov;
+       char *strerror();

 
 

+       v = iov;

        if (s && *s) {
                v->iov_base = s;
                v->iov_len = strlen(s);
        if (s && *s) {
                v->iov_base = s;
                v->iov_len = strlen(s);


@@ -42,25 +39,10 @@ perror(s)
                v->iov_len = 2;
                v++;
        }
                v->iov_len = 2;
                v++;
        }

-       if ((u_int)errno < sys_nerr)
-               v->iov_base = sys_errlist[errno];
-       else {
-               (void)sprintf(ebuf, "Unknown error: %d", errno);
-               v->iov_base = ebuf;
-       }
+       v->iov_base = strerror(errno);

        v->iov_len = strlen(v->iov_base);
        v++;
        v->iov_base = "\n";
        v->iov_len = 1;
        (void)writev(2, iov, (v - iov) + 1);
 }
        v->iov_len = strlen(v->iov_base);
        v++;
        v->iov_base = "\n";
        v->iov_len = 1;
        (void)writev(2, iov, (v - iov) + 1);
 }

-
-char *
-strerror(errnum)
-       int errnum;
-{
-       if ((u_int)errnum < sys_nerr)
-               return(sys_errlist[errnum]);
-       (void)sprintf(ebuf, "Unknown error: %d", errnum);
-       return(ebuf);
-}