snow/somake
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

don't use sys_nerr with Solaris/64 Bit

Browse source 
since it isn't available then
This commit is contained in:
Georg Sauthoff 2016-08-26 23:48:40 +02:00
parent 3c18899ecb
commit 1755c69296
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/mksh/misc.cc
View file

@ -364,7 +364,9 @@ setup_char_semantics(void)
char * char *
errmsg(int errnum) errmsg(int errnum)
{ {
#if defined(_LP64)
return strerror(errnum);
#else
extern int sys_nerr; extern int sys_nerr;
char *errbuf; char *errbuf;
@ -376,6 +378,7 @@ errmsg(int errnum)
return strerror(errnum); return strerror(errnum);
} }
#endif
} }
static char static_buf[MAXPATHLEN*3]; static char static_buf[MAXPATHLEN*3];

6
lib/vroot/lock.cc
View file

@ -37,9 +37,11 @@
#include <libintl.h> #include <libintl.h>
#ifdef __sun #ifdef __sun
#if !defined(_LP64)
extern char *sys_errlist[]; extern char *sys_errlist[];
extern int sys_nerr; extern int sys_nerr;
#endif #endif
#endif
static void file_lock_error(char *msg, char *file, char *str, const char *arg1, const char *arg2); static void file_lock_error(char *msg, char *file, char *str, const char *arg1, const char *arg2);
@ -167,11 +169,15 @@ file_lock_error(char *msg, char *file, char *str, const char *arg1, const char *
len = strlen(msg); len = strlen(msg);
sprintf(&msg[len], str, arg1, arg2); sprintf(&msg[len], str, arg1, arg2);
strcat(msg, gettext(" failed - ")); strcat(msg, gettext(" failed - "));
#if defined(_LP64)
strcat(msg, strerror(errno));
#else
if (errno < sys_nerr) { if (errno < sys_nerr) {
strcat(msg, strerror(errno)); strcat(msg, strerror(errno));
} else { } else {
len = strlen(msg); len = strlen(msg);
sprintf(&msg[len], "errno %d", errno); sprintf(&msg[len], "errno %d", errno);
} }
#endif
} }