remove libintl stub and libintl.h header

As __UCLIBC_HAS_GETTEXT_AWARENESS__ is never defined, this is
mostly dead code. It is planned to integrate libiconv-tiny
and gettext-tiny into uClibc-ng after the next release, so
that more software packages can be used without modification.

Remove any _/_N macro usage.

Makefile.in

@@ -32,7 +32,6 @@ endif # ifeq ($(HAVE_DOT_CONFIG),y)
 include $(top_srcdir)extra/locale/Makefile.in
 include $(top_srcdir)ldso/Makefile.in
 include $(top_srcdir)libcrypt/Makefile.in
-include $(top_srcdir)libintl/Makefile.in
 include $(top_srcdir)libm/Makefile.in
 include $(top_srcdir)libutil/Makefile.in
 include $(top_srcdir)libpthread/Makefile.in
@@ -273,7 +272,6 @@ HEADERS_RM-$(UCLIBC_HAS_FLOATS)              += complex.h fpu_control.h ieee754.
 	bits/math*.h
 HEADERS_RM-$(findstring y,$(UCLIBC_HAS_FTW)$(UCLIBC_HAS_NFTW))  += ftw.h
 HEADERS_RM-$(UCLIBC_HAS_FTS)                 += fts.h
-HEADERS_RM-$(UCLIBC_HAS_GETTEXT_AWARENESS)   += libintl.h
 HEADERS_RM-$(UCLIBC_HAS_GLIBC_CUSTOM_PRINTF) += printf.h
 HEADERS_RM-$(UCLIBC_HAS_GLOB)                += glob.h
 HEADERS_RM-$(UCLIBC_HAS_GNU_ERROR)           += error.h
@@ -377,9 +375,6 @@ endif
 ifeq ($(UCLIBC_HAS_LIBUTIL),y)
 EMPTY_LIB_NAMES += util
 endif
-ifeq ($(UCLIBC_HAS_GETTEXT_AWARENESS),y)
-EMPTY_LIB_NAMES += intl
-endif
 EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a)
 
 $(EMPTY_LIBS):

Makerules

@@ -39,7 +39,6 @@ $(eval $(call add_IS_IN_lib,rtld,$(ldso-y)))
 $(eval $(call add_IS_IN_lib,libc,$(libc-y) $(libc-static-y) $(libc-y:.o=.os) $(libc-shared-y) $(libc-nonshared-y)))
 $(eval $(call add_IS_IN_lib,libcrypt,$(libcrypt-a-y) $(libcrypt-so-y)))
 $(eval $(call add_IS_IN_lib,libdl,$(libdl-a-y) $(libdl-so-y)))
-$(eval $(call add_IS_IN_lib,libintl,$(libintl-a-y) $(libintl-so-y)))
 $(eval $(call add_IS_IN_lib,libm,$(libm-a-y) $(libm-so-y)))
 $(eval $(call add_IS_IN_lib,libpthread/$(PTNAME),$(libpthread-a-y) $(libpthread-so-y) $(libpthread-nonshared-y)))
 $(eval $(call add_IS_IN_lib,libpthread/$(PTNAME)_db,$(libthread_db-a-y) $(libthread_db-so-y)))
@@ -49,16 +48,12 @@ $(eval $(call add_IS_IN_lib,libubacktrace,$(libubacktrace-a-y) $(libubacktrace-s
 $(eval $(call add_IS_IN_lib,libuargp,$(libuargp-a-y) $(libuargp-so-y)))
 
 shared_objs = $(libc-y:.o=.os) $(libc-shared-y) $(libc-nonshared-y) \
-	$(libcrypt-so-y) $(libdl-so-y) \
-	$(libintl-so-y) $(libm-so-y) \
+	$(libcrypt-so-y) $(libdl-so-y) $(libm-so-y) \
 	$(libpthread-so-y) $(libpthread-nonshared-y) $(libthread_db-so-y) \
-	$(librt-so-y) \
-	$(ldso-y) \
-	$(libutil-so-y) $(libubacktrace-so-y) $(libuargp-so-y)
+	$(librt-so-y) $(ldso-y) $(libutil-so-y) $(libubacktrace-so-y) $(libuargp-so-y)
 
 ar_objs =  $(libc-y) $(libc-static-y) $(libcrypt-a-y) \
-	$(libdl-a-y) $(libintl-a-y) $(libm-a-y) \
-	$(libpthread-a-y) $(libthread_db-a-y) \
+	$(libdl-a-y) $(libm-a-y) $(libpthread-a-y) $(libthread_db-a-y) \
 	$(librt-a-y) $(libutil-a-y) $(libubacktrace-a-y) $(libuargp-a-y)
 ifeq ($(DOPIC),y)
 ar_objs := $(ar_objs:.o=.os)

include/libc-symbols.h

@@ -582,24 +582,6 @@ FIXME! - ?
 # define libdl_hidden_data_ver(local, name)
 #endif
 
-#if defined NOT_IN_libc && defined IS_IN_libintl
-# define libintl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
-# define libintl_hidden_def(name) hidden_def (name)
-# define libintl_hidden_weak(name) hidden_weak (name)
-# define libintl_hidden_ver(local, name) hidden_ver (local, name)
-# define libintl_hidden_data_def(name) hidden_data_def (name)
-# define libintl_hidden_data_weak(name) hidden_data_weak (name)
-# define libintl_hidden_data_ver(local, name) hidden_data_ver(local, name)
-#else
-# define libintl_hidden_proto(name, attrs...)
-# define libintl_hidden_def(name)
-# define libintl_hidden_weak(name)
-# define libintl_hidden_ver(local, name)
-# define libintl_hidden_data_def(name)
-# define libintl_hidden_data_weak(name)
-# define libintl_hidden_data_ver(local, name)
-#endif
-
 #if defined NOT_IN_libc && defined IS_IN_libutil
 # define libutil_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
 # define libutil_hidden_def(name) hidden_def (name)

include/libintl.h

@@ -1,140 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995-2002, 2004, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   This file is derived from the file libgettext.h in the GNU gettext package.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-#include <features.h>
-
-#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Provide information about the supported file formats.  Returns the
-   maximum minor revision number supported for a given major revision.  */
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
-  ((major) == 0 ? 1 : -1)
-
-__BEGIN_DECLS
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext (const char *__msgid)
-     __THROW __attribute_format_arg__ (1);
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext (const char *__domainname, const char *__msgid)
-     __THROW __attribute_format_arg__ (2);
-#if 0 /* uClibc: disabled */
-extern char *__dgettext (const char *__domainname, const char *__msgid)
-     __THROW __attribute_format_arg__ (2);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext (const char *__domainname,
-			const char *__msgid, int __category)
-     __THROW __attribute_format_arg__ (2);
-#if 0 /* uClibc: disabled */
-extern char *__dcgettext (const char *__domainname,
-			  const char *__msgid, int __category)
-     __THROW __attribute_format_arg__ (2);
-#endif
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
-   number N.  */
-extern char *ngettext (const char *__msgid1, const char *__msgid2,
-		       unsigned long int __n)
-     __THROW __attribute_format_arg__ (1) __attribute_format_arg__ (2);
-
-/* Similar to `dgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dngettext (const char *__domainname, const char *__msgid1,
-			const char *__msgid2, unsigned long int __n)
-     __THROW __attribute_format_arg__ (2) __attribute_format_arg__ (3);
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dcngettext (const char *__domainname, const char *__msgid1,
-			 const char *__msgid2, unsigned long int __n,
-			 int __category)
-     __THROW __attribute_format_arg__ (2) __attribute_format_arg__ (3);
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain (const char *__domainname) __THROW;
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain (const char *__domainname,
-			     const char *__dirname) __THROW;
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-extern char *bind_textdomain_codeset (const char *__domainname,
-				      const char *__codeset) __THROW;
-
-
-/* Optimized version of the function above.  */
-#if defined __OPTIMIZE__ && !defined __cplusplus
-
-/* We need NULL for `gettext'.  */
-# define __need_NULL
-# include <stddef.h>
-
-/* We need LC_MESSAGES for `dgettext'.  */
-# include <locale.h>
-
-/* These must be macros.  Inlined functions are useless because the
-   `__builtin_constant_p' predicate in dcgettext would always return
-   false.  */
-
-# define gettext(msgid) dgettext (NULL, msgid)
-
-# define dgettext(domainname, msgid) \
-  dcgettext (domainname, msgid, LC_MESSAGES)
-
-# define ngettext(msgid1, msgid2, n) dngettext (NULL, msgid1, msgid2, n)
-
-# define dngettext(domainname, msgid1, msgid2, n) \
-  dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES)
-
-#endif	/* Optimizing.  */
-
-__END_DECLS
-
-#else
-
-#define gettext(msgid) ((const char *) (msgid))
-
-#endif /* __UCLIBC_HAS_GETTEXT_AWARENESS__ */
-
-#ifdef _LIBC
-# define _(x) gettext(x)
-# define N_(x) x
-#endif
-
-#endif /* libintl.h */

libc/Makefile.in

@@ -49,7 +49,6 @@ libc-a-$(UCLIBC_HAS_CRYPT) += $(libcrypt-a-y)
 libc-a-$(UCLIBC_HAS_ARGP) += $(libuargp-a-y)
 libc-a-$(UCLIBC_HAS_THREADS) += $(libpthread-a-y)
 libc-a-$(UCLIBC_HAS_REALTIME) += $(librt-a-y)
-libc-a-$(UCLIBC_HAS_GETTEXT_AWARENESS) += $(libintl-a-y)
 libc-a-$(UCLIBC_HAS_BACKTRACE) += $(libubacktrace-a-y)
 
 libc-so-y = $(libc-y:.o=.os) $(libc-shared-y)
@@ -61,7 +60,6 @@ libc-so-$(UCLIBC_HAS_CRYPT) += $(libcrypt-so-y)
 libc-so-$(UCLIBC_HAS_ARGP) += $(libuargp-so-y)
 libc-so-$(UCLIBC_HAS_THREADS) += $(libpthread-so-y)
 libc-so-$(UCLIBC_HAS_REALTIME) += $(librt-so-y)
-libc-so-$(UCLIBC_HAS_GETTEXT_AWARENESS) += $(libintl-so-y)
 libc-so-$(UCLIBC_HAS_BACKTRACE) += $(libubacktrace-so-y)
 
 lib-a-y += $(top_builddir)lib/libc.a

libc/inet/gai_strerror.c

@@ -18,7 +18,6 @@
 
 #include <stdio.h>
 #include <netdb.h>
-#include <libintl.h>
 
 static const struct
   {
@@ -27,22 +26,22 @@ static const struct
   }
 values[] =
   {
-    { EAI_ADDRFAMILY, N_("Address family for hostname not supported") },
-    { EAI_AGAIN, N_("Temporary failure in name resolution") },
-    { EAI_BADFLAGS, N_("Bad value for ai_flags") },
-    { EAI_FAIL, N_("Non-recoverable failure in name resolution") },
-    { EAI_FAMILY, N_("ai_family not supported") },
-    { EAI_MEMORY, N_("Memory allocation failure") },
-    { EAI_NODATA, N_("No address associated with hostname") },
-    { EAI_NONAME, N_("Name or service not known") },
-    { EAI_SERVICE, N_("Servname not supported for ai_socktype") },
-    { EAI_SOCKTYPE, N_("ai_socktype not supported") },
-    { EAI_SYSTEM, N_("System error") },
-    { 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_ADDRFAMILY, "Address family for hostname not supported" },
+    { EAI_AGAIN, "Temporary failure in name resolution" },
+    { EAI_BADFLAGS, "Bad value for ai_flags" },
+    { EAI_FAIL, "Non-recoverable failure in name resolution" },
+    { EAI_FAMILY, "ai_family not supported" },
+    { EAI_MEMORY, "Memory allocation failure" },
+    { EAI_NODATA, "No address associated with hostname" },
+    { EAI_NONAME, "Name or service not known" },
+    { EAI_SERVICE, "Servname not supported for ai_socktype" },
+    { EAI_SOCKTYPE, "ai_socktype not supported" },
+    { EAI_SYSTEM, "System error" },
+    { EAI_INPROGRESS, "Processing request in progress" },
+    { EAI_CANCELED, "Request canceled" },
+    { EAI_NOTCANCELED, "Request not canceled" },
+    { EAI_ALLDONE, "All requests done" },
+    { EAI_INTR, "Interrupted by a signal" }
   };
 
 const char *
@@ -51,7 +50,7 @@ gai_strerror (int code)
     size_t i;
     for (i = 0; i < sizeof (values) / sizeof (values[0]); ++i)
 	if (values[i].code == code)
-	    return _(values[i].msg);
+	    return values[i].msg;
 
-    return _("Unknown error");
+    return "Unknown error";
 }

libc/inet/rpc/auth_unix.c

@@ -42,7 +42,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <libintl.h>
 #include <sys/param.h>
 
 #include <rpc/types.h>
@@ -105,7 +104,7 @@ authunix_create (char *machname, uid_t uid, gid_t gid, int len,
   if (auth == NULL || au == NULL)
     {
 no_memory:
-      (void) fputs (_("authunix_create: out of memory\n"), stderr);
+      (void) fputs ("authunix_create: out of memory\n", stderr);
       mem_free (auth, sizeof (*auth));
       mem_free (au, sizeof (*au));
       return NULL;
@@ -314,7 +313,7 @@ marshal_new_auth (AUTH *auth)
   xdrmem_create (xdrs, au->au_marshed, MAX_AUTH_BYTES, XDR_ENCODE);
   if ((!xdr_opaque_auth (xdrs, &(auth->ah_cred))) ||
       (!xdr_opaque_auth (xdrs, &(auth->ah_verf))))
-    perror (_("auth_unix.c - Fatal marshalling problem"));
+    perror ("auth_unix.c - Fatal marshalling problem");
   else
     au->au_mpos = XDR_GETPOS (xdrs);
 

libc/inet/rpc/clnt_perror.c

@@ -72,74 +72,74 @@ struct rpc_errtab
 static const char rpc_errstr[] =
 {
 #define RPC_SUCCESS_IDX		0
-  N_("RPC: Success")
+  "RPC: Success"
   "\0"
 #define RPC_CANTENCODEARGS_IDX	(RPC_SUCCESS_IDX + sizeof "RPC: Success")
-  N_("RPC: Can't encode arguments")
+  "RPC: Can't encode arguments"
   "\0"
 #define RPC_CANTDECODERES_IDX	(RPC_CANTENCODEARGS_IDX \
 				 + sizeof "RPC: Can't encode arguments")
-  N_("RPC: Can't decode result")
+  "RPC: Can't decode result"
   "\0"
 #define RPC_CANTSEND_IDX	(RPC_CANTDECODERES_IDX \
 				 + sizeof "RPC: Can't decode result")
-  N_("RPC: Unable to send")
+  "RPC: Unable to send"
   "\0"
 #define RPC_CANTRECV_IDX	(RPC_CANTSEND_IDX \
 				 + sizeof "RPC: Unable to send")
-  N_("RPC: Unable to receive")
+  "RPC: Unable to receive"
   "\0"
 #define RPC_TIMEDOUT_IDX	(RPC_CANTRECV_IDX \
 				 + sizeof "RPC: Unable to receive")
-  N_("RPC: Timed out")
+  "RPC: Timed out"
   "\0"
 #define RPC_VERSMISMATCH_IDX	(RPC_TIMEDOUT_IDX \
 				 + sizeof "RPC: Timed out")
-  N_("RPC: Incompatible versions of RPC")
+  "RPC: Incompatible versions of RPC"
   "\0"
 #define RPC_AUTHERROR_IDX	(RPC_VERSMISMATCH_IDX \
 				 + sizeof "RPC: Incompatible versions of RPC")
-  N_("RPC: Authentication error")
+  "RPC: Authentication error"
   "\0"
 #define RPC_PROGUNAVAIL_IDX		(RPC_AUTHERROR_IDX \
 				 + sizeof "RPC: Authentication error")
-  N_("RPC: Program unavailable")
+  "RPC: Program unavailable"
   "\0"
 #define RPC_PROGVERSMISMATCH_IDX (RPC_PROGUNAVAIL_IDX \
 				  + sizeof "RPC: Program unavailable")
-  N_("RPC: Program/version mismatch")
+  "RPC: Program/version mismatch"
   "\0"
 #define RPC_PROCUNAVAIL_IDX	(RPC_PROGVERSMISMATCH_IDX \
 				 + sizeof "RPC: Program/version mismatch")
-  N_("RPC: Procedure unavailable")
+  "RPC: Procedure unavailable"
   "\0"
 #define RPC_CANTDECODEARGS_IDX	(RPC_PROCUNAVAIL_IDX \
 				 + sizeof "RPC: Procedure unavailable")
-  N_("RPC: Server can't decode arguments")
+  "RPC: Server can't decode arguments"
   "\0"
 #define RPC_SYSTEMERROR_IDX	(RPC_CANTDECODEARGS_IDX \
 				 + sizeof "RPC: Server can't decode arguments")
-  N_("RPC: Remote system error")
+  "RPC: Remote system error"
   "\0"
 #define RPC_UNKNOWNHOST_IDX	(RPC_SYSTEMERROR_IDX \
 				 + sizeof "RPC: Remote system error")
-  N_("RPC: Unknown host")
+  "RPC: Unknown host"
   "\0"
 #define RPC_UNKNOWNPROTO_IDX	(RPC_UNKNOWNHOST_IDX \
 				 + sizeof "RPC: Unknown host")
-  N_("RPC: Unknown protocol")
+  "RPC: Unknown protocol"
   "\0"
 #define RPC_PMAPFAILURE_IDX	(RPC_UNKNOWNPROTO_IDX \
 				 + sizeof "RPC: Unknown protocol")
-  N_("RPC: Port mapper failure")
+  "RPC: Port mapper failure"
   "\0"
 #define RPC_PROGNOTREGISTERED_IDX (RPC_PMAPFAILURE_IDX \
 				   + sizeof "RPC: Port mapper failure")
-  N_("RPC: Program not registered")
+  "RPC: Program not registered"
   "\0"
 #define RPC_FAILED_IDX		(RPC_PROGNOTREGISTERED_IDX \
 				 + sizeof "RPC: Program not registered")
-  N_("RPC: Failed (unspecified error)")
+  "RPC: Failed (unspecified error)"
 };
 
 static const struct rpc_errtab rpc_errlist[] =
@@ -177,10 +177,10 @@ clnt_sperrno (enum clnt_stat stat)
     {
       if (rpc_errlist[i].status == stat)
 	{
-	  return (char*)_(rpc_errstr + rpc_errlist[i].message_off);
+	  return (char*)rpc_errstr + rpc_errlist[i].message_off;
 	}
     }
-  return N_("RPC: (unknown error code)");
+  return "RPC: (unknown error code)";
 }
 libc_hidden_def(clnt_sperrno)
 
@@ -238,14 +238,14 @@ clnt_sperror (CLIENT * rpch, const char *msg)
       break;
 
     case RPC_VERSMISMATCH:
-      len= sprintf (str, _("; low version = %lu, high version = %lu"),
+      len= sprintf (str, "; low version = %lu, high version = %lu",
 		    e.re_vers.low, e.re_vers.high);
       str += len;
       break;
 
     case RPC_AUTHERROR:
       err = auth_errmsg (e.re_why);
-      (void) strcpy(str, _("; why = "));
+      (void) strcpy(str, "; why = ");
       str += strlen(str);
 
       if (err != NULL)
@@ -255,14 +255,14 @@ clnt_sperror (CLIENT * rpch, const char *msg)
 	}
       else
 	{
-	  len = sprintf (str, _("(unknown authentication error - %d)"),
+	  len = sprintf (str, "(unknown authentication error - %d)",
 			 (int) e.re_why);
 	  str += len;
 	}
       break;
 
     case RPC_PROGVERSMISMATCH:
-      len = sprintf (str, _("; low version = %lu, high version = %lu"),
+      len = sprintf (str, "; low version = %lu, high version = %lu",
 		     e.re_vers.low, e.re_vers.high);
       str += len;
       break;
@@ -345,34 +345,34 @@ struct auth_errtab
 static const char auth_errstr[] =
 {
 #define AUTH_OK_IDX		0
-   N_("Authentication OK")
+   "Authentication OK"
    "\0"
 #define AUTH_BADCRED_IDX	(AUTH_OK_IDX + sizeof "Authentication OK")
-   N_("Invalid client credential")
+   "Invalid client credential"
    "\0"
 #define AUTH_REJECTEDCRED_IDX	(AUTH_BADCRED_IDX \
 				 + sizeof "Invalid client credential")
-   N_("Server rejected credential")
+   "Server rejected credential"
    "\0"
 #define AUTH_BADVERF_IDX	(AUTH_REJECTEDCRED_IDX \
 				 + sizeof "Server rejected credential")
-   N_("Invalid client verifier")
+   "Invalid client verifier"
    "\0"
 #define AUTH_REJECTEDVERF_IDX	(AUTH_BADVERF_IDX \
 				 + sizeof "Invalid client verifier")
-   N_("Server rejected verifier")
+   "Server rejected verifier"
    "\0"
 #define AUTH_TOOWEAK_IDX	(AUTH_REJECTEDVERF_IDX \
 				 + sizeof "Server rejected verifier")
-   N_("Client credential too weak")
+   "Client credential too weak"
    "\0"
 #define AUTH_INVALIDRESP_IDX	(AUTH_TOOWEAK_IDX \
 				 + sizeof "Client credential too weak")
-   N_("Invalid server verifier")
+   "Invalid server verifier"
    "\0"
 #define AUTH_FAILED_IDX		(AUTH_INVALIDRESP_IDX \
 				 + sizeof "Invalid server verifier")
-   N_("Failed (unspecified error)")
+   "Failed (unspecified error)"
 };
 
 static const struct auth_errtab auth_errlist[] =
@@ -397,7 +397,7 @@ auth_errmsg (enum auth_stat stat)
     {
       if (auth_errlist[i].status == stat)
 	{
-	  return (char*)_(auth_errstr + auth_errlist[i].message_off);
+	  return (char*)auth_errstr + auth_errlist[i].message_off;
 	}
     }
   return NULL;

libc/inet/rpc/clnt_raw.c

@@ -113,7 +113,7 @@ clntraw_create (u_long prog, u_long vers)
   xdrmem_create (xdrs, clp->mashl_callmsg, MCALL_MSG_SIZE, XDR_ENCODE);
   if (!xdr_callhdr (xdrs, &call_msg))
     {
-      perror (_ ("clnt_raw.c - Fatal header serialization error."));
+      perror ("clnt_raw.c - Fatal header serialization error.");
     }
   clp->mcnt = XDR_GETPOS (xdrs);
   XDR_DESTROY (xdrs);

libc/inet/rpc/clnt_tcp.c

@@ -122,7 +122,7 @@ clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers,
   if (h == NULL || ct == NULL)
     {
       struct rpc_createerr *ce = &get_rpc_createerr ();
-      (void) fputs (_("clnttcp_create: out of memory\n"), stderr);
+      (void) fputs ("clnttcp_create: out of memory\n", stderr);
       ce->cf_stat = RPC_SYSTEMERROR;
       ce->cf_error.re_errno = ENOMEM;
       goto fooy;

libc/inet/rpc/clnt_udp.c

@@ -128,7 +128,7 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
   if (cl == NULL || cu == NULL)
     {
       struct rpc_createerr *ce = &get_rpc_createerr ();
-      (void) fputs (_("clntudp_create: out of memory\n"), stderr);
+      (void) fputs ("clntudp_create: out of memory\n", stderr);
       ce->cf_stat = RPC_SYSTEMERROR;
       ce->cf_error.re_errno = ENOMEM;
       goto fooy;

libc/inet/rpc/clnt_unix.c

@@ -119,7 +119,7 @@ clntunix_create (struct sockaddr_un *raddr, u_long prog, u_long vers,
   if (h == NULL || ct == NULL)
     {
       struct rpc_createerr *ce = &get_rpc_createerr ();
-      (void) fputs (_("clntunix_create: out of memory\n"), stderr);
+      (void) fputs ("clntunix_create: out of memory\n", stderr);
       ce->cf_stat = RPC_SYSTEMERROR;
       ce->cf_error.re_errno = ENOMEM;
       goto fooy;

libc/inet/rpc/get_myaddress.c

@@ -44,7 +44,6 @@ static char sccsid[] = "@(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 #include <sys/socket.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <libintl.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
 /* Order of following two #includes reversed by roland@gnu */
@@ -76,7 +75,7 @@ get_myaddress (struct sockaddr_in *addr)
   ifc.ifc_buf = buf;
   if (ioctl (s, SIOCGIFCONF, (char *) &ifc) < 0)
     {
-      perror (_("get_myaddress: ioctl (get interface configuration)"));
+      perror ("get_myaddress: ioctl (get interface configuration)");
       exit (1);
     }
 

libc/inet/rpc/pm_getmaps.c

@@ -74,7 +74,7 @@ pmap_getmaps (struct sockaddr_in *address)
 		     (xdrproc_t)xdr_pmaplist, (caddr_t)&head,
 		     minutetimeout) != RPC_SUCCESS)
 	{
-	  clnt_perror (client, _("pmap_getmaps rpc problem"));
+	  clnt_perror (client, "pmap_getmaps rpc problem");
 	}
       CLNT_DESTROY (client);
     }

libc/inet/rpc/pmap_clnt.c

@@ -69,7 +69,7 @@ __get_myaddress (struct sockaddr_in *addr)
   ifc.ifc_buf = buf;
   if (ioctl (s, SIOCGIFCONF, (char *) &ifc) < 0)
     {
-      perror (_("__get_myaddress: ioctl (get interface configuration)"));
+      perror ("__get_myaddress: ioctl (get interface configuration)");
       exit (1);
     }
 
@@ -133,7 +133,7 @@ pmap_set (u_long program, u_long version, int protocol, u_short port)
 		 (xdrproc_t)xdr_bool, (caddr_t)&rslt,
 		 tottimeout) != RPC_SUCCESS)
     {
-      clnt_perror (client, _("Cannot register service"));
+      clnt_perror (client, "Cannot register service");
       rslt = FALSE;
     }
   CLNT_DESTROY (client);

libc/inet/rpc/pmap_rmt.c

@@ -176,7 +176,7 @@ getbroadcastnets (struct in_addr *addrs, int sock, char *buf)
   ifc.ifc_buf = buf;
   if (ioctl (sock, SIOCGIFCONF, (char *) &ifc) < 0)
     {
-      perror (_("broadcast: ioctl (get interface configuration)"));
+      perror ("broadcast: ioctl (get interface configuration)");
       return (0);
     }
   ifr = ifc.ifc_req;
@@ -185,7 +185,7 @@ getbroadcastnets (struct in_addr *addrs, int sock, char *buf)
       ifreq = *ifr;
       if (ioctl (sock, SIOCGIFFLAGS, (char *) &ifreq) < 0)
 	{
-	  perror (_("broadcast: ioctl (get interface flags)"));
+	  perror ("broadcast: ioctl (get interface flags)");
 	  continue;
 	}
       if ((ifreq.ifr_flags & IFF_BROADCAST) &&
@@ -255,14 +255,14 @@ clnt_broadcast (
    */
   if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
     {
-      perror (_("Cannot create socket for broadcast rpc"));
+      perror ("Cannot create socket for broadcast rpc");
       stat = RPC_CANTSEND;
       goto done_broad;
     }
 #ifdef SO_BROADCAST
   if (setsockopt (sock, SOL_SOCKET, SO_BROADCAST, &on, sizeof (on)) < 0)
     {
-      perror (_("Cannot set socket option SO_BROADCAST"));
+      perror ("Cannot set socket option SO_BROADCAST");
       stat = RPC_CANTSEND;
       goto done_broad;
     }
@@ -313,7 +313,7 @@ clnt_broadcast (
 		      (struct sockaddr *) &baddr,
 		      sizeof (struct sockaddr)) != outlen)
 	    {
-	      perror (_("Cannot send broadcast packet"));
+	      perror ("Cannot send broadcast packet");
 	      stat = RPC_CANTSEND;
 	      goto done_broad;
 	    }
@@ -338,7 +338,7 @@ clnt_broadcast (
 	case -1:		/* some kind of error */
 	  if (errno == EINTR)
 	    goto recv_again;
-	  perror (_("Broadcast poll problem"));
+	  perror ("Broadcast poll problem");
 	  stat = RPC_CANTRECV;
 	  goto done_broad;
 
@@ -351,7 +351,7 @@ clnt_broadcast (
 	{
 	  if (errno == EINTR)
 	    goto try_again;
-	  perror (_("Cannot receive reply to broadcast"));
+	  perror ("Cannot receive reply to broadcast");
 	  stat = RPC_CANTRECV;
 	  goto done_broad;
 	}

libc/inet/rpc/rcmd.c

@@ -78,7 +78,6 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <libintl.h>
 #include <stdlib.h>
 #ifdef __UCLIBC_HAS_WCHAR__
 #include <wchar.h>

libc/inet/rpc/rpc_private.h

@@ -1,7 +1,6 @@
 #ifndef _RPC_PRIVATE_H
 #define _RPC_PRIVATE_H
 #include <rpc/rpc.h>
-#include <libintl.h>
 
 /* Now define the internal interfaces.  */
 extern u_long _create_xid (void) attribute_hidden;

libc/inet/rpc/ruserpass.c

@@ -41,7 +41,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <libintl.h>
 
 /* #include "ftp_var.h" */
 
@@ -163,7 +162,7 @@ next:
 				  newp = malloc((unsigned) strlen(tokval) + 1);
 				  if (newp == NULL)
 				    {
-				      printf(_("out of memory"));
+				      printf("out of memory");
 				      goto bad;
 				    }
 				  *aname = strcpy(newp, tokval);
@@ -177,8 +176,8 @@ next:
 			if (strcmp(*aname, "anonymous") &&
 			    fstat(fileno(cfile), &stb) >= 0 &&
 			    (stb.st_mode & 077) != 0) {
-	printf(_("Error: .netrc file is readable by others."));
-	printf(_("Remove password or make file unreadable by others."));
+	printf("Error: .netrc file is readable by others.");
+	printf("Remove password or make file unreadable by others.");
 				goto bad;
 			}
 			if (token() && *apass == 0) {
@@ -186,7 +185,7 @@ next:
 				newp = malloc((unsigned) strlen(tokval) + 1);
 				if (newp == NULL)
 				  {
-				    printf(_("out of memory"));
+				    printf("out of memory");
 				    goto bad;
 				  }
 				*apass = strcpy(newp, tokval);
@@ -270,7 +269,7 @@ next:
 #endif
 			break;
 		default:
-			printf(_("Unknown .netrc keyword %s"), tokval);
+			printf("Unknown .netrc keyword %s", tokval);
 			break;
 		}
 		goto done;

libc/inet/rpc/svc_run.c

@@ -74,7 +74,7 @@ svc_run (void)
 	  free (my_pollfd);
 	  if (errno == EINTR)
 	    continue;
-	  perror (_("svc_run: - poll failed"));
+	  perror ("svc_run: - poll failed");
 	  return;
 	case 0:
 	  free (my_pollfd);

libc/inet/rpc/svc_simple.c

@@ -80,7 +80,7 @@ registerrpc (u_long prognum, u_long versnum, u_long procnum,
   if (procnum == NULLPROC)
     {
 
-      (void) asprintf (&buf, _("can't reassign procedure number %ld\n"),
+      (void) asprintf (&buf, "can't reassign procedure number %ld\n",
 			 NULLPROC);
       goto err_out;
     }
@@ -89,7 +89,7 @@ registerrpc (u_long prognum, u_long versnum, u_long procnum,
       transp = svcudp_create (RPC_ANYSOCK);
       if (transp == NULL)
 	{
-	  buf = strdup (_("couldn't create an rpc server\n"));
+	  buf = strdup ("couldn't create an rpc server\n");
 	  goto err_out;
 	}
     }
@@ -97,14 +97,14 @@ registerrpc (u_long prognum, u_long versnum, u_long procnum,
   if (!svc_register (transp, (u_long) prognum, (u_long) versnum,
 		     universal, IPPROTO_UDP))
     {
-      (void) asprintf (&buf, _("couldn't register prog %ld vers %ld\n"),
+      (void) asprintf (&buf, "couldn't register prog %ld vers %ld\n",
 			 prognum, versnum);
       goto err_out;
     }
   pl = (struct proglst_ *) malloc (sizeof (struct proglst_));
   if (pl == NULL)
     {
-      buf = strdup (_("registerrpc: out of memory\n"));
+      buf = strdup ("registerrpc: out of memory\n");
       goto err_out;
     }
   pl->p_progname = progname;
@@ -162,7 +162,7 @@ universal (struct svc_req *rqstp, SVCXPRT *transp_l)
 	if (!svc_sendreply (transp_l, pl->p_outproc, outdata))
 	  {
 	    (void) asprintf (&buf,
-			       _("trouble replying to prog %d\n"),
+			       "trouble replying to prog %d\n",
 			       pl->p_prognum);
 	    exit (1);
 	  }
@@ -170,7 +170,7 @@ universal (struct svc_req *rqstp, SVCXPRT *transp_l)
 	(void) svc_freeargs (transp_l, pl->p_inproc, xdrbuf);
 	return;
       }
-  (void) asprintf (&buf, _("never registered prog %d\n"), prog);
+  (void) asprintf (&buf, "never registered prog %d\n", prog);
   fputs (buf, stderr);
   free (buf);
   exit (1);

libc/inet/rpc/svc_tcp.c

@@ -146,7 +146,7 @@ svctcp_create (int sock, u_int sendsize, u_int recvsize)
     {
       if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
 	{
-	  perror (_("svc_tcp.c - tcp socket creation problem"));
+	  perror ("svc_tcp.c - tcp socket creation problem");
 	  return (SVCXPRT *) NULL;
 	}
       madesock = TRUE;
@@ -161,7 +161,7 @@ svctcp_create (int sock, u_int sendsize, u_int recvsize)
   if ((getsockname (sock, (struct sockaddr *) &addr, &len) != 0) ||
       (listen (sock, 2) != 0))
     {
-      perror (_("svc_tcp.c - cannot getsockname or listen"));
+      perror ("svc_tcp.c - cannot getsockname or listen");
       if (madesock)
 	(void) close (sock);
       return (SVCXPRT *) NULL;
@@ -170,7 +170,7 @@ svctcp_create (int sock, u_int sendsize, u_int recvsize)
   xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT));
   if (r == NULL || xprt == NULL)
     {
-      (void) fputs (_("svctcp_create: out of memory\n"), stderr);
+      (void) fputs ("svctcp_create: out of memory\n", stderr);
       mem_free (r, sizeof (*r));
       mem_free (xprt, sizeof (SVCXPRT));
       return NULL;
@@ -210,7 +210,7 @@ makefd_xprt (int fd, u_int sendsize, u_int recvsize)
   cd = (struct tcp_conn *) mem_alloc (sizeof (struct tcp_conn));
   if (xprt == (SVCXPRT *) NULL || cd == NULL)
     {
-      (void) fputs (_("svc_tcp: makefd_xprt: out of memory\n"), stderr);
+      (void) fputs ("svc_tcp: makefd_xprt: out of memory\n", stderr);
       mem_free (xprt, sizeof (SVCXPRT));
       mem_free (cd, sizeof (struct tcp_conn));
       return NULL;

libc/inet/rpc/svc_udp.c

@@ -117,7 +117,7 @@ svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz)
     {
       if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
 	{
-	  perror (_("svcudp_create: socket creation problem"));
+	  perror ("svcudp_create: socket creation problem");
 	  return (SVCXPRT *) NULL;
 	}
       madesock = TRUE;
@@ -131,7 +131,7 @@ svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz)
     }
   if (getsockname (sock, (struct sockaddr *) &addr, &len) != 0)
     {
-      perror (_("svcudp_create - cannot getsockname"));
+      perror ("svcudp_create - cannot getsockname");
       if (madesock)
 	(void) close (sock);
       return (SVCXPRT *) NULL;
@@ -141,7 +141,7 @@ svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz)
   buf = mem_alloc (((MAX (sendsz, recvsz) + 3) / 4) * 4);
   if (xprt == NULL || su == NULL || buf == NULL)
     {
-      (void) fputs (_("svcudp_create: out of memory\n"), stderr);
+      (void) fputs ("svcudp_create: out of memory\n", stderr);
       mem_free (xprt, sizeof (SVCXPRT));
       mem_free (su, sizeof (*su));
       mem_free (buf, ((MAX (sendsz, recvsz) + 3) / 4) * 4);
@@ -162,7 +162,7 @@ svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz)
        + sizeof(struct cmsghdr) + sizeof (struct in_pktinfo))
       > sizeof (xprt->xp_pad))
     {
-      (void) fputs (_("svcudp_create: xp_pad is too small for IP_PKTINFO\n"),
+      (void) fputs ("svcudp_create: xp_pad is too small for IP_PKTINFO\n",
 		      stderr);
       return NULL;
     }
@@ -429,13 +429,13 @@ svcudp_enablecache (SVCXPRT *transp, u_long size)
 
   if (su->su_cache != NULL)
     {
-      CACHE_PERROR (_("enablecache: cache already enabled"));
+      CACHE_PERROR ("enablecache: cache already enabled");
       return 0;
     }
   uc = ALLOC (struct udp_cache, 1);
   if (uc == NULL)
     {
-      CACHE_PERROR (_("enablecache: could not allocate cache"));
+      CACHE_PERROR ("enablecache: could not allocate cache");
       return 0;
     }
   uc->uc_size = size;
@@ -443,14 +443,14 @@ svcudp_enablecache (SVCXPRT *transp, u_long size)
   uc->uc_entries = ALLOC (cache_ptr, size * SPARSENESS);
   if (uc->uc_entries == NULL)
     {
-      CACHE_PERROR (_("enablecache: could not allocate cache data"));
+      CACHE_PERROR ("enablecache: could not allocate cache data");
       return 0;
     }
   BZERO (uc->uc_entries, cache_ptr, size * SPARSENESS);
   uc->uc_fifo = ALLOC (cache_ptr, size);
   if (uc->uc_fifo == NULL)
     {
-      CACHE_PERROR (_("enablecache: could not allocate cache fifo"));
+      CACHE_PERROR ("enablecache: could not allocate cache fifo");
       return 0;
     }
   BZERO (uc->uc_fifo, cache_ptr, size);
@@ -486,7 +486,7 @@ cache_set (SVCXPRT *xprt, u_long replylen)
 	;
       if (*vicp == NULL)
 	{
-	  CACHE_PERROR (_("cache_set: victim not found"));
+	  CACHE_PERROR ("cache_set: victim not found");
 	  return;
 	}
       *vicp = victim->cache_next;	/* remote from cache */
@@ -497,13 +497,13 @@ cache_set (SVCXPRT *xprt, u_long replylen)
       victim = ALLOC (struct cache_node, 1);
       if (victim == NULL)
 	{
-	  CACHE_PERROR (_("cache_set: victim alloc failed"));
+	  CACHE_PERROR ("cache_set: victim alloc failed");
 	  return;
 	}
       newbuf = mem_alloc (su->su_iosz);
       if (newbuf == NULL)
 	{
-	  CACHE_PERROR (_("cache_set: could not allocate new rpc_buffer"));
+	  CACHE_PERROR ("cache_set: could not allocate new rpc_buffer");
 	  return;
 	}
     }

libc/inet/rpc/svc_unix.c

@@ -142,7 +142,7 @@ svcunix_create (int sock, u_int sendsize, u_int recvsize, char *path)
     {
       if ((sock = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
 	{
-	  perror (_("svc_unix.c - AF_UNIX socket creation problem"));
+	  perror ("svc_unix.c - AF_UNIX socket creation problem");
 	  return (SVCXPRT *) NULL;
 	}
       madesock = TRUE;
@@ -158,7 +158,7 @@ svcunix_create (int sock, u_int sendsize, u_int recvsize, char *path)
   if (getsockname (sock, (struct sockaddr *) &addr, &len) != 0
       || listen (sock, 2) != 0)
     {
-      perror (_("svc_unix.c - cannot getsockname or listen"));
+      perror ("svc_unix.c - cannot getsockname or listen");
       if (madesock)
 	close (sock);
       return (SVCXPRT *) NULL;
@@ -168,7 +168,7 @@ svcunix_create (int sock, u_int sendsize, u_int recvsize, char *path)
   xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT));
   if (r == NULL || xprt == NULL)
     {
-      fputs (_("svcunix_create: out of memory\n"), stderr);
+      fputs ("svcunix_create: out of memory\n", stderr);
       mem_free (r, sizeof (*r));
       mem_free (xprt, sizeof (SVCXPRT));
       return NULL;
@@ -208,7 +208,7 @@ makefd_xprt (int fd, u_int sendsize, u_int recvsize)
   cd = (struct unix_conn *) mem_alloc (sizeof (struct unix_conn));
   if (xprt == (SVCXPRT *) NULL || cd == (struct unix_conn *) NULL)
     {
-      (void) fputs (_("svc_unix: makefd_xprt: out of memory\n"), stderr);
+      (void) fputs ("svc_unix: makefd_xprt: out of memory\n", stderr);
       mem_free (xprt, sizeof (SVCXPRT));
       mem_free (cd, sizeof (struct unix_conn));
       return NULL;

libc/inet/rpc/xdr.c

@@ -44,7 +44,6 @@ static char sccsid[] = "@(#)xdr.c 1.35 87/08/12";
 #include <stdio.h>
 #include <limits.h>
 #include <string.h>
-#include <libintl.h>
 
 #include <rpc/types.h>
 #include <rpc/xdr.h>
@@ -557,7 +556,7 @@ xdr_bytes (XDR *xdrs, char **cpp, u_int *sizep, u_int maxsize)
 	}
       if (sp == NULL)
 	{
-	  (void) fputs (_("xdr_bytes: out of memory\n"), stderr);
+	  (void) fputs ("xdr_bytes: out of memory\n", stderr);
 	  return FALSE;
 	}
       /* fall into ... */
@@ -694,7 +693,7 @@ xdr_string (XDR *xdrs, char **cpp, u_int maxsize)
 	*cpp = sp = (char *) mem_alloc (nodesize);
       if (sp == NULL)
 	{
-	  (void) fputs (_("xdr_string: out of memory\n"), stderr);
+	  (void) fputs ("xdr_string: out of memory\n", stderr);
 	  return FALSE;
 	}
       sp[size] = 0;

libc/inet/rpc/xdr_array.c

@@ -45,7 +45,6 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <limits.h>
-#include <libintl.h>
 
 #define LASTUNSIGNED	((u_int)0-1)
 
@@ -94,7 +93,7 @@ xdr_array (XDR *xdrs, caddr_t *addrp, u_int *sizep, u_int maxsize, u_int elsize,
 	*addrp = target = mem_alloc (nodesize);
 	if (target == NULL)
 	  {
-	    (void) fputs (_("xdr_array: out of memory\n"), stderr);
+	    (void) fputs ("xdr_array: out of memory\n", stderr);
 	    return FALSE;
 	  }
 	memset (target, 0, nodesize);

libc/inet/rpc/xdr_rec.c

@@ -154,7 +154,7 @@ xdrrec_create (XDR *xdrs, u_int sendsize,
 
   if (rstrm == NULL || buf == NULL)
     {
-      (void) fputs (_("xdrrec_create: out of memory\n"), stderr);
+      (void) fputs ("xdrrec_create: out of memory\n", stderr);
       mem_free (rstrm, sizeof (RECSTREAM));
       mem_free (buf, sendsize + recvsize + BYTES_PER_XDR_UNIT);
       /*

libc/inet/rpc/xdr_reference.c

@@ -44,7 +44,6 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
 #include <string.h>
 #include <rpc/types.h>
 #include <rpc/xdr.h>
-#include <libintl.h>
 
 #define LASTUNSIGNED	((u_int)0-1)
 
@@ -73,7 +72,7 @@ xdr_reference (XDR *xdrs, caddr_t *pp, u_int size, xdrproc_t proc)
 	*pp = loc = (caddr_t) mem_alloc (size);
 	if (loc == NULL)
 	  {
-	    (void) fputs (_("xdr_reference: out of memory\n"), stderr);
+	    (void) fputs ("xdr_reference: out of memory\n", stderr);
 	    return FALSE;
 	  }
 	memset (loc, 0, (int) size);

libc/misc/gnu/obstack.c

@@ -403,9 +403,7 @@ _obstack_memory_used (struct obstack *h)
 }
 
 /* Define the error handler.  */
-# ifdef _LIBC
-#  include <libintl.h>
-# else
+# ifndef _LIBC
 #  include "gettext.h"
 # endif
 # ifndef _

libc/misc/regex/regex_old.c

@@ -76,14 +76,7 @@
 #  include <locale/coll-lookup.h>
 # endif
 
-/* This is for other GNU distributions with internationalized messages.  */
-# if defined HAVE_LIBINTL_H || defined _LIBC
-#  include <libintl.h>
-#  ifdef _LIBC
-#   undef gettext
-#   define gettext(msgid) __dcgettext ("libc", msgid, LC_MESSAGES)
-#  endif
-# else
+# ifndef gettext
 #  define gettext(msgid) (msgid)
 # endif
 

libc/unistd/getopt-susv3.c

@@ -22,7 +22,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <getopt.h>
-#include <libintl.h>
 
 #ifdef __BCC__
 static const char missing[] = "option requires an argument";

libc/unistd/getopt.c

@@ -1,7 +1,4 @@
 /* Getopt for GNU.
-   NOTE: getopt is now part of the C library, so if you don't know what
-   "Keep this file name-space clean" means, talk to drepper@gnu.org
-   before changing it!
    Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004
    	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
@@ -20,17 +17,6 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-/*
- * Modified for uClibc by Manuel Novoa III on 1/5/01.
- * Modified once again for uClibc by Erik Andersen 8/7/02
- */
-
-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
-   Ditto for AIX 3.2 and <stdlib.h>.  */
-#ifndef _NO_PROTO
-# define _NO_PROTO
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -67,17 +53,6 @@
 
 #include <string.h>
 
-#ifdef VMS
-# include <unixlib.h>
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "gettext.h"
-# define _(msgid) gettext (msgid)
-#endif
-
 /* Treat '-W foo' the same as the long option '--foo',
  * disabled for the moment since it costs about 2k... */
 #undef SPECIAL_TREATMENT_FOR_W
@@ -575,7 +550,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 #if defined _LIBC && defined USE_IN_LIBIO
 	      char *buf;
 
-	      if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
+	      if (__asprintf (&buf, "%s: option `%s' is ambiguous\n",
 			      argv[0], argv[d->optind]) >= 0)
 		{
 		  _IO_flockfile (stderr);
@@ -591,7 +566,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		  free (buf);
 		}
 #else
-	      fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+	      fprintf (stderr, "%s: option `%s' is ambiguous\n",
 		       argv[0], argv[d->optind]);
 #endif
 	    }
@@ -624,12 +599,12 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 			{
 			  /* --option */
 #if defined _LIBC && defined USE_IN_LIBIO
-			  n = __asprintf (&buf, _("\
-%s: option `--%s' doesn't allow an argument\n"),
+			  n = __asprintf (&buf, "\
+%s: option `--%s' doesn't allow an argument\n",
 					  argv[0], pfound->name);
 #else
-			  fprintf (stderr, _("\
-%s: option `--%s' doesn't allow an argument\n"),
+			  fprintf (stderr, "\
+%s: option `--%s' doesn't allow an argument\n",
 				   argv[0], pfound->name);
 #endif
 			}
@@ -637,13 +612,13 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 			{
 			  /* +option or -option */
 #if defined _LIBC && defined USE_IN_LIBIO
-			  n = __asprintf (&buf, _("\
-%s: option `%c%s' doesn't allow an argument\n"),
+			  n = __asprintf (&buf, "\
+%s: option `%c%s' doesn't allow an argument\n",
 					  argv[0], argv[d->optind - 1][0],
 					  pfound->name);
 #else
-			  fprintf (stderr, _("\
-%s: option `%c%s' doesn't allow an argument\n"),
+			  fprintf (stderr, "\
+%s: option `%c%s' doesn't allow an argument\n",
 				   argv[0], argv[d->optind - 1][0],
 				   pfound->name);
 #endif
@@ -685,8 +660,8 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 #if defined _LIBC && defined USE_IN_LIBIO
 		      char *buf;
 
-		      if (__asprintf (&buf, _("\
-%s: option `%s' requires an argument\n"),
+		      if (__asprintf (&buf, "\
+%s: option `%s' requires an argument\n",
 				      argv[0], argv[d->optind - 1]) >= 0)
 			{
 			  _IO_flockfile (stderr);
@@ -704,7 +679,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 			}
 #else
 		      fprintf (stderr,
-			       _("%s: option `%s' requires an argument\n"),
+			       "%s: option `%s' requires an argument\n",
 			       argv[0], argv[d->optind - 1]);
 #endif
 		    }
@@ -742,10 +717,10 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		{
 		  /* --option */
 #if defined _LIBC && defined USE_IN_LIBIO
-		  n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
+		  n = __asprintf (&buf, "%s: unrecognized option `--%s'\n",
 				  argv[0], d->__nextchar);
 #else
-		  fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+		  fprintf (stderr, "%s: unrecognized option `--%s'\n",
 			   argv[0], d->__nextchar);
 #endif
 		}
@@ -753,10 +728,10 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		{
 		  /* +option or -option */
 #if defined _LIBC && defined USE_IN_LIBIO
-		  n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
+		  n = __asprintf (&buf, "%s: unrecognized option `%c%s'\n",
 				  argv[0], argv[d->optind][0], d->__nextchar);
 #else
-		  fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+		  fprintf (stderr, "%s: unrecognized option `%c%s'\n",
 			   argv[0], argv[d->optind][0], d->__nextchar);
 #endif
 		}
@@ -808,19 +783,19 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 	      {
 		/* 1003.2 specifies the format of this message.  */
 #if defined _LIBC && defined USE_IN_LIBIO
-		n = __asprintf (&buf, _("%s: illegal option -- %c\n"),
+		n = __asprintf (&buf, "%s: illegal option -- %c\n",
 				argv[0], c);
 #else
-		fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
+		fprintf (stderr, "%s: illegal option -- %c\n", argv[0], c);
 #endif
 	      }
 	    else
 	      {
 #if defined _LIBC && defined USE_IN_LIBIO
-		n = __asprintf (&buf, _("%s: invalid option -- %c\n"),
+		n = __asprintf (&buf, "%s: invalid option -- %c\n",
 				argv[0], c);
 #else
-		fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
+		fprintf (stderr, "%s: invalid option -- %c\n", argv[0], c);
 #endif
 	      }
 
@@ -873,7 +848,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		char *buf;
 
 		if (__asprintf (&buf,
-				_("%s: option requires an argument -- %c\n"),
+				"%s: option requires an argument -- %c\n",
 				argv[0], c) >= 0)
 		  {
 		    _IO_flockfile (stderr);
@@ -889,7 +864,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		    free (buf);
 		  }
 #else
-		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+		fprintf (stderr, "%s: option requires an argument -- %c\n",
 			 argv[0], c);
 #endif
 	      }
@@ -942,7 +917,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 #if defined _LIBC && defined USE_IN_LIBIO
 		char *buf;
 
-		if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
+		if (__asprintf (&buf, "%s: option `-W %s' is ambiguous\n",
 				argv[0], argv[d->optind]) >= 0)
 		  {
 		    _IO_flockfile (stderr);
@@ -958,7 +933,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		    free (buf);
 		  }
 #else
-		fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+		fprintf (stderr, "%s: option `-W %s' is ambiguous\n",
 			 argv[0], argv[d->optind]);
 #endif
 	      }
@@ -982,8 +957,8 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 #if defined _LIBC && defined USE_IN_LIBIO
 			char *buf;
 
-			if (__asprintf (&buf, _("\
-%s: option `-W %s' doesn't allow an argument\n"),
+			if (__asprintf (&buf, "\
+%s: option `-W %s' doesn't allow an argument\n",
 					argv[0], pfound->name) >= 0)
 			  {
 			    _IO_flockfile (stderr);
@@ -1000,8 +975,8 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 			    free (buf);
 			  }
 #else
-			fprintf (stderr, _("\
-%s: option `-W %s' doesn't allow an argument\n"),
+			fprintf (stderr, "\
+%s: option `-W %s' doesn't allow an argument\n",
 				 argv[0], pfound->name);
 #endif
 		      }
@@ -1021,8 +996,8 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 #if defined _LIBC && defined USE_IN_LIBIO
 			char *buf;
 
-			if (__asprintf (&buf, _("\
-%s: option `%s' requires an argument\n"),
+			if (__asprintf (&buf, "\
+%s: option `%s' requires an argument\n",
 					argv[0], argv[d->optind - 1]) >= 0)
 			  {
 			    _IO_flockfile (stderr);
@@ -1040,7 +1015,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 			  }
 #else
 			fprintf (stderr,
-				 _("%s: option `%s' requires an argument\n"),
+				 "%s: option `%s' requires an argument\n",
 				 argv[0], argv[d->optind - 1]);
 #endif
 		      }
@@ -1094,8 +1069,8 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 #if defined _LIBC && defined USE_IN_LIBIO
 		    char *buf;
 
-		    if (__asprintf (&buf, _("\
-%s: option requires an argument -- %c\n"),
+		    if (__asprintf (&buf, "\
+%s: option requires an argument -- %c\n",
 				    argv[0], c) >= 0)
 		      {
 			_IO_flockfile (stderr);
@@ -1112,7 +1087,7 @@ _getopt_internal_r (int argc, char *const *argv, const char *optstring,
 		      }
 #else
 		    fprintf (stderr,
-			     _("%s: option requires an argument -- %c\n"),
+			     "%s: option requires an argument -- %c\n",
 			     argv[0], c);
 #endif
 		  }

libintl/Makefile

@@ -1,13 +0,0 @@
-# Makefile for uClibc
-#
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
-#
-# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-#
-
-top_srcdir=../
-top_builddir=../
-include $(top_builddir)Rules.mak
-all: libs
-include Makefile.in
-include $(top_srcdir)Makerules

libintl/Makefile.in

@@ -1,43 +0,0 @@
-# Makefile for uClibc
-#
-# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
-#
-# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-#
-
-subdirs += libintl
-
-CFLAGS-libintl := -DNOT_IN_libc -DIS_IN_libintl $(SSP_ALL_CFLAGS)
-
-MOBJ := \
-	gettext.o ngettext.o  dgettext.o dcgettext.o dngettext.o dcngettext.o \
-	textdomain.o bindtextdomain.o bind_textdomain_codeset.o \
-	_nl_expand_alias.o _nl_msg_cat_cntr.o # glibc-isms
-
-libintl_DIR := $(top_srcdir)libintl
-libintl_OUT := $(top_builddir)libintl
-
-libintl_MSRC := $(libintl_DIR)/intl.c
-libintl_MOBJ := $(patsubst %.o,$(libintl_OUT)/%.o,$(MOBJ))
-
-ifeq ($(DOPIC),y)
-libintl-a-y := $(libintl_MOBJ:.o=.os)
-else
-libintl-a-y := $(libintl_MOBJ)
-endif
-libintl-so-y := $(libintl_MOBJ:.o=.os)
-
-objclean-y += CLEAN_libintl
-
-$(libintl_OUT)/libintl.oS: $(libintl_MSRC)
-	$(Q)$(RM) $@
-	$(compile-m)
-
-$(libintl_MOBJ): $(libintl_MSRC)
-	$(compile.m)
-
-$(libintl_MOBJ:.o=.os): $(libintl_MSRC)
-	$(compile.m)
-
-CLEAN_libintl:
-	$(do_rm) $(addprefix $(libintl_OUT)/*., o os oS a)

libintl/intl.c

@@ -1,154 +0,0 @@
-/* Copyright (C) 2003     Manuel Novoa III
- * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
- *
- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
- */
-
-/*
- *  Stub version of libintl.
- *
- *  Aug 30, 2003
- *  Add some hidden names to support locale-enabled libstd++.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#undef __OPTIMIZE__
-#include <libintl.h>
-
-/**********************************************************************/
-#ifdef L_gettext
-
-char *gettext(const char *msgid)
-{
-	return (char *) msgid;
-}
-
-#endif
-/**********************************************************************/
-#ifdef L_dgettext
-
-char *dgettext(const char *domainname,
-				 const char *msgid)
-{
-	return (char *) msgid;
-}
-
-#endif
-/**********************************************************************/
-#ifdef L_dcgettext
-
-char *dcgettext(const char *domainname,
-				  const char *msgid, int category)
-{
-	return (char *) msgid;
-}
-
-#endif
-/**********************************************************************/
-#ifdef L_ngettext
-
-char *ngettext(const char *msgid1, const char *msgid2,
-			   unsigned long int n)
-{
-	return (char *) ((n == 1) ? msgid1 : msgid2);
-}
-
-#endif
-/**********************************************************************/
-#ifdef L_dngettext
-
-char *dngettext(const char *domainname, const char *msgid1,
-				const char *msgid2, unsigned long int n)
-{
-	return (char *) ((n == 1) ? msgid1 : msgid2);
-}
-
-#endif
-/**********************************************************************/
-#ifdef L_dcngettext
-
-char *dcngettext(const char *domainname, const char *msgid1,
-				 const char *msgid2, unsigned long int n,
-				 int category)
-{
-	return (char *) ((n == 1) ? msgid1 : msgid2);
-}
-
-#endif
-/**********************************************************************/
-#ifdef L_textdomain
-
-char *textdomain(const char *domainname)
-{
-	static const char default_str[] = "messages";
-
-	if (domainname && *domainname && strcmp(domainname, default_str)) {
-		__set_errno(EINVAL);
-		return NULL;
-	}
-	return (char *) default_str;
-}
-
-#endif
-/**********************************************************************/
-#ifdef L_bindtextdomain
-
-char *bindtextdomain(const char *domainname, const char *dirname)
-{
-	static const char dir[] = "/";
-
-	if (!domainname || !*domainname
-		|| (dirname
-#if 1
-			&& ((dirname[0] != '/') || dirname[1])
-#else
-			&& strcmp(dirname, dir)
-#endif
-			)
-		) {
-		__set_errno(EINVAL);
-		return NULL;
-	}
-
-	return (char *) dir;
-}
-
-#endif
-/**********************************************************************/
-#ifdef L_bind_textdomain_codeset
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-char *bind_textdomain_codeset(const char *domainname, const char *codeset)
-{
-	if (!domainname || !*domainname || codeset) {
-		__set_errno(EINVAL);
-	}
-	return NULL;
-}
-
-#endif
-/**********************************************************************/
-#ifdef L__nl_expand_alias
-
-/* glibc-ism */
-
-const char *_nl_expand_alias(const char * name);
-const char *_nl_expand_alias(const char * name)
-{
-	return NULL;		 /* uClibc does not support locale aliases. */
-}
-
-#endif
-/**********************************************************************/
-#ifdef L__nl_msg_cat_cntr
-
-/* glibc-ism */
-
-int _nl_msg_cat_cntr = 0;
-
-#endif
-/**********************************************************************/

libpthread/nptl/sysdeps/generic/dl-tls.c

@@ -19,7 +19,6 @@
 #if defined SHARED || defined NOT_IN_libc
 # error in buildsystem: This file is for libc.a
 #endif
-#include <libintl.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/param.h>

libuargp/argp-help.c

@@ -57,17 +57,7 @@ char *alloca ();
 
 #include <features.h>
 #ifndef _
-/* This is for other GNU distributions with internationalized messages.  */
-# if (defined HAVE_LIBINTL_H || defined _LIBC) && defined __UCLIBC_HAS_GETTEXT_AWARENESS__
-#  include <libintl.h>
-#  ifdef _LIBC
-#   undef dgettext
-#   define dgettext(domain, msgid) \
-  INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES)
-#  endif
-# else
-#  define dgettext(domain, msgid) (msgid)
-# endif
+# define dgettext(domain, msgid) (msgid)
 #endif
 
 #ifndef _LIBC

libuargp/argp-parse.c

@@ -48,19 +48,8 @@ char *alloca ();
 
 #include <features.h>
 #ifndef _
-/* This is for other GNU distributions with internationalized messages.
-   When compiling libc, the _ macro is predefined.  */
-# if (defined HAVE_LIBINTL_H || defined _LIBC) && defined __UCLIBC_HAS_GETTEXT_AWARENESS__
-#  include <libintl.h>
-#  ifdef _LIBC
-#   undef dgettext
-#   define dgettext(domain, msgid) \
-  INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES)
-#  endif
-# else
-#  define dgettext(domain, msgid) (msgid)
-#  define gettext(msgid) (msgid)
-# endif
+# define dgettext(domain, msgid) (msgid)
+# define gettext(msgid) (msgid)
 #endif
 #ifndef N_
 # define N_(msgid) (msgid)