Browse Source

when strerror() has an Unknown error, also set EINVAL

OPENBSD_3_1
deraadt 23 years ago
parent
commit
2ebe322d0c
1 changed files with 8 additions and 3 deletions
  1. +8
    -3
      src/lib/libc/string/__strerror.c

+ 8
- 3
src/lib/libc/string/__strerror.c View File

@ -32,7 +32,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
static char *rcsid = "$OpenBSD: __strerror.c,v 1.7 2001/06/27 00:58:56 lebel Exp $";
static char *rcsid = "$OpenBSD: __strerror.c,v 1.8 2001/12/08 20:37:32 deraadt Exp $";
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#ifdef NLS #ifdef NLS
@ -50,7 +50,8 @@ static char *rcsid = "$OpenBSD: __strerror.c,v 1.7 2001/06/27 00:58:56 lebel Exp
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
static char *itoa(num)
static char *
itoa(num)
int num; int num;
{ {
static char buffer[11]; static char buffer[11];
@ -78,9 +79,10 @@ __strerror(num, buf)
{ {
#define UPREFIX "Unknown error: " #define UPREFIX "Unknown error: "
register unsigned int errnum; register unsigned int errnum;
#ifdef NLS #ifdef NLS
int save_errno;
nl_catd catd; nl_catd catd;
catd = catopen("libc", 0); catd = catopen("libc", 0);
#endif #endif
@ -99,10 +101,13 @@ __strerror(num, buf)
strcpy(buf, UPREFIX); strcpy(buf, UPREFIX);
#endif #endif
strncat(buf, itoa(errnum), NL_TEXTMAX-strlen(buf)-1); strncat(buf, itoa(errnum), NL_TEXTMAX-strlen(buf)-1);
errno = EINVAL;
} }
#ifdef NLS #ifdef NLS
save_errno = errno;
catclose(catd); catclose(catd);
errno = save_errno;
#endif #endif
return buf; return buf;


Loading…
Cancel
Save