rpms/xmlstarlet
7
0
Fork 0
Code Issues Pull Requests Releases Activity
4150c3da21
xmlstarlet/xmlstarlet-1.0.3-cmdname.patch
Paul W. Frields a03a18f667 Update to 1.0.3, fixing patches and validation testing
2010-12-18 12:01:59 -05:00

194 lines
9.2 KiB
Diff
Raw Blame History

diff -uNr xmlstarlet-1.0.3-original/examples/xmlstarlet xmlstarlet-1.0.3/examples/xmlstarlet
--- xmlstarlet-1.0.3-original/examples/xmlstarlet 2010-11-10 18:42:26.000000000 -0500
+++ xmlstarlet-1.0.3/examples/xmlstarlet 2010-12-17 12:09:15.644655135 -0500
@@ -1,4 +1,4 @@
#!/bin/sh
-../src/xml ${@+"$@"}
+../src/xmlstarlet ${@+"$@"}
diff -uNr xmlstarlet-1.0.3-original/src/Makefile.am xmlstarlet-1.0.3/src/Makefile.am
--- xmlstarlet-1.0.3-original/src/Makefile.am 2010-11-16 20:43:53.000000000 -0500
+++ xmlstarlet-1.0.3/src/Makefile.am 2010-12-17 12:08:55.760085370 -0500
@@ -1,3 +1,3 @@
-bin_PROGRAMS = xml
+bin_PROGRAMS = xmlstarlet
-xml_SOURCES = xml.c xml_edit.c xml_ls.c xml_escape.c xml_pyx.c xml_depyx.c xml_select.c xml_trans.c xml_validate.c xml_format.c xml_elem.c xml_C14N.c trans.c binsert.c stack.c binsert.h stack.h trans.h escape.h strdup.h strdup.c
+xmlstarlet_SOURCES = xml.c xml_edit.c xml_ls.c xml_escape.c xml_pyx.c xml_depyx.c xml_select.c xml_trans.c xml_validate.c xml_format.c xml_elem.c xml_C14N.c trans.c binsert.c stack.c binsert.h stack.h trans.h escape.h strdup.h strdup.c
diff -uNr xmlstarlet-1.0.3-original/src/xml.c xmlstarlet-1.0.3/src/xml.c
--- xmlstarlet-1.0.3-original/src/xml.c 2010-11-10 18:42:26.000000000 -0500
+++ xmlstarlet-1.0.3/src/xml.c 2010-12-17 12:08:55.760085370 -0500
@@ -49,7 +49,7 @@
*/
static const char usage_str_1[] =
"XMLStarlet Toolkit: Command line utilities for XML\n"
-"Usage: xml [<options>] <command> [<cmd-options>]\n";
+"Usage: xmlstarlet [<options>] <command> [<cmd-options>]\n";
static const char usage_str_2[] =
"where <command> is one of:\n"
@@ -74,7 +74,7 @@
" --help - show help\n"
"Wherever file name mentioned in command help it is assumed\n"
"that URL can be used instead as well.\n\n"
-"Type: xml <command> --help <ENTER> for command help\n\n";
+"Type: xmlstarlet <command> --help <ENTER> for command help\n\n";
diff -uNr xmlstarlet-1.0.3-original/src/xml_C14N.c xmlstarlet-1.0.3/src/xml_C14N.c
--- xmlstarlet-1.0.3-original/src/xml_C14N.c 2010-11-14 10:47:45.000000000 -0500
+++ xmlstarlet-1.0.3/src/xml_C14N.c 2010-12-17 12:08:55.761085249 -0500
@@ -34,7 +34,7 @@
static const char c14n_usage_str_1[] =
"XMLStarlet Toolkit: XML canonicalization\n"
-"Usage: xml c14n <mode> <xml-file> [<xpath-file>] [<inclusive-ns-list>]\n"
+"Usage: xmlstarlet c14n <mode> <xml-file> [<xpath-file>] [<inclusive-ns-list>]\n"
"where\n"
" <xml-file> - input XML document file name (stdin is used if '-')\n"
" <xpath-file> - XML file containing XPath expression for\n"
diff -uNr xmlstarlet-1.0.3-original/src/xml_depyx.c xmlstarlet-1.0.3/src/xml_depyx.c
--- xmlstarlet-1.0.3-original/src/xml_depyx.c 2010-11-14 10:47:45.000000000 -0500
+++ xmlstarlet-1.0.3/src/xml_depyx.c 2010-12-17 12:08:55.762085127 -0500
@@ -38,7 +38,7 @@
static const char depyx_usage_str[] =
"XMLStarlet Toolkit: Convert PYX into XML\n"
-"Usage: xml p2x [<pyx-file>]\n"
+"Usage: xmlstarlet p2x [<pyx-file>]\n"
"where\n"
" <pyx-file> - input PYX document file name (stdin is used if missing)\n\n"
"The PYX format is a line-oriented representation of\n"
diff -uNr xmlstarlet-1.0.3-original/src/xml_edit.c xmlstarlet-1.0.3/src/xml_edit.c
--- xmlstarlet-1.0.3-original/src/xml_edit.c 2010-11-14 11:18:43.000000000 -0500
+++ xmlstarlet-1.0.3/src/xml_edit.c 2010-12-17 12:08:55.762085127 -0500
@@ -109,7 +109,7 @@
*/
static const char edit_usage_str_1[] =
"XMLStarlet Toolkit: Edit XML document(s)\n"
-"Usage: xml ed <global-options> {<action>} [ <xml-file-or-uri> ... ]\n"
+"Usage: xmlstarlet ed <global-options> {<action>} [ <xml-file-or-uri> ... ]\n"
"where\n"
" <global-options> - global options for editing\n"
" <xml-file-or-uri> - input XML document file name/uri (stdin otherwise)\n\n";
diff -uNr xmlstarlet-1.0.3-original/src/xml_elem.c xmlstarlet-1.0.3/src/xml_elem.c
--- xmlstarlet-1.0.3-original/src/xml_elem.c 2010-11-10 18:42:26.000000000 -0500
+++ xmlstarlet-1.0.3/src/xml_elem.c 2010-12-17 12:08:55.763085005 -0500
@@ -67,7 +67,7 @@
static const char elem_usage_str[] =
"XMLStarlet Toolkit: Display element structure of XML document\n"
-"Usage: xml el [<options>] <xml-file>\n"
+"Usage: xmlstarlet el [<options>] <xml-file>\n"
"where\n"
" <xml-file> - input XML document file name (stdin is used if missing)\n"
" <options> is one of:\n"
diff -uNr xmlstarlet-1.0.3-original/src/xml_escape.c xmlstarlet-1.0.3/src/xml_escape.c
--- xmlstarlet-1.0.3-original/src/xml_escape.c 2010-11-10 18:42:26.000000000 -0500
+++ xmlstarlet-1.0.3/src/xml_escape.c 2010-12-17 12:08:55.763085005 -0500
@@ -52,7 +52,7 @@
static const char escape_usage_str[] =
"XMLStarlet Toolkit: %s special XML characters\n"
-"Usage: xml %s [<options>] [<string>]\n"
+"Usage: xmlstarlet %s [<options>] [<string>]\n"
"where <options> are\n"
" --help - print usage\n"
" (TODO: more to be added in future)\n"
diff -uNr xmlstarlet-1.0.3-original/src/xml_format.c xmlstarlet-1.0.3/src/xml_format.c
--- xmlstarlet-1.0.3-original/src/xml_format.c 2010-11-14 10:47:45.000000000 -0500
+++ xmlstarlet-1.0.3/src/xml_format.c 2010-12-17 12:08:55.764084881 -0500
@@ -73,7 +73,7 @@
*/
static const char format_usage_str_1[] =
"XMLStarlet Toolkit: Format XML document\n"
-"Usage: xml fo [<options>] <xml-file>\n"
+"Usage: xmlstarlet fo [<options>] <xml-file>\n"
"where <options> are\n"
" -n or --noindent - do not indent\n"
" -t or --indent-tab - indent output with tabulation\n"
diff -uNr xmlstarlet-1.0.3-original/src/xml_ls.c xmlstarlet-1.0.3/src/xml_ls.c
--- xmlstarlet-1.0.3-original/src/xml_ls.c 2010-11-14 10:47:45.000000000 -0500
+++ xmlstarlet-1.0.3/src/xml_ls.c 2010-12-17 12:08:55.764084881 -0500
@@ -44,7 +44,7 @@
static const char ls_usage_str[] =
"XMLStarlet Toolkit: List directory as XML\n"
-"Usage: xml ls\n"
+"Usage: xmlstarlet ls\n"
"Lists current directory in XML format.\n"
"Time is shown per ISO 8601 spec.\n"
"\n";
diff -uNr xmlstarlet-1.0.3-original/src/xml_pyx.c xmlstarlet-1.0.3/src/xml_pyx.c
--- xmlstarlet-1.0.3-original/src/xml_pyx.c 2010-11-14 10:47:45.000000000 -0500
+++ xmlstarlet-1.0.3/src/xml_pyx.c 2010-12-17 12:08:55.765084757 -0500
@@ -23,7 +23,7 @@
*/
static const char pyx_usage_str_1[] =
"XMLStarlet Toolkit: Convert XML into PYX format (based on ESIS - ISO 8879)\n"
-"Usage: xml pyx {<xml-file>}\n"
+"Usage: xmlstarlet pyx {<xml-file>}\n"
"where\n"
" <xml-file> - input XML document file name (stdin is used if missing)\n\n";
diff -uNr xmlstarlet-1.0.3-original/src/xml_select.c xmlstarlet-1.0.3/src/xml_select.c
--- xmlstarlet-1.0.3-original/src/xml_select.c 2010-11-13 11:56:13.000000000 -0500
+++ xmlstarlet-1.0.3/src/xml_select.c 2010-12-17 12:08:55.765084757 -0500
@@ -65,7 +65,7 @@
*/
static const char select_usage_str_1[] =
"XMLStarlet Toolkit: Select from XML document(s)\n"
-"Usage: xml sel <global-options> {<template>} [ <xml-file> ... ]\n"
+"Usage: xmlstarlet sel <global-options> {<template>} [ <xml-file> ... ]\n"
"where\n"
" <global-options> - global options for selecting\n"
" <xml-file> - input XML document file name/uri (stdin is used if missing)\n"
@@ -119,8 +119,8 @@
"in a single template. The effect of applying command line templates\n"
"can be illustrated with the following XSLT analogue\n\n"
-"xml sel -t -c \"xpath0\" -m \"xpath1\" -m \"xpath2\" -v \"xpath3\" \\\n"
-" -t -m \"xpath4\" -c \"xpath5\"\n\n"
+"xmlstarlet sel -t -c \"xpath0\" -m \"xpath1\" -m \"xpath2\" -v \"xpath3\" \\\n"
+" -t -m \"xpath4\" -c \"xpath5\"\n\n"
"is equivalent to applying the following XSLT\n\n";
diff -uNr xmlstarlet-1.0.3-original/src/xml_trans.c xmlstarlet-1.0.3/src/xml_trans.c
--- xmlstarlet-1.0.3-original/src/xml_trans.c 2010-11-14 10:47:45.000000000 -0500
+++ xmlstarlet-1.0.3/src/xml_trans.c 2010-12-17 12:08:55.767084511 -0500
@@ -47,7 +47,7 @@
*/
static const char trans_usage_str_1[] =
"XMLStarlet Toolkit: Transform XML document(s) using XSLT\n"
-"Usage: xml tr [<options>] <xsl-file> {-p|-s <name>=<value>} [<xml-file>...]\n"
+"Usage: xmlstarlet tr [<options>] <xsl-file> {-p|-s <name>=<value>} [<xml-file>...]\n"
"where\n"
" <xsl-file> - main XSLT stylesheet for transformation\n"
" <xml-file> - input XML document file/URL (stdin is used if missing)\n";
diff -uNr xmlstarlet-1.0.3-original/src/xml_validate.c xmlstarlet-1.0.3/src/xml_validate.c
--- xmlstarlet-1.0.3-original/src/xml_validate.c 2010-11-14 10:47:45.000000000 -0500
+++ xmlstarlet-1.0.3/src/xml_validate.c 2010-12-17 12:08:55.768084391 -0500
@@ -78,7 +78,7 @@
*/
static const char validate_usage_str_1[] =
"XMLStarlet Toolkit: Validate XML document(s)\n"
-"Usage: xml val <options> [ <xml-file-or-uri> ... ]\n"
+"Usage: xmlstarlet val <options> [ <xml-file-or-uri> ... ]\n"
"where <options>\n"
" -w or --well-formed - validate well-formedness only (default)\n"
" -d or --dtd <dtd-file> - validate against DTD\n";
diff -uNr xmlstarlet-1.0.3-original/xmlstarlet.spec.in xmlstarlet-1.0.3/xmlstarlet.spec.in
--- xmlstarlet-1.0.3-original/xmlstarlet.spec.in 2010-11-10 18:42:26.000000000 -0500
+++ xmlstarlet-1.0.3/xmlstarlet.spec.in 2010-12-17 12:08:55.768084391 -0500
@@ -43,6 +43,6 @@
%doc AUTHORS ChangeLog NEWS README Copyright TODO doc/xmlstarlet.txt doc/xmlstarlet.pdf
%doc %{_mandir}/man1/xmlstarlet.1*
-%{prefix}/bin/xml
+%{prefix}/bin/xmlstarlet
%changelog
Reference in New Issue View Git Blame Copy Permalink