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

"xmllint unusable on win32" so applied a libxml2 patch from Christian

Browse Source 
* xmllint.c catalog.c: "xmllint unusable on win32" so applied
  a libxml2 patch from Christian Ehrlicher
Daniel

svn path=/trunk/; revision=3599
This commit is contained in:
Daniel Veillard 2007-04-17 12:33:19 +00:00
parent 42720248e6
commit ed12138b18
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Apr 17 14:34:45 CEST 2007 Daniel Veillard <daniel@veillard.com>
* xmllint.c catalog.c: "xmllint unusable on win32" so applied
a libxml2 patch from Christian Ehrlicher
Mon Apr 16 09:05:01 CEST 2007 Daniel Veillard <daniel@veillard.com> Mon Apr 16 09:05:01 CEST 2007 Daniel Veillard <daniel@veillard.com>
* HTMLparser.c: change the way script/style are parsed to * HTMLparser.c: change the way script/style are parsed to

21
catalog.c
View File

@ -44,6 +44,12 @@
#define MAX_DELEGATE 50 #define MAX_DELEGATE 50
#define MAX_CATAL_DEPTH 50 #define MAX_CATAL_DEPTH 50
#ifdef _WIN32
# define PATH_SEAPARATOR ';'
#else
# define PATH_SEAPARATOR ':'
#endif
/** /**
* TODO: * TODO:
* *
@ -3209,6 +3215,9 @@ xmlLoadCatalogs(const char *pathss) {
const char *cur; const char *cur;
const char *paths; const char *paths;
xmlChar *path; xmlChar *path;
#ifdef _WIN32
int i, iLen;
#endif
if (pathss == NULL) if (pathss == NULL)
return; return;
@ -3218,15 +3227,23 @@ xmlLoadCatalogs(const char *pathss) {
while (xmlIsBlank_ch(*cur)) cur++; while (xmlIsBlank_ch(*cur)) cur++;
if (*cur != 0) { if (*cur != 0) {
paths = cur; paths = cur;
while ((*cur != 0) && (*cur != ':') && (!xmlIsBlank_ch(*cur))) while ((*cur != 0) && (*cur != PATH_SEAPARATOR) && (!xmlIsBlank_ch(*cur)))
cur++; cur++;
path = xmlStrndup((const xmlChar *)paths, cur - paths); path = xmlStrndup((const xmlChar *)paths, cur - paths);
#ifdef _WIN32
iLen = strlen(path);
for(i = 0; i < iLen; i++) {
if(path[i] == '\\') {
path[i] = '/';
}
}
#endif
if (path != NULL) { if (path != NULL) {
xmlLoadCatalog((const char *) path); xmlLoadCatalog((const char *) path);
xmlFree(path); xmlFree(path);
} }
} }
while (*cur == ':') while (*cur == PATH_SEAPARATOR)
cur++; cur++;
} }
} }

9
xmllint.c
View File

@ -209,6 +209,11 @@ static int sax = 0;
* * * *
************************************************************************/ ************************************************************************/
#define MAX_PATHS 64 #define MAX_PATHS 64
#ifdef _WIN32
# define PATH_SEPARATOR ';'
#else
# define PATH_SEPARATOR ':'
#endif
static xmlChar *paths[MAX_PATHS + 1]; static xmlChar *paths[MAX_PATHS + 1];
static int nbpaths = 0; static int nbpaths = 0;
static int load_trace = 0; static int load_trace = 0;
@ -225,10 +230,10 @@ void parsePath(const xmlChar *path) {
return; return;
} }
cur = path; cur = path;
while ((*cur == ' ') || (*cur == ':')) while ((*cur == ' ') || (*cur == PATH_SEPARATOR))
cur++; cur++;
path = cur; path = cur;
while ((*cur != 0) && (*cur != ' ') && (*cur != ':')) while ((*cur != 0) && (*cur != ' ') && (*cur != PATH_SEPARATOR))
cur++; cur++;
if (cur != path) { if (cur != path) {
paths[nbpaths] = xmlStrndup(path, cur - path); paths[nbpaths] = xmlStrndup(path, cur - path);