aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Koropoff <bkoropoff@gmail.com>2011-03-10 20:19:16 +0800
committermaximilian attems <max@stro.at>2011-06-03 18:44:13 +0200
commit932d5e0144e678cf97c21e34368d5a281ef8b11a (patch)
tree1bc380bf4d5c62ece3cbab7d2321f1f2d403ec7b
parent182b6bcb78b64dd2a8a7878e05bf157c3650ba6b (diff)
downloadklibc-932d5e0144e678cf97c21e34368d5a281ef8b11a.tar.gz
[klibc] [SHELL] Port to AIX
- AIX lacks a WCOREDUMP macro. It's just used to append "(core dumped)" to the crash message, so #ifdef around it. - For some reason, the nl program on AIX defaults to not printing line numbers ("-b n"), even though the spec says it should default to "-b t". Explicitly pass "-b a" for good measure in mkbuiltins. Signed-off-by: Brian Koropoff <bkoropoff@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: maximilian attems <max@stro.at>
-rw-r--r--usr/dash/jobs.c2
-rw-r--r--usr/dash/mkbuiltins2
2 files changed, 3 insertions, 1 deletions
diff --git a/usr/dash/jobs.c b/usr/dash/jobs.c
index 2dc72a7c942fb..b3ed163dfdc2b 100644
--- a/usr/dash/jobs.c
+++ b/usr/dash/jobs.c
@@ -425,9 +425,11 @@ sprint_status(char *s, int status, int sigonly)
#endif
}
col = fmtstr(s, 32, strsignal(st));
+#ifdef WCOREDUMP
if (WCOREDUMP(status)) {
col += fmtstr(s + col, 16, " (core dumped)");
}
+#endif
} else if (!sigonly) {
if (st)
col = fmtstr(s, 16, "Done(%d)", st);
diff --git a/usr/dash/mkbuiltins b/usr/dash/mkbuiltins
index e38ce4c89b87a..99107c2bd68cb 100644
--- a/usr/dash/mkbuiltins
+++ b/usr/dash/mkbuiltins
@@ -84,7 +84,7 @@ cat <<\!
*/
!
-sed 's/ -[a-z]*//' $temp2 | nl -v 0 | LC_COLLATE=C sort -u -k 3,3 |
+sed 's/ -[a-z]*//' $temp2 | nl -b a -v 0 | LC_COLLATE=C sort -u -k 3,3 |
tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ |
awk '{ printf "#define %s (builtincmd + %d)\n", $3, $1}'
printf '\n#define NUMBUILTINS %d\n' $(wc -l < $temp2)