diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-01-25 00:04:40 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-03-28 20:29:23 +0000 |
| commit | da8aee4bf2577ec47037705dd09a8ab3e7d5c666 (patch) | |
| tree | 5928c4b3c94d5da1bae1b01a5abc8fa92e98cc5d | |
| parent | a3ab1ea02bccb3ae4e35a607ffcf7bb9b253a7b3 (diff) | |
| download | klibc-da8aee4bf2577ec47037705dd09a8ab3e7d5c666.tar.gz | |
[klibc] dash: Fix some cosmetic differences from upstream dash
This is preparation for applying upstream changes.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | usr/dash/bltin/printf.c | 6 | ||||
| -rw-r--r-- | usr/dash/cd.c | 5 | ||||
| -rw-r--r-- | usr/dash/trap.c | 39 |
3 files changed, 25 insertions, 25 deletions
diff --git a/usr/dash/bltin/printf.c b/usr/dash/bltin/printf.c index b32b54f8fff4f..dcff099248c5c 100644 --- a/usr/dash/bltin/printf.c +++ b/usr/dash/bltin/printf.c @@ -43,14 +43,14 @@ static int conv_escape_str(char *); static char *conv_escape(char *, int *); static int getchr(void); +#ifdef HAVE_STRTOD +static double getdouble(void); +#endif static intmax_t getintmax(void); static uintmax_t getuintmax(void); static char *getstr(void); static char *mklong(const char *, const char *); static void check_conversion(const char *, const char *); -#ifdef HAVE_STRTOD -static double getdouble(void); -#endif static int rval; static char **gargv; diff --git a/usr/dash/cd.c b/usr/dash/cd.c index 89c6c30c09153..2d9d4b521c9d1 100644 --- a/usr/dash/cd.c +++ b/usr/dash/cd.c @@ -254,13 +254,16 @@ getpwd() { #ifdef __GLIBC__ char *dir = getcwd(0, 0); + if (dir) return dir; #else char buf[PATH_MAX]; - if(getcwd(buf, sizeof(buf))) + + if (getcwd(buf, sizeof(buf))) return savestr(buf); #endif + sh_warnx("getcwd() failed: %s", strerror(errno)); return nullstr; } diff --git a/usr/dash/trap.c b/usr/dash/trap.c index 1e2a867742ddf..182fa7ac9473e 100644 --- a/usr/dash/trap.c +++ b/usr/dash/trap.c @@ -395,48 +395,45 @@ out: /* NOTREACHED */ } -/* - * Decode a signal name - */ int decode_signal(const char *string, int minsig) { - int i; + int signo; if (is_number(string)) { - i = atoi(string); - if (i >= NSIG) { + signo = atoi(string); + if (signo >= NSIG) { return -1; } - return i; + return signo; } - for ( i = minsig ; i < NSIG ; i++ ) { - if ( sys_sigabbrev[i] && - !strcasecmp(string, sys_sigabbrev[i]) ) - return i; + for (signo = minsig; signo < NSIG; signo++) { + if (sys_sigabbrev[signo] && + !strcasecmp(string, sys_sigabbrev[signo])) + return signo; } #ifdef SIGRTMIN - if ( !strncasecmp(string, "RTMIN", 5) ) { + if (!strncasecmp(string, "RTMIN", 5)) { char *ep; - if ( string[5] && string[5] != '+' ) + if (string[5] && string[5] != '+') return -1; - i = SIGRTMIN + strtol(string+5, &ep, 10); - if ( *ep || i < SIGRTMIN || i > SIGRTMAX ) + signo = SIGRTMIN + strtol(string+5, &ep, 10); + if (*ep || signo < SIGRTMIN || signo > SIGRTMAX) return -1; - return i; + return signo; } - if ( !strncasecmp(string, "RTMAX", 5) ) { + if (!strncasecmp(string, "RTMAX", 5)) { char *ep; - if ( string[5] && string[5] != '-' ) + if (string[5] && string[5] != '-') return -1; - i = SIGRTMAX + strtol(string+5, &ep, 10); - if ( *ep || i < SIGRTMIN || i > SIGRTMAX ) + signo = SIGRTMAX + strtol(string+5, &ep, 10); + if (*ep || signo < SIGRTMIN || signo > SIGRTMAX) return -1; - return i; + return signo; } #endif |