(make_request): Fix some typos.
[kopensolaris-gnu/glibc.git] / sunrpc / clnt_perr.c
index 4a8c084..6446b32 100644 (file)
@@ -6,23 +6,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -38,165 +38,227 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
  *
  */
 #include <stdio.h>
+#include <string.h>
+#include <libintl.h>
+#include <rpc/rpc.h>
 
-#include <rpc/types.h>
-#include <rpc/auth.h>
-#include <rpc/clnt.h>
-
-/* extern char *sys_errlist[]; --drepper@gnu */
-/* extern char *sprintf(); --roland@gnu */
-static char *auth_errmsg();
+#ifdef USE_IN_LIBIO
+# include <wchar.h>
+# include <libio/iolibio.h>
+#endif
 
-extern char *strcpy();
+static char *auth_errmsg (enum auth_stat stat) internal_function;
 
+#ifdef _RPC_THREAD_SAFE_
+/*
+ * Making buf a preprocessor macro requires renaming the local
+ * buf variable in a few functions.  Overriding a global variable
+ * with a local variable of the same name is a bad idea, anyway.
+ */
+#define buf RPC_THREAD_VARIABLE(clnt_perr_buf_s)
+#else
 static char *buf;
+#endif
 
 static char *
-_buf()
+_buf (void)
 {
-
-       if (buf == 0)
-               buf = (char *)malloc(256);
-       return (buf);
+  if (buf == NULL)
+    buf = (char *) malloc (256);
+  return buf;
 }
 
 /*
  * Print reply error info
  */
 char *
-clnt_sperror(rpch, s)
-       CLIENT *rpch;
-       char *s;
+clnt_sperror (CLIENT * rpch, const char *msg)
 {
-       struct rpc_err e;
-       void clnt_perrno();
-       char *err;
-       char *str = _buf();
-       char *strstart = str;
-
-       if (str == 0)
-               return (0);
-       CLNT_GETERR(rpch, &e);
-
-       (void) sprintf(str, "%s: ", s);  
-       str += strlen(str);
-
-       (void) strcpy(str, clnt_sperrno(e.re_status));  
-       str += strlen(str);
-
-       switch (e.re_status) {
-       case RPC_SUCCESS:
-       case RPC_CANTENCODEARGS:
-       case RPC_CANTDECODERES:
-       case RPC_TIMEDOUT:     
-       case RPC_PROGUNAVAIL:
-       case RPC_PROCUNAVAIL:
-       case RPC_CANTDECODEARGS:
-       case RPC_SYSTEMERROR:
-       case RPC_UNKNOWNHOST:
-       case RPC_UNKNOWNPROTO:
-       case RPC_PMAPFAILURE:
-       case RPC_PROGNOTREGISTERED:
-       case RPC_FAILED:
-               break;
-
-       case RPC_CANTSEND:
-       case RPC_CANTRECV:
-               (void) sprintf(str, "; errno = %s",
-                   sys_errlist[e.re_errno]); 
-               str += strlen(str);
-               break;
-
-       case RPC_VERSMISMATCH:
-               (void) sprintf(str,
-                       "; low version = %lu, high version = %lu", 
-                       e.re_vers.low, e.re_vers.high);
-               str += strlen(str);
-               break;
-
-       case RPC_AUTHERROR:
-               err = auth_errmsg(e.re_why);
-               (void) sprintf(str,"; why = ");
-               str += strlen(str);
-               if (err != NULL) {
-                       (void) sprintf(str, "%s",err);
-               } else {
-                       (void) sprintf(str,
-                               "(unknown authentication error - %d)",
-                               (int) e.re_why);
-               }
-               str += strlen(str);
-               break;
-
-       case RPC_PROGVERSMISMATCH:
-               (void) sprintf(str, 
-                       "; low version = %lu, high version = %lu", 
-                       e.re_vers.low, e.re_vers.high);
-               str += strlen(str);
-               break;
-
-       default:        /* unknown */
-               (void) sprintf(str, 
-                       "; s1 = %lu, s2 = %lu", 
-                       e.re_lb.s1, e.re_lb.s2);
-               str += strlen(str);
-               break;
+  char chrbuf[1024];
+  struct rpc_err e;
+  char *err;
+  char *str = _buf ();
+  char *strstart = str;
+  int len;
+
+  if (str == NULL)
+    return NULL;
+  CLNT_GETERR (rpch, &e);
+
+  len = sprintf (str, "%s: ", msg);
+  str += len;
+
+  str = stpcpy (str, clnt_sperrno (e.re_status));
+
+  switch (e.re_status)
+    {
+    case RPC_SUCCESS:
+    case RPC_CANTENCODEARGS:
+    case RPC_CANTDECODERES:
+    case RPC_TIMEDOUT:
+    case RPC_PROGUNAVAIL:
+    case RPC_PROCUNAVAIL:
+    case RPC_CANTDECODEARGS:
+    case RPC_SYSTEMERROR:
+    case RPC_UNKNOWNHOST:
+    case RPC_UNKNOWNPROTO:
+    case RPC_PMAPFAILURE:
+    case RPC_PROGNOTREGISTERED:
+    case RPC_FAILED:
+      break;
+
+    case RPC_CANTSEND:
+    case RPC_CANTRECV:
+      len = sprintf (str, "; errno = %s", __strerror_r (e.re_errno,
+                                                       chrbuf, sizeof chrbuf));
+      str += len;
+      break;
+
+    case RPC_VERSMISMATCH:
+      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);
+      str = stpcpy (str, _ ("; why = "));
+      if (err != NULL)
+       {
+         str = stpcpy (str, err);
        }
-       (void) sprintf(str, "\n");
-       return(strstart) ;
+      else
+       {
+         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"),
+                    e.re_vers.low, e.re_vers.high);
+      str += len;
+      break;
+
+    default:                   /* unknown */
+      len = sprintf (str, "; s1 = %lu, s2 = %lu", e.re_lb.s1, e.re_lb.s2);
+      str += len;
+      break;
+    }
+  *str = '\n';
+  *++str = '\0';
+  return (strstart);
 }
+libc_hidden_def (clnt_sperror)
 
 void
-clnt_perror(rpch, s)
-       CLIENT *rpch;
-       char *s;
+clnt_perror (CLIENT * rpch, const char *msg)
 {
-       (void) fprintf(stderr,"%s",clnt_sperror(rpch,s));
+  (void) __fxprintf (NULL, "%s", clnt_sperror (rpch, msg));
 }
+libc_hidden_def (clnt_perror)
 
 
-struct rpc_errtab {
-       enum clnt_stat status;
-       char *message;
+struct rpc_errtab
+{
+  enum clnt_stat status;
+  unsigned int message_off;
 };
 
-static struct rpc_errtab  rpc_errlist[] = {
-       { RPC_SUCCESS, 
-               "RPC: Success" }, 
-       { RPC_CANTENCODEARGS, 
-               "RPC: Can't encode arguments" },
-       { RPC_CANTDECODERES, 
-               "RPC: Can't decode result" },
-       { RPC_CANTSEND, 
-               "RPC: Unable to send" },
-       { RPC_CANTRECV, 
-               "RPC: Unable to receive" },
-       { RPC_TIMEDOUT, 
-               "RPC: Timed out" },
-       { RPC_VERSMISMATCH, 
-               "RPC: Incompatible versions of RPC" },
-       { RPC_AUTHERROR, 
-               "RPC: Authentication error" },
-       { RPC_PROGUNAVAIL, 
-               "RPC: Program unavailable" },
-       { RPC_PROGVERSMISMATCH, 
-               "RPC: Program/version mismatch" },
-       { RPC_PROCUNAVAIL, 
-               "RPC: Procedure unavailable" },
-       { RPC_CANTDECODEARGS, 
-               "RPC: Server can't decode arguments" },
-       { RPC_SYSTEMERROR, 
-               "RPC: Remote system error" },
-       { RPC_UNKNOWNHOST, 
-               "RPC: Unknown host" },
-       { RPC_UNKNOWNPROTO,
-               "RPC: Unknown protocol" },
-       { RPC_PMAPFAILURE, 
-               "RPC: Port mapper failure" },
-       { RPC_PROGNOTREGISTERED, 
-               "RPC: Program not registered"},
-       { RPC_FAILED, 
-               "RPC: Failed (unspecified error)"}
+static const char rpc_errstr[] =
+{
+#define RPC_SUCCESS_IDX                0
+  N_("RPC: Success")
+  "\0"
+#define RPC_CANTENCODEARGS_IDX (RPC_SUCCESS_IDX + sizeof "RPC: Success")
+  N_("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")
+  "\0"
+#define RPC_CANTSEND_IDX       (RPC_CANTDECODERES_IDX \
+                                + sizeof "RPC: Can't decode result")
+  N_("RPC: Unable to send")
+  "\0"
+#define RPC_CANTRECV_IDX       (RPC_CANTSEND_IDX \
+                                + sizeof "RPC: Unable to send")
+  N_("RPC: Unable to receive")
+  "\0"
+#define RPC_TIMEDOUT_IDX       (RPC_CANTRECV_IDX \
+                                + sizeof "RPC: Unable to receive")
+  N_("RPC: Timed out")
+  "\0"
+#define RPC_VERSMISMATCH_IDX   (RPC_TIMEDOUT_IDX \
+                                + sizeof "RPC: Timed out")
+  N_("RPC: Incompatible versions of RPC")
+  "\0"
+#define RPC_AUTHERROR_IDX      (RPC_VERSMISMATCH_IDX \
+                                + sizeof "RPC: Incompatible versions of RPC")
+  N_("RPC: Authentication error")
+  "\0"
+#define RPC_PROGUNAVAIL_IDX            (RPC_AUTHERROR_IDX \
+                                + sizeof "RPC: Authentication error")
+  N_("RPC: Program unavailable")
+  "\0"
+#define RPC_PROGVERSMISMATCH_IDX (RPC_PROGUNAVAIL_IDX \
+                                 + sizeof "RPC: Program unavailable")
+  N_("RPC: Program/version mismatch")
+  "\0"
+#define RPC_PROCUNAVAIL_IDX    (RPC_PROGVERSMISMATCH_IDX \
+                                + sizeof "RPC: Program/version mismatch")
+  N_("RPC: Procedure unavailable")
+  "\0"
+#define RPC_CANTDECODEARGS_IDX (RPC_PROCUNAVAIL_IDX \
+                                + sizeof "RPC: Procedure unavailable")
+  N_("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")
+  "\0"
+#define RPC_UNKNOWNHOST_IDX    (RPC_SYSTEMERROR_IDX \
+                                + sizeof "RPC: Remote system error")
+  N_("RPC: Unknown host")
+  "\0"
+#define RPC_UNKNOWNPROTO_IDX   (RPC_UNKNOWNHOST_IDX \
+                                + sizeof "RPC: Unknown host")
+  N_("RPC: Unknown protocol")
+  "\0"
+#define RPC_PMAPFAILURE_IDX    (RPC_UNKNOWNPROTO_IDX \
+                                + sizeof "RPC: Unknown protocol")
+  N_("RPC: Port mapper failure")
+  "\0"
+#define RPC_PROGNOTREGISTERED_IDX (RPC_PMAPFAILURE_IDX \
+                                  + sizeof "RPC: Port mapper failure")
+  N_("RPC: Program not registered")
+  "\0"
+#define RPC_FAILED_IDX         (RPC_PROGNOTREGISTERED_IDX \
+                                + sizeof "RPC: Program not registered")
+  N_("RPC: Failed (unspecified error)")
+};
+
+static const struct rpc_errtab rpc_errlist[] =
+{
+  { RPC_SUCCESS, RPC_SUCCESS_IDX },
+  { RPC_CANTENCODEARGS, RPC_CANTENCODEARGS_IDX },
+  { RPC_CANTDECODERES, RPC_CANTDECODERES_IDX },
+  { RPC_CANTSEND, RPC_CANTSEND_IDX },
+  { RPC_CANTRECV, RPC_CANTRECV_IDX },
+  { RPC_TIMEDOUT, RPC_TIMEDOUT_IDX },
+  { RPC_VERSMISMATCH, RPC_VERSMISMATCH_IDX },
+  { RPC_AUTHERROR, RPC_AUTHERROR_IDX },
+  { RPC_PROGUNAVAIL, RPC_PROGUNAVAIL_IDX },
+  { RPC_PROGVERSMISMATCH, RPC_PROGVERSMISMATCH_IDX },
+  { RPC_PROCUNAVAIL, RPC_PROCUNAVAIL_IDX },
+  { RPC_CANTDECODEARGS, RPC_CANTDECODEARGS_IDX },
+  { RPC_SYSTEMERROR, RPC_SYSTEMERROR_IDX },
+  { RPC_UNKNOWNHOST, RPC_UNKNOWNHOST_IDX },
+  { RPC_UNKNOWNPROTO, RPC_UNKNOWNPROTO_IDX },
+  { RPC_PMAPFAILURE, RPC_PMAPFAILURE_IDX },
+  { RPC_PROGNOTREGISTERED, RPC_PROGNOTREGISTERED_IDX },
+  { RPC_FAILED, RPC_FAILED_IDX }
 };
 
 
@@ -204,102 +266,140 @@ static struct rpc_errtab  rpc_errlist[] = {
  * This interface for use by clntrpc
  */
 char *
-clnt_sperrno(stat)
-       enum clnt_stat stat;
+clnt_sperrno (enum clnt_stat stat)
 {
-       int i;
+  size_t i;
 
-       for (i = 0; i < sizeof(rpc_errlist)/sizeof(struct rpc_errtab); i++) {
-               if (rpc_errlist[i].status == stat) {
-                       return (rpc_errlist[i].message);
-               }
+  for (i = 0; i < sizeof (rpc_errlist) / sizeof (struct rpc_errtab); i++)
+    {
+      if (rpc_errlist[i].status == stat)
+       {
+         return _(rpc_errstr + rpc_errlist[i].message_off);
        }
-       return ("RPC: (unknown error code)");
+    }
+  return _("RPC: (unknown error code)");
 }
+libc_hidden_def (clnt_sperrno)
 
 void
-clnt_perrno(num)
-       enum clnt_stat num;
+clnt_perrno (enum clnt_stat num)
 {
-       (void) fprintf(stderr,"%s",clnt_sperrno(num));
+  (void) __fxprintf (NULL, "%s", clnt_sperrno (num));
 }
 
 
 char *
-clnt_spcreateerror(s)
-       char *s;
+clnt_spcreateerror (const char *msg)
 {
-       extern int sys_nerr;
-       /* extern char *sys_errlist[]; --drepper@gnu */
-       char *str = _buf();
-
-       if (str == 0)
-               return(0);
-       (void) sprintf(str, "%s: ", s);
-       (void) strcat(str, clnt_sperrno(rpc_createerr.cf_stat));
-       switch (rpc_createerr.cf_stat) {
-       case RPC_PMAPFAILURE:
-               (void) strcat(str, " - ");
-               (void) strcat(str,
-                   clnt_sperrno(rpc_createerr.cf_error.re_status));
-               break;
-
-       case RPC_SYSTEMERROR:
-               (void) strcat(str, " - ");
-               if (rpc_createerr.cf_error.re_errno > 0
-                   && rpc_createerr.cf_error.re_errno < sys_nerr)
-                       (void) strcat(str,
-                           sys_errlist[rpc_createerr.cf_error.re_errno]);
-               else
-                       (void) sprintf(&str[strlen(str)], "Error %d",
-                           rpc_createerr.cf_error.re_errno);
-               break;
-       }
-       (void) strcat(str, "\n");
-       return (str);
+  char chrbuf[1024];
+  char *str = _buf ();
+  char *cp;
+  int len;
+  struct rpc_createerr *ce;
+
+  if (str == NULL)
+    return NULL;
+  ce = &get_rpc_createerr ();
+  len = sprintf (str, "%s: ", msg);
+  cp = str + len;
+  cp = stpcpy (cp, clnt_sperrno (ce->cf_stat));
+  switch (ce->cf_stat)
+    {
+    case RPC_PMAPFAILURE:
+      cp = stpcpy (stpcpy (cp, " - "),
+                  clnt_sperrno (ce->cf_error.re_status));
+      break;
+
+    case RPC_SYSTEMERROR:
+      cp = stpcpy (stpcpy (cp, " - "),
+                  __strerror_r (ce->cf_error.re_errno,
+                                chrbuf, sizeof chrbuf));
+      break;
+    default:
+      break;
+    }
+  *cp = '\n';
+  *++cp = '\0';
+  return str;
 }
+libc_hidden_def (clnt_spcreateerror)
 
 void
-clnt_pcreateerror(s)
-       char *s;
+clnt_pcreateerror (const char *msg)
 {
-       (void) fprintf(stderr,"%s",clnt_spcreateerror(s));
+  (void) __fxprintf (NULL, "%s", clnt_spcreateerror (msg));
 }
 
-struct auth_errtab {
-       enum auth_stat status;  
-       char *message;
+struct auth_errtab
+{
+  enum auth_stat status;
+  unsigned int message_off;
 };
 
-static struct auth_errtab auth_errlist[] = {
-       { AUTH_OK,
-               "Authentication OK" },
-       { AUTH_BADCRED,
-               "Invalid client credential" },
-       { AUTH_REJECTEDCRED,
-               "Server rejected credential" },
-       { AUTH_BADVERF,
-               "Invalid client verifier" },
-       { AUTH_REJECTEDVERF,
-               "Server rejected verifier" },
-       { AUTH_TOOWEAK,
-               "Client credential too weak" },
-       { AUTH_INVALIDRESP,
-               "Invalid server verifier" },
-       { AUTH_FAILED,
-               "Failed (unspecified error)" },
+static const char auth_errstr[] =
+{
+#define AUTH_OK_IDX            0
+   N_("Authentication OK")
+   "\0"
+#define AUTH_BADCRED_IDX       (AUTH_OK_IDX + sizeof "Authentication OK")
+   N_("Invalid client credential")
+   "\0"
+#define AUTH_REJECTEDCRED_IDX  (AUTH_BADCRED_IDX \
+                                + sizeof "Invalid client credential")
+   N_("Server rejected credential")
+   "\0"
+#define AUTH_BADVERF_IDX       (AUTH_REJECTEDCRED_IDX \
+                                + sizeof "Server rejected credential")
+   N_("Invalid client verifier")
+   "\0"
+#define AUTH_REJECTEDVERF_IDX  (AUTH_BADVERF_IDX \
+                                + sizeof "Invalid client verifier")
+   N_("Server rejected verifier")
+   "\0"
+#define AUTH_TOOWEAK_IDX       (AUTH_REJECTEDVERF_IDX \
+                                + sizeof "Server rejected verifier")
+   N_("Client credential too weak")
+   "\0"
+#define AUTH_INVALIDRESP_IDX   (AUTH_TOOWEAK_IDX \
+                                + sizeof "Client credential too weak")
+   N_("Invalid server verifier")
+   "\0"
+#define AUTH_FAILED_IDX                (AUTH_INVALIDRESP_IDX \
+                                + sizeof "Invalid server verifier")
+   N_("Failed (unspecified error)")
+};
+
+static const struct auth_errtab auth_errlist[] =
+{
+  { AUTH_OK, AUTH_OK_IDX },
+  { AUTH_BADCRED, AUTH_BADCRED_IDX },
+  { AUTH_REJECTEDCRED, AUTH_REJECTEDCRED_IDX },
+  { AUTH_BADVERF, AUTH_BADVERF_IDX },
+  { AUTH_REJECTEDVERF, AUTH_REJECTEDVERF_IDX },
+  { AUTH_TOOWEAK, AUTH_TOOWEAK_IDX },
+  { AUTH_INVALIDRESP, AUTH_INVALIDRESP_IDX },
+  { AUTH_FAILED, AUTH_FAILED_IDX }
 };
 
 static char *
-auth_errmsg(stat)
-       enum auth_stat stat;
+internal_function
+auth_errmsg (enum auth_stat stat)
 {
-       int i;
+  size_t i;
 
-       for (i = 0; i < sizeof(auth_errlist)/sizeof(struct auth_errtab); i++) {
-               if (auth_errlist[i].status == stat) {
-                       return(auth_errlist[i].message);
-               }
+  for (i = 0; i < sizeof (auth_errlist) / sizeof (struct auth_errtab); i++)
+    {
+      if (auth_errlist[i].status == stat)
+       {
+         return _(auth_errstr + auth_errlist[i].message_off);
        }
-       return(NULL);
+    }
+  return NULL;
+}
+
+
+libc_freeres_fn (free_mem)
+{
+  /* Not libc_freeres_ptr, since buf is a macro.  */
+  free (buf);
 }