From: maximilian attems <max@stro.at>
To: dash@vger.kernel.org
Cc: klibc@zytor.com, maximilian attems <max@stro.at>
Subject: [PATCH] [SHELL] Fix klibc DEBUG compilation v3
Date: Fri, 8 Jul 2011 12:05:38 +0200 [thread overview]
Message-ID: <1310119538-25514-1-git-send-email-max@stro.at> (raw)
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>
---
src/show.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
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 */
--
1.7.5.4
next reply other threads:[~2011-07-08 10:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-08 10:05 maximilian attems [this message]
2011-07-15 3:20 ` [PATCH] [SHELL] Fix klibc DEBUG compilation v3 Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310119538-25514-1-git-send-email-max@stro.at \
--to=max@stro.at \
--cc=dash@vger.kernel.org \
--cc=klibc@zytor.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).