Jumbo patch, resync of W3C/Gnome CVS trees:

- uri.c tree.c SAX.c parser.c entities.c debugXML.c: finished
  the cleanup of the computation of URI references when seeking
  external entities. The URI reference string and the resulting
  URI are both stored now.
- parser.c HTMLparser.c valid.c nanoftp.c nanohttp.c xpath.c:
  large s(n)printf checks and cleanup from Denis Barbier
  <barbier@imacs.polytechnique.fr>
- xmlversion.h.in tree.h: couple of SGML declarations for a
  possible docbook module.
- result/VC/ : a couple of test output changed due to the change
  of the entities URI
Daniel

xpath.c

@@ -2417,9 +2417,16 @@ xmlXPathNameFunction(xmlXPathParserContextPtr ctxt, int nargs) {
 	    
 	else {
 	    char name[2000];
+#ifdef HAVE_SNPRINTF
+	    snprintf(name, sizeof(name), "%s:%s", 
+	            (char *) cur->nodesetval->nodeTab[i]->ns->prefix,
+	            (char *) cur->nodesetval->nodeTab[i]->name);
+#else
 	    sprintf(name, "%s:%s", 
 	            (char *) cur->nodesetval->nodeTab[i]->ns->prefix,
 	            (char *) cur->nodesetval->nodeTab[i]->name);
+#endif
+            name[sizeof(name) - 1] = 0;
 	    valuePush(ctxt, xmlXPathNewCString(name));
         }
     }