diff options
author | Brian Koropoff <bkoropoff@gmail.com> | 2011-03-15 15:35:14 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-03-15 15:35:14 +0800 |
commit | bfcdc4969510997fe81debf52982641febfa1bdf (patch) | |
tree | 695ccd9508035cc35be2cfe1ed6f2ae7e892c11e /src/var.c | |
parent | [BUILTIN] Fix backslash handling in read(1) (diff) | |
download | dash-bfcdc4969510997fe81debf52982641febfa1bdf.tar.gz dash-bfcdc4969510997fe81debf52982641febfa1bdf.zip |
[SHELL] Port to Solaris
- Solaris lacks paths.h and the various _PATH_* #defines. Check for them in configure.ac and fall back on the usual suspects when they are missing. - Older Solaris lacks isblank(), and versions that have it use a macro. Check for the declaration in configure.ac and fall back on a naive version when missing. - Older Solaris does not support %jd (intmax_t) in format strings, but it does support the PRIdMAX macro from inttypes.h. Do a configure check for PRIdMAX and use it in the code. If it doesn't exist, define it to "lld" when sizeof(long long) equals sizeof(intmax_t) as this is more likely to work on older systems. Otherwise, use "jd" and hope for the best. - Older Solaris lacks stdint.h, but inttypes.h provides the same types and works on all platforms I've tried dash on, so just use it instead. - Older Solaris doesn't like it when vsnprintf() is passed a NULL buffer (in violation of the POSIX spec, of course). Pass a 1-byte dummy buffer instead. - Solaris lacks tempfile and mktemp programs. Fall back on a "good-enough" custom function in mkbuiltins. Signed-off-by: Brian Koropoff <bkoropoff@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
-rw-r--r-- | src/var.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/var.c b/src/var.c index 25c2216..aec1076 100644 --- a/src/var.c +++ b/src/var.c @@ -34,7 +34,9 @@ #include <unistd.h> #include <stdlib.h> +#ifdef HAVE_PATHS_H #include <paths.h> +#endif /* * Shell variables. @@ -223,7 +225,7 @@ intmax_t setvarint(const char *name, intmax_t val, int flags) int len = max_int_length(sizeof(val)); char buf[len]; - fmtstr(buf, len, "%jd", val); + fmtstr(buf, len, "%" PRIdMAX, val); setvar(name, buf, flags); return val; } |