From bb176a0b8571f7e1866e29ea5c89237df6b00670 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Thu, 24 Jan 2002 23:18:02 +0000
Subject: [PATCH] Don't null terminate the first byte of the appended command
 line...

---
 util/mkelfImage/Makefile                    | 8 ++++++--
 util/mkelfImage/elf32-i386/convert_params.c | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/util/mkelfImage/Makefile b/util/mkelfImage/Makefile
index 923cef8013..f12fc46a1f 100644
--- a/util/mkelfImage/Makefile
+++ b/util/mkelfImage/Makefile
@@ -6,8 +6,8 @@
 # the result will be a directory tree  that you can run mkelfImage in
 PREFIX=/usr/local/
 PERLPATH=/usr/bin/perl
-VERSION="1.10"
-DATE="21 January 2002"
+VERSION="1.11"
+DATE="24 January 2002"
 
 SHAREDIR=$(PREFIX)/share/mkelfImage
 BINDIR=$(PREFIX)/bin
@@ -24,6 +24,10 @@ all: $(FILES)
 clean:
 	rm -f $(FILES)
 
+distclean: clean
+	find . -type f -name '*~' | xargs rm -f
+
+
 install: $(DIRS) $(FILES)
 	mkdir -p $(SHAREDIR) $(BINDIR) $(MANDIR)
 	cp -fr elf32-i386/ $(SHAREDIR)
diff --git a/util/mkelfImage/elf32-i386/convert_params.c b/util/mkelfImage/elf32-i386/convert_params.c
index 5c2db91cf2..363afce031 100644
--- a/util/mkelfImage/elf32-i386/convert_params.c
+++ b/util/mkelfImage/elf32-i386/convert_params.c
@@ -382,6 +382,7 @@ void append_command_line(struct parameters *real_mode, char *arg, int arg_bytes)
 	}
 	len = strnlen(arg, max);
 	memcpy(dest, arg, len);
+	dest += len;
 	/* Null terminate the string */
 	*dest++ = '\0';
 }