- Win32 libmba build fixes

- DOMC encoding fixes

2 files changed, 29 insertions, 9 deletions

diff --git a/libs/files/domc-library.patch b/libs/files/domc-library.patch
index 477823a..040467d 100644
--- a/libs/files/domc-library.patch
+++ b/libs/files/domc-library.patch
@@ -1,6 +1,6 @@
 diff -r -U3 domc-0.7.1/Makefile domc/Makefile
 --- domc-0.7.1/Makefile	2004-08-05 22:32:24.000000000 -0600
-+++ domc/Makefile	2004-08-31 17:14:03.254164327 -0600
++++ domc/Makefile	2004-08-31 19:19:15.992009233 -0600
 @@ -1,7 +1,8 @@
 -prefix     = /usr/local
 -includedir = $(prefix)/include
@@ -19,7 +19,7 @@ diff -r -U3 domc-0.7.1/Makefile domc/Makefile
  DISTRO     = $(LIBNAME)-$(MINVERSION)
  RPM_OPT_FLAGS = -O2
 -CFLAGS     = -Wall -W -DMSGNO $(RPM_OPT_FLAGS) -I$(includedir) -L$(libdir)
-+CFLAGS     = -Wall -W -DMSGNO $(RPM_OPT_FLAGS) $(_EXTRA) -I$(includedir) -L$(libdir)
++CFLAGS     = -Wall -W -DMSGNO $(RPM_OPT_FLAGS) $(_EXTRA) -I$(includedir) -L$(libdir) 
  #CFLAGS     = -Wall -W -DMSGNO -I$(includedir) -L$(libdir) $(RPM_OPT_FLAGS) -ansi -pedantic -Wbad-function-cast -Wcast-align -Wcast-qual -Wchar-subscripts -Winline -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings -Wtraditional -Wconversion -Waggregate-return -Wno-parentheses
  OBJS       = src/expatls.o src/events.o src/node.o src/nodelist.o src/namednodemap.o src/dom.o src/timestamp.o src/wcwidth.o src/mbs.o
  MAN        = DOM_CharacterData.3m.gz DOM_Document.3m.gz DOM_Element.3m.gz DOM_Implementation.3m.gz DOM_NamedNodeMap.3m.gz DOM_Node.3m.gz DOM_NodeList.3m.gz DOM_Text.3m.gz
@@ -41,7 +41,7 @@ diff -r -U3 domc-0.7.1/Makefile domc/Makefile
  
 diff -r -U3 domc-0.7.1/Makefile.msvc domc/Makefile.msvc
 --- domc-0.7.1/Makefile.msvc	2004-08-04 17:20:02.000000000 -0600
-+++ domc/Makefile.msvc	2004-08-31 17:14:03.254164327 -0600
++++ domc/Makefile.msvc	2004-08-31 18:30:01.061133229 -0600
 @@ -1,22 +1,26 @@
  !include <win32.mak>
 -LIBMBA=..\libmba-0.8.9
@@ -77,7 +77,7 @@ diff -r -U3 domc-0.7.1/Makefile.msvc domc/Makefile.msvc
  	del domc.dll domc.lib domc.exp $(OBJS)
 diff -r -U3 domc-0.7.1/src/defines.h domc/src/defines.h
 --- domc-0.7.1/src/defines.h	2003-03-22 16:35:36.000000000 -0700
-+++ domc/src/defines.h	2004-08-31 18:28:48.547584113 -0600
++++ domc/src/defines.h	2004-08-31 18:30:01.078131014 -0600
 @@ -7,7 +7,7 @@
  #define HAVE_ENCDEC 0
  #define HAVE_STRDUP 1
@@ -107,7 +107,7 @@ diff -r -U3 domc-0.7.1/src/defines.h domc/src/defines.h
  #define HAVE_SNPRINTF 1
 diff -r -U3 domc-0.7.1/src/domc.h domc/src/domc.h
 --- domc-0.7.1/src/domc.h	2004-08-04 17:32:30.000000000 -0600
-+++ domc/src/domc.h	2004-08-31 18:14:41.359000453 -0600
++++ domc/src/domc.h	2004-08-31 18:30:01.079130884 -0600
 @@ -41,6 +41,13 @@
    #include <stdint.h>
  #endif
@@ -155,7 +155,7 @@ diff -r -U3 domc-0.7.1/src/domc.h domc/src/domc.h
  
 diff -r -U3 domc-0.7.1/src/expatls.c domc/src/expatls.c
 --- domc-0.7.1/src/expatls.c	2004-08-04 17:28:49.000000000 -0600
-+++ domc/src/expatls.c	2004-08-31 18:26:14.254693516 -0600
++++ domc/src/expatls.c	2004-08-31 19:17:46.448679654 -0600
 @@ -70,6 +70,14 @@
  
  DOM_Node *Document_createNode(DOM_Document *doc, unsigned short nodeType);
@@ -186,6 +186,15 @@ diff -r -U3 domc-0.7.1/src/expatls.c domc/src/expatls.c
  static void
  xmldecl_fn(void *userData, const XML_Char *version, const XML_Char *encoding, int standalone)
  {
+@@ -711,7 +711,7 @@
+     size_t l;
+     
+     while (*s) {
+-        l = strcspn(s, "<>&\"'");
++        l = strcspn(s, "<>&\"");
+         if (l > 0) {
+             fwrite((void*)s, 1, sizeof(DOM_String) * l, stream);
+             s += l;
 @@ -731,9 +731,6 @@
          case '"':
              fputs("&quot;", stream);
@@ -198,7 +207,7 @@ diff -r -U3 domc-0.7.1/src/expatls.c domc/src/expatls.c
              break;
 diff -r -U3 domc-0.7.1/src/node.c domc/src/node.c
 --- domc-0.7.1/src/node.c	2004-08-04 17:29:12.000000000 -0600
-+++ domc/src/node.c	2004-08-31 18:24:59.805396690 -0600
++++ domc/src/node.c	2004-08-31 18:30:01.097128538 -0600
 @@ -337,7 +337,6 @@
  DOM_Node *
  DOM_Node_replaceChild(DOM_Node *node, DOM_Node *newChild, DOM_Node *oldChild)
@@ -223,7 +232,7 @@ diff -r -U3 domc-0.7.1/src/node.c domc/src/node.c
  		return NULL;
 diff -r -U3 domc-0.7.1/src/nodelist.c domc/src/nodelist.c
 --- domc-0.7.1/src/nodelist.c	2004-08-04 17:19:25.000000000 -0600
-+++ domc/src/nodelist.c	2004-08-31 18:22:47.053698572 -0600
++++ domc/src/nodelist.c	2004-08-31 18:30:01.117125932 -0600
 @@ -30,6 +30,14 @@
  #include "domc.h"
  #include "dom.h"
diff --git a/libs/files/libmba-library.patch b/libs/files/libmba-library.patch
index 3873843..f9c8be9 100644
--- a/libs/files/libmba-library.patch
+++ b/libs/files/libmba-library.patch
@@ -1,6 +1,6 @@
 diff -r -U3 libmba-0.8.10/Makefile libmba/Makefile
 --- libmba-0.8.10/Makefile	2004-08-27 22:59:43.000000000 -0600
-+++ libmba/Makefile	2004-08-31 16:58:36.732920304 -0600
++++ libmba/Makefile	2004-08-31 18:30:01.120125541 -0600
 @@ -1,7 +1,7 @@
 -prefix     = /usr/local
 -includedir = $(prefix)/include
@@ -22,3 +22,14 @@ diff -r -U3 libmba-0.8.10/Makefile libmba/Makefile
  
  sho: src/shellout.c src/mba/shellout.h
  	gcc -Wall -W -DTEST -DMSGNO -lmba -lutil -o sho src/shellout.c
+diff -r -U3 libmba-0.8.10/Makefile.msvc libmba/Makefile.msvc
+--- libmba-0.8.10/Makefile.msvc	2004-08-27 22:41:52.000000000 -0600
++++ libmba/Makefile.msvc	2004-08-31 19:18:53.670918401 -0600
+@@ -13,6 +13,7 @@
+ 
+ OBJS=src\cfg.obj src\hashmap.obj src\hexdump.obj src\linkedlist.obj src\mbs.obj src\msgno.obj src\stack.obj src\pool.obj src\varray.obj src\wcwidth.obj src\csv.obj src\path.obj src\text.obj src\eval.obj src\allocator.obj src\suba.obj src\bitset.obj src\time.obj src\misc.obj
+ 
++all: libmba.dll libmba.lib
+ 
+ libmba.dll: $(OBJS)
+ 	$(link) $(lflags) /out:libmba.dll $(OBJS)