Commit 30663512 authored by Daniel Veillard's avatar Daniel Veillard

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
parent 5ac88237
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
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment