aboutsummaryrefslogtreecommitdiffstats
path: root/com32/libupload
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-05-31 12:16:22 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-05-31 13:45:42 +0100
commit894c81b75aa2ffc4eef3c56e4c72fe70c4080b99 (patch)
tree37b5135e79a69a30e2eac3f81a17efdd4701a813 /com32/libupload
parent98e33fa25fb8feeb66cbf20b9cba0d5adff3e658 (diff)
parentba42e1409ece2e9d56728e0ee6a6342c05ec6e52 (diff)
downloadsyslinux-894c81b75aa2ffc4eef3c56e4c72fe70c4080b99.tar.gz
syslinux-894c81b75aa2ffc4eef3c56e4c72fe70c4080b99.tar.xz
syslinux-894c81b75aa2ffc4eef3c56e4c72fe70c4080b99.zip
Merge remote-tracking branch 'zytor/master' into merge/elflink/master
A lot of development has gone on in the 'master' branch since the last time we merged; new features, bug fixes, etc, etc. Conflicts: Makefile com32/Makefile com32/lib/Makefile com32/lib/syslinux/load_linux.c com32/modules/Makefile com32/modules/chain.c core/bootsect.inc core/init.inc version
Diffstat (limited to 'com32/libupload')
-rw-r--r--com32/libupload/cpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/libupload/cpio.c b/com32/libupload/cpio.c
index b3e1eb78..25b464d4 100644
--- a/com32/libupload/cpio.c
+++ b/com32/libupload/cpio.c
@@ -31,7 +31,7 @@ int cpio_hdr(struct upload_backend *be, uint32_t mode, size_t datalen,
cpio_pad(be);
- sprintf(hdr, "%06o%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x%08x",
+ sprintf(hdr, "%06o%08x%08x%08x%08x%08x%08x%08zx%08x%08x%08x%08x%08x%08x",
070701, /* c_magic */
inode++, /* c_ino */
mode, /* c_mode */