x/busybox
1
0
Fork 0
mirror of https://git.busybox.net/busybox synced 2026-01-31 16:43:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ash: fix fallout of no-more-set commandname

Browse source 
Testsuite reports lots of message mismatches, fix that

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2025-08-09 17:04:16 +02:00
parent c92755133b
commit 53b3854e81
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shell/ash.c
View file

@ -1445,13 +1445,14 @@ showtree(union node *n)
static void
ash_vmsg(const char *msg, va_list ap)
{
//In dash, the order/format is different:
// arg0: LINENO: [commandname:] MSG
//If you fix it, change testsuite to match
fprintf(stderr, "%s: ", arg0);
if (commandname) {
if (strcmp(arg0, commandname) != 0)
fprintf(stderr, "%s: ", commandname);
if (!iflag || g_parsefile->pf_fd > 0)
fprintf(stderr, "line %d: ", errlinno);
}
if (commandname && strcmp(arg0, commandname) != 0)
fprintf(stderr, "%s: ", commandname);
if (!iflag || g_parsefile->pf_fd > 0)
fprintf(stderr, "line %d: ", errlinno);
vfprintf(stderr, msg, ap);
newline_and_flush(stderr);
}