From 3066351275d72ff2ae8db57213084bb1719f5a46 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Thu, 21 Feb 2008 22:31:55 +0000
Subject: [PATCH] made one of the changes suggested by Brian Krahmer allow to
 pass '--' on

* debugXML.c: made one of the changes suggested by Brian Krahmer
* testRegexp.c: allow to pass '--' on the command line to allow
  regexps starting with the character '-'
Daniel

svn path=/trunk/; revision=3697
---
 ChangeLog    |  6 ++++++
 debugXML.c   |  1 +
 testRegexp.c | 19 ++++++++++++++++---
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 41d21c97..ab2ad169 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 21 22:46:08 CET 2008 Daniel Veillard <daniel@veillard.com>
+
+	* debugXML.c: made one of the changes suggested by Brian Krahmer
+	* testRegexp.c: allow to pass '--' on the command line to allow
+	  regexps starting with the character '-'
+
 Tue Feb 19 08:49:32 CET 2008 Daniel Veillard <daniel@veillard.com>
 
 	* python/Makefile.am python/tests/Makefile.am: applied cleanup
diff --git a/debugXML.c b/debugXML.c
index 3985ad38..f66f5964 100644
--- a/debugXML.c
+++ b/debugXML.c
@@ -3244,6 +3244,7 @@ xmlShell(xmlDocPtr doc, char *filename, xmlShellReadlineFunc input,
                             "Unknown command %s\n", command);
         }
         free(cmdline);          /* not xmlFree here ! */
+	cmdline = NULL;
     }
 #ifdef LIBXML_XPATH_ENABLED
     xmlXPathFreeContext(ctxt->pctxt);
diff --git a/testRegexp.c b/testRegexp.c
index d5228b3b..626536e5 100644
--- a/testRegexp.c
+++ b/testRegexp.c
@@ -290,6 +290,9 @@ int main(int argc, char **argv) {
 
 	if (argv[i][0] != '-')
 	    continue;
+	if (!strcmp(argv[i], "--"))
+	    break;
+
 	if ((!strcmp(argv[i], "-debug")) || (!strcmp(argv[i], "--debug"))) {
 	    debug++;
 	} else if ((!strcmp(argv[i], "-repeat")) ||
@@ -322,10 +325,15 @@ int main(int argc, char **argv) {
 #endif
 	    testRegexpFile(filename);
     } else {
+        int  data = 0;
 #ifdef LIBXML_EXPR_ENABLED
+
         if (use_exp) {
 	    for (i = 1; i < argc ; i++) {
-		if ((argv[i][0] != '-') || (strcmp(argv[i], "-") == 0)) {
+	        if (strcmp(argv[i], "--") == 0)
+		    data = 1;
+		else if ((argv[i][0] != '-') || (strcmp(argv[i], "-") == 0) ||
+		    (data == 1)) {
 		    if (pattern == NULL) {
 			pattern = argv[i];
 			printf("Testing expr %s:\n", pattern);
@@ -342,13 +350,18 @@ int main(int argc, char **argv) {
 		    }
 		}
 	    }
-	    if (expr != NULL)
+	    if (expr != NULL) {
 		xmlExpFree(ctxt, expr);
+		expr = NULL;
+	    }
 	} else
 #endif
         {
 	    for (i = 1; i < argc ; i++) {
-		if ((argv[i][0] != '-') || (strcmp(argv[i], "-") == 0)) {
+	        if (strcmp(argv[i], "--") == 0)
+		    data = 1;
+		else if ((argv[i][0] != '-') || (strcmp(argv[i], "-") == 0) ||
+		         (data == 1)) {
 		    if (pattern == NULL) {
 			pattern = argv[i];
 			printf("Testing %s:\n", pattern);