cheng/libexpat
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Fix file access for xmlwf compiled with XML_UNICODE_WCHAR_T on MinGW

Browse Source
This commit is contained in:
Rhodri James 2017-08-29 17:59:04 +01:00
parent 742fbf024f
commit 71b533dae1
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
expat/xmlwf/readfilemap.c
View File

@ -70,8 +70,8 @@
#endif #endif
#endif #endif
#include "filemap.h"
#include "xmltchar.h" #include "xmltchar.h"
#include "filemap.h"
int int
filemap(const tchar *name, filemap(const tchar *name,

21
expat/xmlwf/unixfilemap.c
View File

@ -43,11 +43,18 @@
#define MAP_FILE 0 #define MAP_FILE 0
#endif #endif
#include "xmltchar.h"
#include "filemap.h" #include "filemap.h"
#ifdef XML_UNICODE_WCHAR_T
#define XML_FMT_STR "ls"
#else
#define XML_FMT_STR "s"
#endif
int int
filemap(const char *name, filemap(const tchar *name,
void (*processor)(const void *, size_t, const char *, void *arg), void (*processor)(const void *, size_t, const tchar *, void *arg),
void *arg) void *arg)
{ {
int fd; int fd;
@ -55,19 +62,19 @@ filemap(const char *name,
struct stat sb; struct stat sb;
void *p; void *p;
fd = open(name, O_RDONLY); fd = topen(name, O_RDONLY);
if (fd < 0) { if (fd < 0) {
perror(name); tperror(name);
return 0; return 0;
} }
if (fstat(fd, &sb) < 0) { if (fstat(fd, &sb) < 0) {
perror(name); tperror(name);
close(fd); close(fd);
return 0; return 0;
} }
if (!S_ISREG(sb.st_mode)) { if (!S_ISREG(sb.st_mode)) {
close(fd); close(fd);
fprintf(stderr, "%s: not a regular file\n", name); fprintf(stderr, "%" XML_FMT_STR ": not a regular file\n", name);
return 0; return 0;
} }
if (sb.st_size > XML_MAX_CHUNK_LEN) { if (sb.st_size > XML_MAX_CHUNK_LEN) {
@ -86,7 +93,7 @@ filemap(const char *name,
p = (void *)mmap((void *)0, (size_t)nbytes, PROT_READ, p = (void *)mmap((void *)0, (size_t)nbytes, PROT_READ,
MAP_FILE|MAP_PRIVATE, fd, (off_t)0); MAP_FILE|MAP_PRIVATE, fd, (off_t)0);
if (p == (void *)-1) { if (p == (void *)-1) {
perror(name); tperror(name);
close(fd); close(fd);
return 0; return 0;
} }

3
expat/xmlwf/xmltchar.h
View File

@ -30,6 +30,9 @@
USE OR OTHER DEALINGS IN THE SOFTWARE. USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
/* Ensures compile-time constants are consistent */
#include "expat_external.h"
#ifdef XML_UNICODE #ifdef XML_UNICODE
#ifndef XML_UNICODE_WCHAR_T #ifndef XML_UNICODE_WCHAR_T
#error xmlwf requires a 16-bit Unicode-compatible wchar_t #error xmlwf requires a 16-bit Unicode-compatible wchar_t