mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
880f421fc3
1998-02-16 17:33 Ulrich Drepper <drepper@cygnus.com> * elf/rtld.c (dl_main): Recognize --library-path parameter and pass value (or NULL) to _dl_init_paths. * elf/dl-load.c (_dl_init_paths): Change to take one parameter, replacing local variable llp. If llp is NULL examine LD_LIBRARY_PATH environment variable. * elf/link.h: Change prototype for _dl_init_paths. * elf/dl-support.c: Pass NULL in _dl_init_paths call. * localedata/Makefile (distribute): Add test files. 1998-02-17 Andreas Jaeger <aj@arthur.rhein-neckar.de> * localedata/tests/{test1.cm, test2.cm, test3.cm, test4.cm, test1.def, test2.def, test3.def, test4.def}: Simple input files for localedef. Contributed by Yung-Ching Hsiao <yhsiao@cae.wisc.edu>. * localedata/Makefile (tests): Call tst-locale.sh. * localedata/tst-locale.sh: New file, regression tests for some localedef problems. 1998-02-15 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_nisplus/nisplus-alias.c: Use __stpncpy. * nis/nss_nisplus/nisplus-hosts.c: Make sure buffer is always NUL terminated. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. Add more changes from TI-RPC 2.3 for rpcgen to fix include/C++ bug and support generating thread safe RPC code. * sunrpc/rpc_main.c: Add changes. * sunrpc/rpc_clntout.c: Likewise. * sunrpc/rpc_cout.c: Likewise. * sunrpc/rpc_hout.c: Likewise. * sunrpc/rpc_parse.c: Likewise. * sunrpc/rpc_sample.c: Likewise. * sunrpc/rpc_scan.c: Likewise. * sunrpc/rpc_svcout.c: Likewise. * sunrpc/rpc_util.c: Likewise. * sunrpc/rpc_util.h: Add new structs and prototypes. * sunrpc/proto.h: Remove prototypes for static functions. 1998-02-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * locale/programs/ld-messages.c (messages_finish): Don't skip error checking when being quiet. * locale/programs/ld-ctype.c (ctype_finish): Likewise. (set_class_defaults): Likewise. * locale/programs/charmap.c (parse_charmap): Likewise. * locale/programs/ld-collate.c (collate_finish): Likewise. * locale/programs/ld-monetary.c (monetary_finish): Likewise. * locale/programs/ld-time.c (time_finish): Likewise. * locale/programs/locfile.c (write_locale_data): Likewise. * locale/programs/ld-ctype.c (ctype_class_to): Silently ignore unknown characters and empty ranges. * locale/programs/ld-collate.c (collate_order_elem): When processing an ellipsis properly form a linked list in the result table, fix typo when allocating ordering array. [PR libc/419] 1998-02-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/Makefile (ld-map): Define. (rtld-ldscript): Define. Change all `$(objpfx)rtld-ldscript' to `$(rtld-ldscript)'. ($(objpfx)ld.so): Combine the two versions of this rule. Depend on $(ld-map). (rtld-link): Combine the two versions of this definition. Fixed to make it work when no symbol versioning is used. 1998-02-16 Ulrich Drepper <drepper@cygnus.com> * Makeconfig (build-program-cmd): Use --library-path parameter to ld.so instead of environment variable. * sunrpc/Makefile (rpcgen-cmd): Don't use -$ parameter. * sunrpc/rpc_main.c: Remove support for -$$ option again. 1998-02-16 Andreas Jaeger <aj@arthur.rhein-neckar.de> * Make-dist: Respect with-cvs setting. * MakeTAGS (all-pot): Likewise. * sysdeps/sparc/sparc32/Makefile: Likewise. * sysdeps/mach/hurd/Makefile: Likewise. * stdlib/Makefile: Likewise. * posix/Makefile: Likewise. * intl/Makefile: Likewise. * po/Makefile (linguas): Likewise
343 lines
9.0 KiB
C
343 lines
9.0 KiB
C
/*
|
|
* 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 or with the express written consent of
|
|
* Sun Microsystems, Inc.
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/*
|
|
* From: @(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI
|
|
*/
|
|
char clntout_rcsid[] =
|
|
"$Id$";
|
|
|
|
/*
|
|
* rpc_clntout.c, Client-stub outputter for the RPC protocol compiler
|
|
* Copyright (C) 1987, Sun Microsystems, Inc.
|
|
*/
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <rpc/types.h>
|
|
#include "rpc_parse.h"
|
|
#include "rpc_util.h"
|
|
#include "proto.h"
|
|
|
|
#define DEFAULT_TIMEOUT 25 /* in seconds */
|
|
static const char RESULT[] = "clnt_res";
|
|
|
|
static void write_program (definition * def);
|
|
static void printbody (proc_list * proc);
|
|
static const char *ampr (const char *type);
|
|
static void printbody (proc_list * proc);
|
|
|
|
|
|
void
|
|
write_stubs (void)
|
|
{
|
|
list *l;
|
|
definition *def;
|
|
|
|
fprintf (fout,
|
|
"\n/* Default timeout can be changed using clnt_control() */\n");
|
|
fprintf (fout, "static struct timeval TIMEOUT = { %d, 0 };\n",
|
|
DEFAULT_TIMEOUT);
|
|
for (l = defined; l != NULL; l = l->next)
|
|
{
|
|
def = (definition *) l->val;
|
|
if (def->def_kind == DEF_PROGRAM)
|
|
{
|
|
write_program (def);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
write_program (definition * def)
|
|
{
|
|
version_list *vp;
|
|
proc_list *proc;
|
|
|
|
for (vp = def->def.pr.versions; vp != NULL; vp = vp->next)
|
|
{
|
|
for (proc = vp->procs; proc != NULL; proc = proc->next)
|
|
{
|
|
fprintf (fout, "\n");
|
|
if (mtflag == 0)
|
|
{
|
|
ptype (proc->res_prefix, proc->res_type, 1);
|
|
fprintf (fout, "*\n");
|
|
pvname (proc->proc_name, vp->vers_num);
|
|
printarglist (proc, RESULT, "clnt", "CLIENT *");
|
|
}
|
|
else
|
|
{
|
|
fprintf (fout, "enum clnt_stat \n");
|
|
pvname (proc->proc_name, vp->vers_num);
|
|
printarglist (proc, RESULT, "clnt", "CLIENT *");
|
|
}
|
|
fprintf (fout, "{\n");
|
|
printbody (proc);
|
|
fprintf (fout, "}\n");
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Writes out declarations of procedure's argument list.
|
|
In either ANSI C style, in one of old rpcgen style (pass by reference),
|
|
or new rpcgen style (multiple arguments, pass by value);
|
|
*/
|
|
|
|
/* sample addargname = "clnt"; sample addargtype = "CLIENT * " */
|
|
|
|
void
|
|
printarglist (proc_list * proc, const char *result,
|
|
const char *addargname, const char *addargtype)
|
|
{
|
|
|
|
decl_list *l;
|
|
|
|
if (!newstyle)
|
|
{ /* old style: always pass argument by reference */
|
|
if (Cflag)
|
|
{ /* C++ style heading */
|
|
fprintf (fout, "(");
|
|
ptype (proc->args.decls->decl.prefix,
|
|
proc->args.decls->decl.type, 1);
|
|
|
|
if (mtflag)
|
|
{/* Generate result field */
|
|
fprintf (fout, "*argp, ");
|
|
ptype(proc->res_prefix, proc->res_type, 1);
|
|
fprintf (fout, "*%s, %s%s)\n", result, addargtype, addargname);
|
|
}
|
|
else
|
|
fprintf (fout, "*argp, %s%s)\n", addargtype, addargname);
|
|
}
|
|
else
|
|
{
|
|
if (!mtflag)
|
|
fprintf (fout, "(argp, %s)\n", addargname);
|
|
else
|
|
fprintf (fout, "(argp, %s, %s)\n", result, addargname);
|
|
fprintf (fout, "\t");
|
|
ptype (proc->args.decls->decl.prefix,
|
|
proc->args.decls->decl.type, 1);
|
|
fprintf (fout, "*argp;\n");
|
|
if (mtflag)
|
|
{
|
|
fprintf (fout, "\t");
|
|
ptype (proc->res_prefix, proc->res_type, 1);
|
|
fprintf (fout, "*%s;\n", result);
|
|
}
|
|
}
|
|
}
|
|
else if (streq (proc->args.decls->decl.type, "void"))
|
|
{
|
|
/* newstyle, 0 argument */
|
|
if (mtflag)
|
|
{
|
|
fprintf (fout, "(");
|
|
if (Cflag)
|
|
{
|
|
ptype(proc->res_prefix, proc->res_type, 1);
|
|
fprintf (fout, "*%s, %s%s)\n", result, addargtype, addargname);
|
|
}
|
|
else
|
|
fprintf (fout, "(%s)\n", addargname);
|
|
}
|
|
else if (Cflag)
|
|
fprintf (fout, "(%s%s)\n", addargtype, addargname);
|
|
else
|
|
fprintf (fout, "(%s)\n", addargname);
|
|
}
|
|
else
|
|
{
|
|
/* new style, 1 or multiple arguments */
|
|
if (!Cflag)
|
|
{
|
|
fprintf (fout, "(");
|
|
for (l = proc->args.decls; l != NULL; l = l->next)
|
|
fprintf (fout, "%s, ", l->decl.name);
|
|
if (mtflag)
|
|
fprintf (fout, "%s, ", result);
|
|
fprintf (fout, "%s)\n", addargname);
|
|
for (l = proc->args.decls; l != NULL; l = l->next)
|
|
{
|
|
pdeclaration (proc->args.argname, &l->decl, 1, ";\n");
|
|
}
|
|
if (mtflag)
|
|
{
|
|
fprintf (fout, "\t");
|
|
ptype (proc->res_prefix, proc->res_type, 1);
|
|
fprintf (fout, "*%s;\n", result);
|
|
}
|
|
}
|
|
else
|
|
{ /* C++ style header */
|
|
fprintf (fout, "(");
|
|
for (l = proc->args.decls; l != NULL; l = l->next)
|
|
{
|
|
pdeclaration (proc->args.argname, &l->decl, 0, ", ");
|
|
}
|
|
if (mtflag)
|
|
{
|
|
ptype (proc->res_prefix, proc->res_type, 1);
|
|
fprintf (fout, "*%s, ", result);
|
|
}
|
|
fprintf (fout, " %s%s)\n", addargtype, addargname);
|
|
}
|
|
}
|
|
|
|
if (!Cflag)
|
|
fprintf (fout, "\t%s%s;\n", addargtype, addargname);
|
|
}
|
|
|
|
|
|
static
|
|
const char *
|
|
ampr (const char *type)
|
|
{
|
|
if (isvectordef (type, REL_ALIAS))
|
|
{
|
|
return "";
|
|
}
|
|
else
|
|
{
|
|
return "&";
|
|
}
|
|
}
|
|
|
|
static void
|
|
printbody (proc_list * proc)
|
|
{
|
|
decl_list *l;
|
|
bool_t args2 = (proc->arg_num > 1);
|
|
/* int i; */
|
|
|
|
/* For new style with multiple arguments, need a structure in which
|
|
to stuff the arguments. */
|
|
if (newstyle && args2)
|
|
{
|
|
fprintf (fout, "\t%s", proc->args.argname);
|
|
fprintf (fout, " arg;\n");
|
|
}
|
|
if (!mtflag)
|
|
{
|
|
fprintf (fout, "\tstatic ");
|
|
if (streq (proc->res_type, "void"))
|
|
{
|
|
fprintf (fout, "char ");
|
|
}
|
|
else
|
|
{
|
|
ptype (proc->res_prefix, proc->res_type, 0);
|
|
}
|
|
fprintf (fout, "%s;\n", RESULT);
|
|
fprintf (fout, "\n");
|
|
fprintf (fout, "\tmemset((char *)%s%s, 0, sizeof(%s));\n",
|
|
ampr (proc->res_type), RESULT, RESULT);
|
|
}
|
|
if (newstyle && !args2 && (streq (proc->args.decls->decl.type, "void")))
|
|
{
|
|
/* newstyle, 0 arguments */
|
|
if (mtflag)
|
|
fprintf (fout, "\t return ");
|
|
else
|
|
fprintf (fout, "\t if ");
|
|
fprintf (fout,
|
|
"(clnt_call (clnt, %s, (xdrproc_t) xdr_void", proc->proc_name);
|
|
|
|
fprintf (fout,
|
|
"(caddr_t) NULL,\n\t\t(xdrproc_t) xdr_%s, (caddr_t) %s%s,",
|
|
stringfix(proc->res_type), (mtflag)?"":ampr(proc->res_type),
|
|
RESULT);
|
|
if (mtflag)
|
|
fprintf (fout, "\n\t\tTIMEOUT));\n}\n");
|
|
else
|
|
fprintf (fout, "\n\t\tTIMEOUT) != RPC_SUCCESS) {\n");
|
|
}
|
|
else if (newstyle && args2)
|
|
{
|
|
/* newstyle, multiple arguments: stuff arguments into structure */
|
|
for (l = proc->args.decls; l != NULL; l = l->next)
|
|
{
|
|
fprintf (fout, "\targ.%s = %s;\n",
|
|
l->decl.name, l->decl.name);
|
|
}
|
|
if (mtflag)
|
|
fprintf (fout, "\treturn ");
|
|
else
|
|
fprintf (fout, "\tif ");
|
|
|
|
fprintf (fout,
|
|
"(clnt_call (clnt, %s, (xdrproc_t) xdr_%s", proc->proc_name,
|
|
proc->args.argname);
|
|
fprintf (fout,
|
|
", (caddr_t) &arg,\n\t\t(xdrproc_t) xdr_%s, (caddr_t) %s%s,",
|
|
stringfix(proc->res_type), (mtflag)?"":ampr(proc->res_type),
|
|
RESULT);
|
|
if (mtflag)
|
|
fprintf (fout, "\n\t\tTIMEOUT));\n");
|
|
else
|
|
fprintf (fout, "\n\t\tTIMEOUT) != RPC_SUCCESS) {\n");
|
|
}
|
|
else
|
|
{ /* single argument, new or old style */
|
|
if (!mtflag)
|
|
fprintf (fout,
|
|
"\tif (clnt_call (clnt, %s,\n\t\t(xdrproc_t) xdr_%s, (caddr_t) %s%s,\n\t\t(xdrproc_t) xdr_%s, (caddr_t) %s%s,\n\t\tTIMEOUT) != RPC_SUCCESS) {\n",
|
|
proc->proc_name,
|
|
stringfix (proc->args.decls->decl.type),
|
|
(newstyle ? "&" : ""),
|
|
(newstyle ? proc->args.decls->decl.name : "argp"),
|
|
stringfix (proc->res_type), ampr (proc->res_type),
|
|
RESULT);
|
|
else
|
|
fprintf(fout,
|
|
"\treturn (clnt_call(clnt, %s,\n\t\t(xdrproc_t) xdr_%s, (caddr_t) %s%s,\n\t\t(xdrproc_t) xdr_%s, (caddr_t) %s%s,\n\t\tTIMEOUT));\n",
|
|
proc->proc_name,
|
|
stringfix (proc->args.decls->decl.type),
|
|
(newstyle ? "&" : ""),
|
|
(newstyle ? proc->args.decls->decl.name : "argp"),
|
|
stringfix (proc->res_type), "",
|
|
RESULT);
|
|
}
|
|
if (!mtflag)
|
|
{
|
|
fprintf (fout, "\t\treturn (NULL);\n");
|
|
fprintf (fout, "\t}\n");
|
|
if (streq (proc->res_type, "void"))
|
|
{
|
|
fprintf (fout, "\treturn ((void *)%s%s);\n",
|
|
ampr (proc->res_type), RESULT);
|
|
}
|
|
else
|
|
{
|
|
fprintf (fout, "\treturn (%s%s);\n", ampr (proc->res_type), RESULT);
|
|
}
|
|
}
|
|
}
|