diff options
| author | maximilian attems <max@stro.at> | 2011-07-15 11:18:13 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-07-15 11:18:13 +0800 |
| commit | 2b18a37786a45cd97a9b0481b49949210d22fc4a (patch) | |
| tree | 4915ebbab6588d7803940c895d717f083d406508 | |
| parent | [BUILTIN] Merge SKIPFUNC/SKIPFILE and only clear SKIPFUNC when leaving dotcmd (diff) | |
| download | dash-2b18a37786a45cd97a9b0481b49949210d22fc4a.tar.gz dash-2b18a37786a45cd97a9b0481b49949210d22fc4a.zip | |
[SHELL] Fix klibc DEBUG compilation
dash didn't compile in DEBUG mode against klibc for all long time. Now it only fails at link stage for not having setlinebuf(3) and freopen(3). Fixes: usr/dash/show.o: In function `opentrace': show.c:(.text+0x36): undefined reference to `freopen' show.c:(.text+0x86): undefined reference to `setlinebuf' Skip setlinebuf and use fclose/fopen inside __KLIBC__ Compile tested with debug in klibc and against glibc in dash repo. Signed-off-by: maximilian attems <max@stro.at> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/show.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index dfab8d1..b96e5b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-07-09 maximilian attems <max@stro.at> + + * Fix klibc DEBUG compilation. + 2011-07-09 Herbert Xu <herbert@gondor.apana.org.au> * Merge SKIPFUNC/SKIPFILE and only clear SKIPFUNC when leaving dotcmd. diff --git a/src/show.c b/src/show.c index 14dbef3..4a049e9 100644 --- a/src/show.c +++ b/src/show.c @@ -378,7 +378,11 @@ opentrace(void) scopy("./trace", s); #endif /* not_this_way */ if (tracefile) { +#ifndef __KLIBC__ if (!freopen(s, "a", tracefile)) { +#else + if (!(!fclose(tracefile) && (tracefile = fopen(s, "a")))) { +#endif /* __KLIBC__ */ fprintf(stderr, "Can't re-open %s\n", s); debug = 0; return; @@ -394,7 +398,9 @@ opentrace(void) if ((flags = fcntl(fileno(tracefile), F_GETFL, 0)) >= 0) fcntl(fileno(tracefile), F_SETFL, flags | O_APPEND); #endif +#ifndef __KLIBC__ setlinebuf(tracefile); +#endif /* __KLIBC__ */ fputs("\nTracing started.\n", tracefile); } #endif /* DEBUG */ |