mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +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
339 lines
8.9 KiB
C
339 lines
8.9 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_sample.c 1.1 90/08/30 (C) 1987 SMI
|
|
*/
|
|
char sample_rcsid[] =
|
|
"$Id$";
|
|
|
|
/*
|
|
* rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include "rpc_parse.h"
|
|
#include "rpc_util.h"
|
|
#include "proto.h"
|
|
|
|
|
|
static const char RQSTP[] = "rqstp";
|
|
|
|
static void write_sample_client (const char *program_name, version_list * vp);
|
|
static void write_sample_server (definition * def);
|
|
static void return_type (proc_list * plist);
|
|
|
|
|
|
void
|
|
write_sample_svc (definition * def)
|
|
{
|
|
|
|
if (def->def_kind != DEF_PROGRAM)
|
|
return;
|
|
write_sample_server (def);
|
|
}
|
|
|
|
|
|
int
|
|
write_sample_clnt (definition * def)
|
|
{
|
|
version_list *vp;
|
|
int count = 0;
|
|
|
|
if (def->def_kind != DEF_PROGRAM)
|
|
return 0;
|
|
/* generate sample code for each version */
|
|
for (vp = def->def.pr.versions; vp != NULL; vp = vp->next)
|
|
{
|
|
write_sample_client (def->def_name, vp);
|
|
++count;
|
|
}
|
|
return count;
|
|
}
|
|
|
|
|
|
static void
|
|
write_sample_client (const char *program_name, version_list * vp)
|
|
{
|
|
proc_list *proc;
|
|
int i;
|
|
decl_list *l;
|
|
|
|
f_print (fout, "\n\nvoid\n");
|
|
pvname (program_name, vp->vers_num);
|
|
if (Cflag)
|
|
f_print (fout, "(char *host)\n{\n");
|
|
else
|
|
f_print (fout, "(host)\nchar *host;\n{\n");
|
|
f_print (fout, "\tCLIENT *clnt;\n");
|
|
|
|
i = 0;
|
|
for (proc = vp->procs; proc != NULL; proc = proc->next)
|
|
{
|
|
f_print (fout, "\t");
|
|
++i;
|
|
if (mtflag)
|
|
{
|
|
f_print (fout, "enum clnt_stat retval_%d;\n\t", i);
|
|
ptype (proc->res_prefix, proc->res_type, 1);
|
|
if (!streq (proc->res_type, "void"))
|
|
f_print (fout, "result_%d;\n", i);
|
|
else
|
|
fprintf (fout, "*result_%d;\n", i);
|
|
}
|
|
else
|
|
{
|
|
ptype (proc->res_prefix, proc->res_type, 1);
|
|
f_print (fout, " *result_%d;\n", i);
|
|
}
|
|
/* print out declarations for arguments */
|
|
if (proc->arg_num < 2 && !newstyle)
|
|
{
|
|
f_print (fout, "\t");
|
|
if (!streq (proc->args.decls->decl.type, "void"))
|
|
{
|
|
ptype (proc->args.decls->decl.prefix,
|
|
proc->args.decls->decl.type, 1);
|
|
f_print (fout, " ");
|
|
}
|
|
else
|
|
f_print (fout, "char *"); /* cannot have "void" type */
|
|
pvname (proc->proc_name, vp->vers_num);
|
|
f_print (fout, "_arg;\n");
|
|
}
|
|
else if (!streq (proc->args.decls->decl.type, "void"))
|
|
{
|
|
for (l = proc->args.decls; l != NULL; l = l->next)
|
|
{
|
|
f_print (fout, "\t");
|
|
ptype (l->decl.prefix, l->decl.type, 1);
|
|
if (strcmp (l->decl.type, "string") == 1)
|
|
f_print (fout, " ");
|
|
pvname (proc->proc_name, vp->vers_num);
|
|
f_print (fout, "_%s;\n", l->decl.name);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* generate creation of client handle */
|
|
f_print(fout, "\n#ifndef\tDEBUG\n");
|
|
f_print (fout, "\tclnt = clnt_create (host, %s, %s, \"%s\");\n",
|
|
program_name, vp->vers_name, tirpcflag ? "netpath" : "udp");
|
|
f_print (fout, "\tif (clnt == NULL) {\n");
|
|
f_print (fout, "\t\tclnt_pcreateerror (host);\n");
|
|
f_print (fout, "\t\texit (1);\n\t}\n");
|
|
f_print(fout, "#endif\t/* DEBUG */\n\n");
|
|
|
|
/* generate calls to procedures */
|
|
i = 0;
|
|
for (proc = vp->procs; proc != NULL; proc = proc->next)
|
|
{
|
|
if (mtflag)
|
|
f_print(fout, "\tretval_%d = ",++i);
|
|
else
|
|
f_print (fout, "\tresult_%d = ", ++i);
|
|
pvname (proc->proc_name, vp->vers_num);
|
|
if (proc->arg_num < 2 && !newstyle)
|
|
{
|
|
f_print (fout, "(");
|
|
if (streq (proc->args.decls->decl.type, "void"))/* cast to void* */
|
|
f_print (fout, "(void*)");
|
|
f_print (fout, "&");
|
|
pvname (proc->proc_name, vp->vers_num);
|
|
if (mtflag)
|
|
f_print(fout, "_arg, &result_%d, clnt);\n", i);
|
|
else
|
|
f_print (fout, "_arg, clnt);\n");
|
|
}
|
|
else if (streq (proc->args.decls->decl.type, "void"))
|
|
{
|
|
if (mtflag)
|
|
f_print (fout, "(&result_%d, clnt);\n", i);
|
|
else
|
|
f_print (fout, "(clnt);\n");
|
|
}
|
|
else
|
|
{
|
|
f_print (fout, "(");
|
|
for (l = proc->args.decls; l != NULL; l = l->next)
|
|
{
|
|
pvname (proc->proc_name, vp->vers_num);
|
|
f_print (fout, "_%s, ", l->decl.name);
|
|
}
|
|
if (mtflag)
|
|
f_print(fout, "&result_%d, ", i);
|
|
f_print (fout, "clnt);\n");
|
|
}
|
|
if (mtflag)
|
|
{
|
|
f_print(fout, "\tif (retval_%d != RPC_SUCCESS) {\n", i);
|
|
}
|
|
else
|
|
{
|
|
f_print(fout, "\tif (result_%d == (", i);
|
|
ptype(proc->res_prefix, proc->res_type, 1);
|
|
f_print(fout, "*) NULL) {\n");
|
|
}
|
|
f_print(fout, "\t\tclnt_perror (clnt, \"call failed\");\n");
|
|
f_print(fout, "\t}\n");
|
|
}
|
|
|
|
f_print (fout, "#ifndef\tDEBUG\n");
|
|
f_print (fout, "\tclnt_destroy (clnt);\n");
|
|
f_print (fout, "#endif\t /* DEBUG */\n");
|
|
f_print (fout, "}\n");
|
|
}
|
|
|
|
static void
|
|
write_sample_server (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)
|
|
{
|
|
f_print (fout, "\n");
|
|
if (!mtflag)
|
|
{
|
|
return_type (proc);
|
|
f_print (fout, "*\n");
|
|
}
|
|
else
|
|
f_print (fout, "bool_t\n");
|
|
if (Cflag || mtflag)
|
|
pvname_svc (proc->proc_name, vp->vers_num);
|
|
else
|
|
pvname(proc->proc_name, vp->vers_num);
|
|
printarglist(proc, "result", RQSTP, "struct svc_req *");
|
|
f_print(fout, "{\n");
|
|
if (!mtflag)
|
|
{
|
|
f_print(fout, "\tstatic ");
|
|
if(!streq(proc->res_type, "void"))
|
|
return_type(proc);
|
|
else
|
|
f_print(fout, "char *");
|
|
/* cannot have void type */
|
|
/* f_print(fout, " result;\n", proc->res_type); */
|
|
f_print(fout, " result;\n");
|
|
}
|
|
else
|
|
f_print(fout, "\tbool_t retval;\n");
|
|
fprintf (fout, "\n\t/*\n\t * insert server code here\n\t */\n\n");
|
|
|
|
if (!mtflag)
|
|
if(!streq(proc->res_type, "void"))
|
|
f_print(fout, "\treturn &result;\n}\n");
|
|
else /* cast back to void * */
|
|
f_print(fout, "\treturn (void *) &result;\n}\n");
|
|
else
|
|
f_print(fout, "\treturn retval;\n}\n");
|
|
}
|
|
|
|
/* put in sample freeing routine */
|
|
if (mtflag)
|
|
{
|
|
f_print(fout, "\nint\n");
|
|
pvname(def->def_name, vp->vers_num);
|
|
if (Cflag)
|
|
f_print(fout,"_freeresult (SVCXPRT *transp, xdrproc_t xdr_result, caddr_t result)\n");
|
|
else
|
|
{
|
|
f_print(fout,"_freeresult (transp, xdr_result, result)\n");
|
|
f_print(fout,"\tSVCXPRT *transp;\n");
|
|
f_print(fout,"\txdrproc_t xdr_result;\n");
|
|
f_print(fout,"\tcaddr_t result;\n");
|
|
}
|
|
f_print(fout, "{\n");
|
|
f_print(fout, "\txdr_free (xdr_result, result);\n");
|
|
f_print(fout,
|
|
"\n\t/*\n\t * Insert additional freeing code here, if needed\n\t */\n");
|
|
f_print(fout, "\n\treturn 0;\n}\n");
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
return_type (proc_list * plist)
|
|
{
|
|
ptype (plist->res_prefix, plist->res_type, 1);
|
|
}
|
|
|
|
void
|
|
add_sample_msg (void)
|
|
{
|
|
f_print (fout, "/*\n");
|
|
f_print (fout, " * This is sample code generated by rpcgen.\n");
|
|
f_print (fout, " * These are only templates and you can use them\n");
|
|
f_print (fout, " * as a guideline for developing your own functions.\n");
|
|
f_print (fout, " */\n\n");
|
|
}
|
|
|
|
void
|
|
write_sample_clnt_main (void)
|
|
{
|
|
list *l;
|
|
definition *def;
|
|
version_list *vp;
|
|
|
|
f_print (fout, "\n\n");
|
|
if (Cflag)
|
|
f_print (fout, "int\nmain (int argc, char *argv[])\n{\n");
|
|
else
|
|
f_print (fout, "int\nmain (argc, argv)\nint argc;\nchar *argv[];\n{\n");
|
|
|
|
f_print (fout, "\tchar *host;");
|
|
f_print (fout, "\n\n\tif (argc < 2) {");
|
|
f_print (fout, "\n\t\tprintf (\"usage: %%s server_host\\n\", argv[0]);\n");
|
|
f_print (fout, "\t\texit (1);\n\t}");
|
|
f_print (fout, "\n\thost = argv[1];\n");
|
|
|
|
for (l = defined; l != NULL; l = l->next)
|
|
{
|
|
def = l->val;
|
|
if (def->def_kind != DEF_PROGRAM)
|
|
{
|
|
continue;
|
|
}
|
|
for (vp = def->def.pr.versions; vp != NULL; vp = vp->next)
|
|
{
|
|
f_print (fout, "\t");
|
|
pvname (def->def_name, vp->vers_num);
|
|
f_print (fout, " (host);\n");
|
|
}
|
|
}
|
|
f_print (fout, "exit (0);\n}\n");
|
|
}
|