[Bug libc/538] New: Improvement to getaddrinfo gai_strerror.c to make it usable in gnulib

["simon@josefsson.org" <sourceware-bugzilla@sources.redhat.com>]

Gnulib contain a getaddrinfo.c re-implementation.  While the core implementation
is not the same as the one in libc (the glibc one is not GPL), I'd like for
gai_strerror.c to be shared.  What do you think of the following patch?

(Btw, the anonymous CVS pserver seem down at the moment.)

Thanks.

2004-11-10  Simon Josefsson  <jas@extundo.com>

	* sysdeps/posix/gai_strerror.c [_LIBC]: Make #include <libintl.h>
	conditional on _LIBC.
	[!_LIBC]: Include getaddrinfo.h, gettext.h and define _ and N_,
	for when the file is used in gnulib.
	[__USE_GNU]: Only use EAI_INPROGRESS, EAI_CANCELED,
	EAI_NOTCANCELED, EAI_ALLDONE, EAI_INTR, and EAI_IDN_ENCODE when
	__USE_GNU, to align with netdb.h.
	[_LIBC]: Make libc_hidden_def conditional on _LIBC.

--- gai_strerror.c.orig	2004-11-10 19:36:32.000000000 +0100
+++ gai_strerror.c	2004-11-10 19:30:29.000000000 +0100
@@ -19,7 +19,15 @@
 
 #include <stdio.h>
 #include <netdb.h>
-#include <libintl.h>
+
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "getaddrinfo.h"
+# include "gettext.h"
+# define _(String) gettext (String)
+# define N_(String) String
+#endif
 
 static struct
   {
@@ -39,12 +47,14 @@
     { EAI_SERVICE, N_("Servname not supported for ai_socktype") },
     { EAI_SOCKTYPE, N_("ai_socktype not supported") },
     { EAI_SYSTEM, N_("System error") },
+#ifdef __USE_GNU
     { EAI_INPROGRESS, N_("Processing request in progress") },
     { EAI_CANCELED, N_("Request canceled") },
     { EAI_NOTCANCELED, N_("Request not canceled") },
     { EAI_ALLDONE, N_("All requests done") },
     { EAI_INTR, N_("Interrupted by a signal") },
     { EAI_IDN_ENCODE, N_("Parameter string not correctly encoded") }
+#endif
   };
 
 const char *
@@ -57,4 +67,6 @@
 
   return _("Unknown error");
 }
+#ifdef _LIBC
 libc_hidden_def (gai_strerror)
+#endif

-- 
           Summary: Improvement to getaddrinfo gai_strerror.c to make it
                    usable in gnulib
           Product: glibc
           Version: unspecified
            Status: NEW
          Severity: enhancement
          Priority: P2
         Component: libc
        AssignedTo: gotom at debian dot or dot jp
        ReportedBy: simon at josefsson dot org
                CC: glibc-bugs at sources dot redhat dot com


http://sources.redhat.com/bugzilla/show_bug.cgi?id=538

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.