Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --git a/configure.ac b/configure.ac
index 93812df..f37b77c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,11 @@ YAZ_INIT([static icu],[4.2.40])
 if test -z "$YAZLIB"; then
        AC_MSG_ERROR([YAZ development libraries missing])
 fi
+case $YAZINC in
+  *YAZ_HAVE_XSLT=1*) ;;
+  *) AC_MSG_ERROR([YAZ not compiled with Libxslt support]) ;;
+esac
+
 YAZ_DOC
 
 AC_SEARCH_LIBS([log],[m])
@@ -52,22 +57,22 @@ else
 fi
 AC_DEFINE_UNQUOTED([PAZPAR2_VERSION_SHA1], ["$sha"], [Git SHA1])
 
-AC_CONFIG_FILES([
+AC_OUTPUT([
        Doxyfile
        Makefile
        src/Makefile
        test/Makefile
        js/Makefile
        doc/Makefile
-       doc/local.ent
+       doc/local0.ent
        doc/common/Makefile
        doc/common/print.dsl
        win/version.nsi
+],[
+       diff doc/local.ent doc/local0.ent >/dev/null 2>/dev/null \
+       || cp doc/local0.ent doc/local.ent
 ])
 
-AC_OUTPUT
-
-
 echo \
 "------------------------------------------------------------------------
 

diff --git a/doc/.gitignore b/doc/.gitignore
index def16a6..3a6297b 100644 (file)
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -11,6 +11,7 @@ manpage.links
 manpage.refs
 *.[0-8]
 local.ent
+local0.ent
 htmlhelp.hhp
 toc.hhc
 manref.xml

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7c8f0f5..f713e72 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,13 +3,13 @@ SUBDIRS = common
 
 SUFFIXES=.1 .5 .7 .8 .pdf .esp .xml 
 
-XMLFILES = book.xml manref.xml gpl-2.0.xml
+XMLFILES = book.xml manref.xml gpl-2.0.xml local.ent
 
 MAINXML = $(srcdir)/book.xml
 
 XMLMAN = pazpar2.xml pazpar2_protocol.xml pazpar2_conf.xml
 
-SUPPORTFILES = entities.ent local.ent.in
+SUPPORTFILES = entities.ent
 
 MANFILES = pazpar2.8 pazpar2_protocol.7 pazpar2_conf.5
 
@@ -20,12 +20,14 @@ PNGFILES =
 doc_DATA = $(HTMLFILES) $(PNGFILES)
 man_MANS = $(MANFILES)
 
-EXTRA_DIST = $(XMLFILES) $(XMLMAN) $(doc_DATA) $(man_MANS)
+EXTRA_DIST = $(XMLFILES) $(XMLMAN) $(doc_DATA) $(man_MANS) $(SUPPORTFILES)
 
 $(HTMLFILES): $(XMLFILES) $(PNGFILES)
        rm -f *.html
        $(HTML_COMPILE) $(MAINXML)
 
+$(MANFILES): local.ent
+
 .xml.1:
        $(MAN_COMPILE) $<
 

diff --git a/doc/local.ent.in b/doc/local.ent.in
deleted file mode 100644 (file)
index 783c4a7..0000000
--- a/doc/local.ent.in
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- Modified by configure. Do not edit. Use entities.ent instead -->
-<!ENTITY version "@VERSION@">
-<!ENTITY prefix "@prefix@">

diff --git a/doc/local0.ent.in b/doc/local0.ent.in
new file mode 100644 (file)
index 0000000..7e7401c
--- /dev/null
+++ b/doc/local0.ent.in
@@ -0,0 +1,2 @@
+<!-- Modified by configure. Do not edit. Use entities.ent instead -->
+<!ENTITY version "@VERSION@">

diff --git a/src/getaddrinfo.c b/src/getaddrinfo.c
index 13f7c24..a5f6a3a 100644 (file)
--- a/src/getaddrinfo.c
+++ b/src/getaddrinfo.c
@@ -54,11 +54,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /* Only use a threaded resolver on Unix that offers getaddrinfo.
    gethostbyname is NOT reentrant.
  */
-#if HAVE_GETADDRINFO
 #ifndef WIN32
 #define USE_THREADED_RESOLVER 1
 #endif
-#endif
 
 struct work {
     char *hostport;  /* hostport to be resolved in separate thread */
@@ -71,69 +69,56 @@ static int log_level = YLOG_LOG;
 
 void perform_getaddrinfo(struct work *w)
 {
-    int res = 0;
-    char *port;
-#if HAVE_GETADDRINFO
-    struct addrinfo *addrinfo, hints;
-#else
-    struct hostent *hp;
-#endif
-    char *hostport = xstrdup(w->hostport);
-    if ((port = strchr(hostport, ':')))
-        *(port++) = '\0';
-    else
-    {
-        port = "210";
-    }
+    struct addrinfo hints, *res;
+    char host[512], *cp;
+    const char *port = 0;
+    int error;
 
-#if HAVE_GETADDRINFO
     hints.ai_flags = 0;
-    hints.ai_family = PF_INET;
+    hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
-    hints.ai_protocol = IPPROTO_TCP;
-    hints.ai_addrlen = 0;
-    hints.ai_addr = 0;
-    hints.ai_canonname = 0;
-    hints.ai_next = 0;
-    // This is not robust code. It assumes that getaddrinfo always
-    // returns AF_INET address.
-    if ((res = getaddrinfo(hostport, port, &hints, &addrinfo)))
+    hints.ai_protocol = 0;
+    hints.ai_addrlen        = 0;
+    hints.ai_addr           = NULL;
+    hints.ai_canonname      = NULL;
+    hints.ai_next           = NULL;
+
+    strncpy(host, w->hostport, sizeof(host)-1);
+    host[sizeof(host)-1] = 0;
+    if ((cp = strrchr(host, ':')))
     {
-        yaz_log(YLOG_WARN, "Failed to resolve %s %s",
-                w->hostport, gai_strerror(res));
+        *cp = '\0';
+        port = cp + 1;
     }
-    else
-    {
-        char ipport[128];
-        unsigned char addrbuf[4];
-        assert(addrinfo->ai_family == PF_INET);
-        memcpy(addrbuf,
-               &((struct sockaddr_in*)addrinfo->ai_addr)->sin_addr.s_addr, 4);
-        sprintf(ipport, "%u.%u.%u.%u:%s",
-                addrbuf[0], addrbuf[1], addrbuf[2], addrbuf[3], port);
-        freeaddrinfo(addrinfo);
-        w->ipport = xstrdup(ipport);
-        yaz_log(log_level, "Resolved %s -> %s", hostport, ipport);
-    }
-#else
-    hp = gethostbyname(hostport);
-    if (!hp)
+    error = getaddrinfo(host, port ? port : "210", &hints, &res);
+    if (error)
     {
-        yaz_log(YLOG_WARN|YLOG_ERRNO, "Failed to resolve %s", hostport);
+        yaz_log(YLOG_WARN, "Failed to resolve %s: %s",
+                w->hostport, gai_strerror(error));
     }
     else
     {
-        char ipport[128];
-        unsigned char addrbuf[4];
-
-        memcpy(addrbuf, *hp->h_addr_list, 4 * sizeof(unsigned char));
-        sprintf(ipport, "%u.%u.%u.%u:%s",
-                addrbuf[0], addrbuf[1], addrbuf[2], addrbuf[3], port);
-        w->ipport = xstrdup(ipport);
-        yaz_log(log_level, "Resolved %s -> %s", hostport, ipport);
+        if (getnameinfo((struct sockaddr *) res->ai_addr, res->ai_addrlen,
+                        host, sizeof(host)-1,
+                        0, 0,
+                        NI_NUMERICHOST) == 0)
+        {
+            w->ipport = xmalloc(strlen(host) + (port ? strlen(port) : 0) + 2);
+            strcpy(w->ipport, host);
+            if (port)
+            {
+                strcat(w->ipport, ":");
+                strcat(w->ipport, port);
+            }
+            yaz_log(log_level, "Resolved %s -> %s", w->hostport, w->ipport);
+        }
+        else
+        {
+            yaz_log(YLOG_LOG|YLOG_ERRNO, "getnameinfo failed for %s",
+                    w->hostport);
+        }
+        freeaddrinfo(res);
     }
-#endif
-    xfree(hostport);
 }
 
 static void work_handler(void *vp)