c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed spurious ^M added check for option O_BINARY changed sticky tag to

Browse Source 
* win32/Makefile.msvc: removed spurious ^M
* runtest.c: added check for option O_BINARY
* test/schemas/bug309338*, result/schemas/bug309338*: changed
  sticky tag to 'binary'
This commit is contained in:
William M. Brack 2005-07-06 19:44:03 +00:00
parent 8014844814
commit fa8d5d962e
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Jul 6 12:20:13 PDT 2005 William Brack <wbrack@mmm.com.hk>
* win32/Makefile.msvc: removed spurious ^M
* runtest.c: added check for option O_BINARY
* test/schemas/bug309338*, result/schemas/bug309338*: changed
sticky tag to 'binary'
Wed Jul 6 10:38:02 PDT 2005 William Brack <wbrack@mmm.com.hk>
* debugXML.c: excluded content string check for XML_ELEMENT_DECL

18
runtest.c
View File

@ -73,6 +73,16 @@
#include <string.h>
#endif
/*
* O_BINARY is just for Windows compatibility - if it isn't defined
* on this system, avoid any compilation error
*/
#ifdef O_BINARY
#define RD_FLAGS (O_RDONLY | O_BINARY)
#else
#define RD_FLAGS O_RDONLY
#endif
typedef int (*functest) (const char *filename, const char *result,
const char *error, int options);
@ -593,10 +603,10 @@ static int compareFiles(const char *r1, const char *r2) {
char bytes1[4096];
char bytes2[4096];
fd1 = open(r1, O_RDONLY | O_BINARY);
fd1 = open(r1, RD_FLAGS);
if (fd1 < 0)
return(-1);
fd2 = open(r2, O_RDONLY | O_BINARY);
fd2 = open(r2, RD_FLAGS);
if (fd2 < 0) {
close(fd1);
return(-1);
@ -633,7 +643,7 @@ static int compareFileMem(const char *filename, const char *mem, int size) {
return(-1);
if (info.st_size != size)
return(-1);
fd = open(filename, O_RDONLY | O_BINARY);
fd = open(filename, RD_FLAGS);
if (fd < 0)
return(-1);
while (idx < size) {
@ -667,7 +677,7 @@ static int loadMem(const char *filename, const char **mem, int *size) {
base = malloc(info.st_size + 1);
if (base == NULL)
return(-1);
if ((fd = open(filename, O_RDONLY | O_BINARY)) < 0) {
if ((fd = open(filename, RD_FLAGS)) < 0) {
free(base);
return(-1);
}

2
win32/Makefile.msvc
View File

@ -194,7 +194,7 @@ UTILS = $(BINDIR)\xmllint.exe\
$(BINDIR)\testSchemas.exe\
$(BINDIR)\testURI.exe\
$(BINDIR)\testXPath.exe\
$(BINDIR)\runtest.exe\
$(BINDIR)\runtest.exe\
$(BINDIR)\runsuite.exe
!if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native"
UTILS = $(UTILS) $(BINDIR)\testThreadsWin32.exe