From kwaclaw at users.sourceforge.net  Mon Apr 30 02:50:24 2007
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 29 Apr 2007 17:50:24 -0700
Subject: [Expat-checkins] expat/xmlwf xmlwf.c,1.72,1.73
Message-ID: <20070430005028.0B2671E4012@bag.python.org>

Update of /cvsroot/expat/expat/xmlwf
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8987

Modified Files:
	xmlwf.c 
Log Message:
No more search for (back)slashes in the string "STDIN".
Optimized code with regards to use of path delimters on different platforms.

Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- xmlwf.c	5 Aug 2006 17:00:36 -0000	1.72
+++ xmlwf.c	30 Apr 2007 00:50:22 -0000	1.73
@@ -777,17 +777,28 @@
       XML_SetProcessingInstructionHandler(parser, nopProcessingInstruction);
     }
     else if (outputDir) {
+      const XML_Char * delim = T("/");
       const XML_Char *file = useStdin ? T("STDIN") : argv[i];
-      if (tcsrchr(file, T('/')))
-        file = tcsrchr(file, T('/')) + 1;
+      if (!useStdin) {
+        /* Jump after last (back)slash */
+        const XML_Char * lastDelim = tcsrchr(file, delim[0]);
+        if (lastDelim)
+          file = lastDelim + 1;
 #if (defined(WIN32) || defined(__WATCOMC__))
-      if (tcsrchr(file, T('\\')))
-        file = tcsrchr(file, T('\\')) + 1;
+        else {
+          const XML_Char * winDelim = T("\\");
+          lastDelim = tcsrchr(file, winDelim[0]);
+          if (lastDelim) {
+            file = lastDelim + 1;
+            delim = winDelim;
+          }
+        }
 #endif
+      }
       outName = (XML_Char *)malloc((tcslen(outputDir) + tcslen(file) + 2)
                        * sizeof(XML_Char));
       tcscpy(outName, outputDir);
-      tcscat(outName, T("/"));
+      tcscat(outName, delim);
       tcscat(outName, file);
       fp = tfopen(outName, T("wb"));
       if (!fp) {


From kwaclaw at users.sourceforge.net  Mon Apr 30 02:53:53 2007
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 29 Apr 2007 17:53:53 -0700
Subject: [Expat-checkins] expat/doc xmlwf.1,1.3,1.4
Message-ID: <20070430005356.7875D1E4015@bag.python.org>

Update of /cvsroot/expat/expat/doc
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10122

Modified Files:
	xmlwf.1 
Log Message:
Corrected some typos.

Index: xmlwf.1
===================================================================
RCS file: /cvsroot/expat/expat/doc/xmlwf.1,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xmlwf.1	24 Jan 2003 18:34:59 -0000	1.3
+++ xmlwf.1	30 Apr 2007 00:53:51 -0000	1.4
@@ -102,7 +102,7 @@
 .TP
 \fB-m\fR
 Outputs some strange sort of XML file that completely
-describes the the input file, including character postitions.
+describes the input file, including character positions.
 Requires \fB-d\fR to specify an output file.
 .TP
 \fB-n\fR


From kwaclaw at users.sourceforge.net  Mon Apr 30 02:58:54 2007
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 29 Apr 2007 17:58:54 -0700
Subject: [Expat-checkins] expat/win32 expat.iss,1.20,1.21
Message-ID: <20070430005858.131AE1E4009@bag.python.org>

Update of /cvsroot/expat/expat/win32
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12004

Modified Files:
	expat.iss 
Log Message:
Changed install directory and application name/version to be more typical for Windows.

Index: expat.iss
===================================================================
RCS file: /cvsroot/expat/expat/win32/expat.iss,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- expat.iss	1 Jan 2006 20:59:25 -0000	1.20
+++ expat.iss	30 Apr 2007 00:58:52 -0000	1.21
@@ -5,17 +5,17 @@
 ; The current version is used with Inno Setup 2.0.19.
 
 [Setup]
-AppName=expat
+AppName=Expat
 AppId=expat
-AppVersion=2.0.0
-AppVerName=expat 2.0.0
+AppVersion=2.0.1
+AppVerName=expat 2.0.1
 AppCopyright=Copyright ? 1998-2006 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers
-DefaultDirName={sd}\Expat-2.0.0
+DefaultDirName={pf}\Expat 2.0.1
 AppPublisher=The Expat Developers
 AppPublisherURL=http://www.libexpat.org/
 AppSupportURL=http://www.libexpat.org/
 AppUpdatesURL=http://www.libexpat.org/
-UninstallDisplayName=Expat XML Parser (version 2.0.0)
+UninstallDisplayName=Expat XML Parser 2.0.1
 UninstallFilesDir={app}\Uninstall
 
 Compression=bzip/9