emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: fix bit-rotten debug infrastructure

Browse Source 
DEBUG = 2 output was a bit messed up

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-10-30 18:30:29 +01:00
parent 493b9cae80
commit 474ed06c39
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
shell/ash.c
View File

@ -844,13 +844,8 @@ trace_vprintf(const char *fmt, va_list va)
{ {
if (debug != 1) if (debug != 1)
return; return;
if (DEBUG_TIME)
fprintf(tracefile, "%u ", (int) time(NULL));
if (DEBUG_PID)
fprintf(tracefile, "[%u] ", (int) getpid());
if (DEBUG_SIG)
fprintf(tracefile, "pending s:%d i:%d(supp:%d) ", pending_sig, pending_int, suppress_int);
vfprintf(tracefile, fmt, va); vfprintf(tracefile, fmt, va);
fprintf(tracefile, "\n");
} }
static void static void
@ -1243,11 +1238,10 @@ ash_vmsg_and_raise(int cond, const char *msg, va_list ap)
{ {
#if DEBUG #if DEBUG
if (msg) { if (msg) {
TRACE(("ash_vmsg_and_raise(%d, \"", cond)); TRACE(("ash_vmsg_and_raise(%d):", cond));
TRACEV((msg, ap)); TRACEV((msg, ap));
TRACE(("\") pid=%d\n", getpid()));
} else } else
TRACE(("ash_vmsg_and_raise(%d, NULL) pid=%d\n", cond, getpid())); TRACE(("ash_vmsg_and_raise(%d):NULL\n", cond));
if (msg) if (msg)
#endif #endif
ash_vmsg(msg, ap); ash_vmsg(msg, ap);
@ -13422,16 +13416,15 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
goto state4; goto state4;
} }
exception_handler = &jmploc; exception_handler = &jmploc;
#if DEBUG
opentrace();
TRACE(("Shell args: "));
trace_puts_args(argv);
#endif
rootpid = getpid(); rootpid = getpid();
init(); init();
setstackmark(&smark); setstackmark(&smark);
procargs(argv); procargs(argv);
#if DEBUG
TRACE(("Shell args: "));
trace_puts_args(argv);
#endif
if (argv[0] && argv[0][0] == '-') if (argv[0] && argv[0][0] == '-')
isloginsh = 1; isloginsh = 1;