ldlinux: Fixup lwip merge botch

The lwip merge changed the code for copying cmdline arguments from,

    strcpy(q, p);

to this,

    do {
	*q++ = ch = *p++;
    } while (ch);

which means 'p' no longer points at 'args'. Use 'args' explicitly for
the case where we need to apply a filename extension, otherwise users
end up seeing errors like,

    Failed to load COM32 file .c32

Reported-by: Mattias Schlenker <ms@mattiasschlenker.de>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

diff --git a/com32/elflink/ldlinux/execute.c b/com32/elflink/ldlinux/execute.c
index 49a0de5..bf0bd8c 100644 (file)
--- a/com32/elflink/ldlinux/execute.c
+++ b/com32/elflink/ldlinux/execute.c
@@ -101,6 +101,7 @@ __export void execute(const char *cmdline, uint32_t type, bool sysappend)
                                 * filename extension if COM32 and
                                 * retry.
                                 */
+                               p = args;
                                if (t->type == IMAGE_TYPE_COM32) {
                                        p = apply_extension(p, ".c32");
                                        if (!p)