diff options
author | Matt Fleming <matt.fleming@intel.com> | 2013-03-20 17:14:21 +0000 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2013-03-22 13:57:44 +0000 |
commit | 37d43cf9dd5dd2d2cef1e86aa651097473fd0b48 (patch) | |
tree | 07a7df546f178c4e1576f4cbcc0bb4db3a8e18b4 /com32/lib/sys | |
parent | bf20364b582c383b4927f898de213b1cc0981a80 (diff) | |
parent | a107cb3b6fa219cf5f65bef366c9b00b108e9a3a (diff) | |
download | syslinux-37d43cf9dd5dd2d2cef1e86aa651097473fd0b48.tar.gz syslinux-37d43cf9dd5dd2d2cef1e86aa651097473fd0b48.tar.xz syslinux-37d43cf9dd5dd2d2cef1e86aa651097473fd0b48.zip |
Merge tag 'syslinux-5.10-pre2' into for-hpa/elflink/firmware
syslinux-5.10-pre2
Conflicts:
NEWS
com32/include/netinet/in.h
com32/include/sys/cpu.h
com32/lib/Makefile
core/Makefile
core/fs/diskio.c
core/fs/pxe/pxe.h
core/init.c
core/mem/free.c
core/mem/malloc.c
mk/devel.mk
version
Diffstat (limited to 'com32/lib/sys')
-rw-r--r-- | com32/lib/sys/file.h | 2 | ||||
-rw-r--r-- | com32/lib/sys/open.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/com32/lib/sys/file.h b/com32/lib/sys/file.h index 4cd19464..f79b4f19 100644 --- a/com32/lib/sys/file.h +++ b/com32/lib/sys/file.h @@ -74,7 +74,7 @@ struct output_dev { /* File structure */ -#define NFILES 32 /* Number of files to support */ +#define NFILES 128 /* Number of files to support */ #define MAXBLOCK 16384 /* Defined by ABI */ struct file_info { diff --git a/com32/lib/sys/open.c b/com32/lib/sys/open.c index 3221bb60..1ed5bb4c 100644 --- a/com32/lib/sys/open.c +++ b/com32/lib/sys/open.c @@ -65,7 +65,7 @@ int open(const char *pathname, int flags, ...) fp = &__file_info[fd]; - handle = open_file(pathname, &fp->i.fd); + handle = open_file(pathname, flags, &fp->i.fd); if (handle < 0) { close(fd); errno = ENOENT; |