]> code.ossystems Code Review - openembedded-core.git/commit
busybox: fix "sed n (flushes pattern space, terminates early)" testcase failure
authorDengke Du <dengke.du@windriver.com>
Thu, 1 Sep 2016 09:42:10 +0000 (05:42 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 3 Sep 2016 22:45:46 +0000 (23:45 +0100)
commit5a680c267454d7c135c4bfe4e551a780f38a5087
tree4f96620ebd61eecd5d88b018a2ab21cabdf7737a
parent7aadc91b5ef86a89a827d59bd19e7b8272a5dd66
busybox: fix "sed n (flushes pattern space, terminates early)" testcase failure

It is a busybox upstream known bug. When the busybox sed sub-command 'n'
hit the files EOF, it print an extra character that have been printed, but
the GNU sed would not print it.

In busybox source code ../editors/sed.c
------------------------------------------------------------------------
    case 'n':
        if (!G.be_quiet)
                sed_puts(pattern_space, last_gets_char);
            if (next_line) {
                    free(pattern_space);
                    pattern_space = next_line;
                    last_gets_char = next_gets_char;
                    next_line = get_next_line(&next_gets_char, &last_puts_char, last_gets_char);
                    substituted = 0;
                    linenum++;
                    break;
            }
            /* fall through */

    /* Quit.  End of script, end of input. */
    case 'q':
        /* Exit the outer while loop */
            free(next_line);
            next_line = NULL;
            goto discard_commands;
------------------------------------------------------------------------
when read at the end of the file, the 'next_line' is null, it would go
"case 'q'" and goto discard_commands, the discard_commands would print
the old pattern space which have been printed.

So in order to comply with GNU sed, in case 'n', when the next_line is null
I add "else" at the end of the second "if": "goto again;" and send it to
the busybox upstream, the busybox maintainer adopt it and make a little
changes to the patch, we can see it at:

His reply:

http://lists.busybox.net/pipermail/busybox/2016-September/084613.html

The new patch on busybox master branch:

https://git.busybox.net/busybox/commit/?id=76d72376e0244a5cafd4880cdc623e37d86a75e4

Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch [new file with mode: 0644]
meta/recipes-core/busybox/busybox_1.24.1.bb