mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-12 16:20:06 +00:00
c4563d2d66
1999-04-28 Ulrich Drepper <drepper@cygnus.com> * argp/argp-ba.c (argp_program_bug_address): Don't initialize with 0. * argp/argp-parse.c (_argp_hang): Likewise. * argp/argp-pv.c (argp_program_version): Likewise. * argp/argp-pvh.c (argp_program_version_hook): Likewise. * inet/ether_hton.c (ether_hton, startp): Likewise. * inet/ether_ntoh.c (ether_ntoh, startp): Likewise. * inet/getnetgrent_r.c (setup, startp): Likewise. * intl/loadmsgcat.c (_nl_msg_cat_cntr): Likewise. * intl/localealias.c (string_space, string_space_act, string_space_max, nmap, maxmap): Likewise. * libio/iopopen.c (proc_file_chain): Likewise. * libio/oldiopopen.c (old_proc_file_chain): Likewise. * locale/lc-collate.c (__collate_table, __collate_extra, __collate_element_hash, __collate_element_strings, __collate_element_values): Likewise. * malloc/mcheck.c (mcheck_used): Likewise. * malloc/mtrace.c (added_atexit_handler): Likewise. * malloc/set-freeres.c (already_called): Likewise. * misc/getpass.c (getpass) [buf, bufsize]: Likewise. * misc/syslog.c (LogStat, LogTag): Likewise. * nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise. * nss/getXXbyYY_r.c (startp): Likewise. * posix/getopt.c (optarg, __getopt_initialized): Likewise. * posix/regex.c (init_syntax_once) [done]: Likewise. (debug): Likewise. * string/strfry.c (init): Likewise. * sunrpc/svc_run.c (svc_top): Likewise. * posix/euidaccess.c (have_ids): Likewise. * sysdeps/unix/sysv/linux/poll.c (must_emulate): Likewise. * sysdeps/unix/sysv/linux/ttyname.c (__ttyname, namelen): Likewise. * time/getdate.c (getdate_err): Likewise. * time/tzfile.c (transitions, type_idxs, types, zone_names, leaps): Likewise. * time/tzset.c (old_tz, is_initialized): Likewise. * inet/getnameinfo.c (nrl_domainname): Rewrite to allow initialization of static data with zero. * signal/allocrtsig.c (init): Likewise. * string/Makefile (routines): Add strchrnul. * string/Versions [GLIBC_2.1.1]: Add strchrnul. * string/string.c: Add strchrnul prototype. * include/string.h: Add __strchrnul prototype. * sysdeps/generic/strchrnul.c: New file. * sysdeps/i386/strchrnul.S: New file. * sysdeps/i386/bits/string.c: Add strchrnul optimization. * sysdeps/i386/i486/bits/string.c: Likewise. * argp/argp-help.c (argp_args_usage): Use __strchrnul. * inet/ether_line.c (ether_line): Likewise. * nscd/nscd_conf.c (nscd_parse_file): Likewise. * nss/nsswitch.c (nss_parse_file): Likewise. * posix/execvp.c (execvp): Likewise. * posix/fnmatch.c (internal_fnmatch): Likewise. * resolv/res_hconf.c (_res_hconv_init): Likewise. * resolv/res_init.c (res_init): Likewise. * stdlib/fmtmsg.c (init): Likewise. * stdlib/getsubopt.c (getsubopt): Likewise. * catgets/catgets.c (catopen): Only allocate one memory block. (catclose): Only one free call necessary. * catgets/open_catalog.c (__open_catalog): Simplify handling of file descriptor. * ctype/ctype-extn.c: Make __toascii_l and __isascii_l alias instead of real functions. Simplify _tolower and _toupper. * grp/initgroups.c (compat_call): Remove unnecessary use of pointer variable. * iconv/gconv.h (struct gconv_info): Change data element from pointer to array of size 0. * iconv/gconv_open.c (__gconv_open): Allocate structures accordingly. * iconv/gconv_close.c (__gconv_close): Don't free data. * iconv/gconv_conf.c (add_alias): Avoid searching in tree twice to insert new alias. * iconv/gconv_db.c (add_derivation): More efficient copying. Check for error while inserting in tree. * include/time.h: Pretty print. * inet/ruserpass.c: Rewrite use of toktab to avoid string pointers in table and lots of relocations. * posix/regex.c (regerror): Rewrite use of re_error_msgid to avoid string pointers in table and lots of relocations. * intl/finddomain.c: Remove definition of strchr macro. * io/ftw.c (nftw_arr, ftw_arr): Make const. * locale/loadlocale.c (_nl_load_locale): Optimize string copying. * locale/localeinfo.h (_nl_category_names): Change into an array with fixed width char string elements. * locale/setlocale.c (_nl_category_names): Likewise. (_nl_current): Make global. * locale/nl_langinfo.c (nldata): Removed. Use _nl_current now. * malloc/Makefile (distribute): Add stackinfo.h. * sysdeps/generic/stackinfo.h: New file. * sysdeps/i386/stackinfo.h: New file. * posix/execl.c: Use stackinfo.h in optimizing alloca use. * posix/execle.c: Likewise. * posix/execlp.c: Likewise. * nis/nis_table.c (__create_ib_request): Always use realloc. * posix/execvp.c (execute): Rename to script_execute and keep only code to execute using shell. (execvp): Call execv directly and only fall back on script_execute. * resolv/inet_net_pton.c (inet_net_pton_ipv4): Remove digits define and always use xdigits instead. * resolv/res_init.c (res_init): Use rawmemchr instead of strchr where appropriate. * stdlib/fpioconst.h (__tens): New declaration. (struct mp_power): Remove array, add arrayoff element. * stdlib/fpioconst.c: Replace definitions of _ten_p* arrays by one __tens array and add in _fpioconst_pow10 offsets into __tens. * stdio-common/printf_fp.c: Rewrite to use new __tens array. * stdlib/strtod.c: Likewise. * stdlib/a64l.c (a64l_table): Avoid unnecessary elements. * stdlib/exit.c: Rewrite to use __exit_funcs being as sign for end of the list. * stdlib/atexit.c (__exit_funcs): Don't initialize. * stdlib/fmtmsg.c (keywords): Make name element fixed width array. * sunrpc/clnt_perr.c: Rewrite clnt_sperrno and auth_errmsg to use a single and an array with offsets. * sunrpc/des_soft.c (partab): Make it const. * sunrpc/key_call.c (trytimeout, tottimeout): Make const. (__key_encryptsession_pk_LOCAL): Don't initialize with 0. (__key_decryptsession_pk_LOCAL): Likewise. (__key_gendes_LOCAL): Likewise. (MESSENGER): Mark const. (key_call_private_main): Don't initialize with 0. (use_keyenvoy): Don't initialize with 0. (key_call): Rewrite to reverse logic of use_doors variable. * sunrpc/netname.c (OPSYS): Define as array, not pointer. (startp): Don't initialize with zero. * sunrpc/openchild.c (_openchild): Make first argument const. * sunrpc/pmap_rmt.c (timeout): Mark const. * sunrpc/xcrypt.c (hex): Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Rewrite to allow omitting initialization of global variables. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * termios/tcgetsid.c: Likewise. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Change fxsr to osfxsr. * time/tzfile.c (__tzfile_read): Rewrite to allocate only one memory block. Add function to free memory if wanted. * time/tzset.c (tzset_internal): Pass extra argument to __tzfile_read. * wcsmbs/wcsmbsload.c (to_wc, to_mb): Correct initializers. * wcsmbs/wmemset.c: Little code optimization.
385 lines
9.7 KiB
C
385 lines
9.7 KiB
C
/* @(#)clnt_perror.c 2.1 88/07/29 4.0 RPCSRC */
|
|
/*
|
|
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
|
* unrestricted use provided that this legend is included on all tape
|
|
* media and as a part of the software program in whole or part. Users
|
|
* 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
|
|
*/
|
|
#if !defined(lint) && defined(SCCSIDS)
|
|
static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
|
|
#endif
|
|
|
|
/*
|
|
* clnt_perror.c
|
|
*
|
|
* Copyright (C) 1984, Sun Microsystems, Inc.
|
|
*
|
|
*/
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <rpc/types.h>
|
|
#include <rpc/auth.h>
|
|
#include <rpc/clnt.h>
|
|
|
|
#ifdef USE_IN_LIBIO
|
|
# include <libio/iolibio.h>
|
|
# define fputs(s, f) _IO_fputs (s, f)
|
|
#endif
|
|
|
|
static char *auth_errmsg (enum auth_stat stat) internal_function;
|
|
|
|
static char *buf;
|
|
|
|
static char *
|
|
_buf (void)
|
|
{
|
|
if (buf == NULL)
|
|
buf = (char *) malloc (256);
|
|
return buf;
|
|
}
|
|
|
|
/*
|
|
* Print reply error info
|
|
*/
|
|
char *
|
|
clnt_sperror (CLIENT * rpch, const char *msg)
|
|
{
|
|
char buf[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,
|
|
buf, sizeof buf));
|
|
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);
|
|
}
|
|
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);
|
|
}
|
|
|
|
void
|
|
clnt_perror (CLIENT * rpch, const char *msg)
|
|
{
|
|
(void) fputs (clnt_sperror (rpch, msg), stderr);
|
|
}
|
|
|
|
|
|
struct rpc_errtab
|
|
{
|
|
enum clnt_stat status;
|
|
unsigned int message_off;
|
|
};
|
|
|
|
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 },
|
|
{ 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 }
|
|
};
|
|
|
|
|
|
/*
|
|
* This interface for use by clntrpc
|
|
*/
|
|
char *
|
|
clnt_sperrno (enum clnt_stat stat)
|
|
{
|
|
size_t i;
|
|
|
|
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)");
|
|
}
|
|
|
|
void
|
|
clnt_perrno (enum clnt_stat num)
|
|
{
|
|
(void) fputs (clnt_sperrno (num), stderr);
|
|
}
|
|
|
|
|
|
char *
|
|
clnt_spcreateerror (const char *msg)
|
|
{
|
|
char buf[1024];
|
|
char *str = _buf ();
|
|
char *cp;
|
|
int len;
|
|
|
|
if (str == NULL)
|
|
return NULL;
|
|
len = sprintf (str, "%s: ", msg);
|
|
cp = str + len;
|
|
cp = stpcpy (cp, clnt_sperrno (rpc_createerr.cf_stat));
|
|
switch (rpc_createerr.cf_stat)
|
|
{
|
|
case RPC_PMAPFAILURE:
|
|
cp = stpcpy (stpcpy (cp, " - "),
|
|
clnt_sperrno (rpc_createerr.cf_error.re_status));
|
|
break;
|
|
|
|
case RPC_SYSTEMERROR:
|
|
cp = stpcpy (stpcpy (cp, " - "),
|
|
__strerror_r (rpc_createerr.cf_error.re_errno,
|
|
buf, sizeof buf));
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
*cp = '\n';
|
|
*++cp = '\0';
|
|
return str;
|
|
}
|
|
|
|
void
|
|
clnt_pcreateerror (const char *msg)
|
|
{
|
|
(void) fputs (clnt_spcreateerror (msg), stderr);
|
|
}
|
|
|
|
struct auth_errtab
|
|
{
|
|
enum auth_stat status;
|
|
unsigned int message_off;
|
|
};
|
|
|
|
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 *
|
|
internal_function
|
|
auth_errmsg (enum auth_stat stat)
|
|
{
|
|
size_t i;
|
|
|
|
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;
|
|
}
|