Upgrade to libxml 2.9.2 and libxslt 1.1.28

third_party/libxml/src/xmlcatalog.c

 /*
  * xmlcatalog.c : a small utility program to handle XML catalogs
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  */
 
 #include "libxml.h"
 
@@ skipping 29 matching lines @@
 static int no_super_update = 0;
 static int verbose = 0;
 static char *filename = NULL;
 
 
 #ifndef XML_SGML_DEFAULT_CATALOG
 #define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
 #endif
 
 /************************************************************************
- *                                                                      *
- *                      Shell Interface                                 *
- *                                                                      *
+ *                                                                      *
+ *                      Shell Interface                                 *
+ *                                                                      *
  ************************************************************************/
 /**
  * xmlShellReadline:
  * @prompt:  the prompt value
  *
  * Read a string
- * 
+ *
  * Returns a pointer to it or NULL on EOF the caller is expected to
  *     free the returned string.
  */
 static char *
 xmlShellReadline(const char *prompt) {
 #ifdef HAVE_LIBREADLINE
     char *line_read;
 
     /* Get a line from the user. */
     line_read = readline (prompt);
@@ skipping 80 matching lines @@
             if (*cur == '\'') {
                 cur++;
                 argv[i] = cur;
                 while ((*cur != 0) && (*cur != '\'')) cur++;
                 if (*cur == '\'') {
                     *cur = 0;
                     nbargs++;
                     i++;
                     cur++;
                 }
-            } else if (*cur == '"') { 
+            } else if (*cur == '"') {
                 cur++;
                 argv[i] = cur;
                 while ((*cur != 0) && (*cur != '"')) cur++;
                 if (*cur == '"') {
                     *cur = 0;
                     nbargs++;
                     i++;
                     cur++;
                 }
             } else {
                 argv[i] = cur;
                 while ((*cur != 0) && (*cur != ' ') && (*cur != '\t'))
                     cur++;
                 *cur = 0;
                 nbargs++;
                 i++;
                 cur++;
             }
         }
 
         /*
          * start interpreting the command
          */
-        if (!strcmp(command, "exit"))
+        if (!strcmp(command, "exit") ||
+            !strcmp(command, "quit") ||
+            !strcmp(command, "bye")) {
+            free(cmdline);
             break;
-        if (!strcmp(command, "quit"))
-            break;
-        if (!strcmp(command, "bye"))
-            break;
+        }
+
         if (!strcmp(command, "public")) {
             if (nbargs != 1) {
                 printf("public requires 1 arguments\n");
             } else {
                 ans = xmlCatalogResolvePublic((const xmlChar *) argv[0]);
                 if (ans == NULL) {
                     printf("No entry for PUBLIC %s\n", argv[0]);
                 } else {
                     printf("%s\n", (char *) ans);
                     xmlFree(ans);
@@ skipping 89 matching lines @@
             printf("Commands available:\n");
             printf("\tpublic PublicID: make a PUBLIC identifier lookup\n");
             printf("\tsystem SystemID: make a SYSTEM identifier lookup\n");
             printf("\tresolve PublicID SystemID: do a full resolver lookup\n");
             printf("\tadd 'type' 'orig' 'replace' : add an entry\n");
             printf("\tdel 'values' : remove values\n");
             printf("\tdump: print the current catalog state\n");
             printf("\tdebug: increase the verbosity level\n");
             printf("\tquiet: decrease the verbosity level\n");
             printf("\texit:  quit the shell\n");
-        } 
+        }
         free(cmdline); /* not xmlFree here ! */
     }
 }
 
 /************************************************************************
- *                                                                      *
- *                      Main                                            *
- *                                                                      *
+ *                                                                      *
+ *                      Main                                            *
+ *                                                                      *
  ************************************************************************/
 static void usage(const char *name) {
     /* split into 2 printf's to avoid overly long string (gcc warning) */
     printf("\
 Usage : %s [options] catalogfile entities...\n\
 \tParse the catalog file and query it for the entities\n\
 \t--sgml : handle SGML Super catalogs for --add and --del\n\
 \t--shell : run a shell allowing interactive queries\n\
 \t--create : create a new catalog\n\
 \t--add 'type' 'orig' 'replace' : add an XML entry\n\
@@ skipping 182 matching lines @@
                             remove(XML_SGML_DEFAULT_CATALOG);
                         } else {
                             out = fopen(XML_SGML_DEFAULT_CATALOG, "w");
                             if (out == NULL) {
                                 fprintf(stderr,
                                         "could not open %s for saving\n",
                                         XML_SGML_DEFAULT_CATALOG);
                                 exit_value = 2;
                                 noout = 0;
                             } else {
-                                
+
                                 xmlACatalogDump(super, out);
                                 fclose(out);
                             }
                         }
                     }
                 } else {
                     xmlACatalogDump(catal, stdout);
                 }
                 i += 2;
             } else {
@@ skipping 16 matching lines @@
                     ret = xmlCatalogRemove(BAD_CAST argv[i + 1]);
                     if (ret < 0) {
                         fprintf(stderr, "Failed to remove entry %s\n",
                                 argv[i + 1]);
                         exit_value = 1;
                     }
                     i += 1;
                 }
             }
         }
-        
+
     } else if (shell) {
         usershell();
     } else {
         for (i++; i < argc; i++) {
             xmlURIPtr uri;
             xmlChar *ans;
-            
+
             uri = xmlParseURI(argv[i]);
             if (uri == NULL) {
                 ans = xmlCatalogResolvePublic((const xmlChar *) argv[i]);
                 if (ans == NULL) {
                     printf("No entry for PUBLIC %s\n", argv[i]);
                     exit_value = 4;
                 } else {
                     printf("%s\n", (char *) ans);
                     xmlFree(ans);
                 }
@@ skipping 40 matching lines @@
     xmlCleanupParser();
     xmlMemoryDump();
     return(exit_value);
 }
 #else
 int main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) {
     fprintf(stderr, "libxml was not compiled with catalog and output support\n");
     return(1);
 }
 #endif