Fix the handling of namelen and argument parsing in linux.c32

diff --git a/com32/lib/syslinux/initramfs_file.c b/com32/lib/syslinux/initramfs_file.c
index bf041e7..26d19c5 100644 (file)
--- a/com32/lib/syslinux/initramfs_file.c
+++ b/com32/lib/syslinux/initramfs_file.c
@@ -126,7 +126,7 @@ int initramfs_mknod(struct initramfs *ihead, const char *filename,
 
   bp += sprintf(bp, "070701%08x%08x%08x%08x%08x%08x%08x%08x%08x"
                "%08x%08x%08x%08x", next_ino++, mode,
-               0, 0, 1, 0, len, 0, 1, major, minor, len+1, 0);
+               0, 0, 1, 0, len, 0, 1, major, minor, namelen+1, 0);
   memcpy(bp, filename, namelen);
   bp += len;
   pad = (-(sizeof(struct cpio_header)+namelen) & 3) + 1;

diff --git a/com32/modules/linux.c b/com32/modules/linux.c
index dc5da57..f1db8c8 100644 (file)
--- a/com32/modules/linux.c
+++ b/com32/modules/linux.c
@@ -156,6 +156,7 @@ int main(int argc, char *argv[])
       fprintf(stderr, "%s: unknown option: %s\n", progname, arg);
       return 1;
     }
+    argp++;
   }
 
   if (!arg) {