* 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
*/
/*
- * rpc_parse.c, Parser for the RPC protocol compiler
+ * rpc_parse.c, Parser for the RPC protocol compiler
* Copyright (C) 1987 Sun Microsystems, Inc.
*/
#include <afsconfig.h>
#include <afs/param.h>
+#include <roken.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <ctype.h>
-#include <string.h>
+
#include "rpc_scan.h"
#include "rpc_parse.h"
#include "rpc_util.h"
list *proc_defined[MAX_PACKAGES], *special_defined, *typedef_defined,
- *uniondef_defined;
+ *uniondef_defined, *complex_defined;
char *SplitStart = NULL;
char *SplitEnd = NULL;
char *MasterPrefix = NULL;
break;
case TOK_EOF:
return (NULL);
- break;
case TOK_PACKAGE:
def_package(defp);
break;
declaration dec;
decl_list *decls;
decl_list **tailp;
+ int special = 0;
defp->def_kind = DEF_STRUCT;
tailp = &defp->def.st.decls;
do {
get_declaration(&dec, DEF_STRUCT);
+ /* If a structure contains an array, then we're going
+ * to need to be clever about freeing it */
+ if (dec.rel == REL_ARRAY) {
+ special = 1;
+ }
decls = ALLOC(decl_list);
decls->decl = dec;
*tailp = decls;
} while (tok.kind != TOK_RBRACE);
get_token(&tok);
*tailp = NULL;
+
+ if (special)
+ STOREVAL(&complex_defined, defp);
}
static void
if (Sflag || cflag)
ss_Proc_CodeGeneration(defp);
}
- if (Sflag)
+ if (Sflag || (cflag && xflag && !proc_split_flag))
STOREVAL(&proc_defined[PackageIndex], defp);
}
if (ansic_flag) {
if (split_flag) {
- first_arg = "register struct rx_call *z_call";
+ first_arg = "struct rx_call *z_call";
} else {
- first_arg = "register struct rx_connection *z_conn";
+ first_arg = "struct rx_connection *z_conn";
}
} else {
if (split_flag) {
plist->pl.param_name);
}
} else {
- f_print(fout, ", %s", plist->pl.param_name);
+ f_print(fout, ", %s", plist->pl.param_name);
plist->pl.param_flag &= ~PROCESSED_PARAM;
}
}
return;
if (!split_flag)
- f_print(fout, "\tregister struct rx_connection *z_conn;\n");
+ f_print(fout, "\tstruct rx_connection *z_conn;\n");
if (split_flag) {
- f_print(fout, "\tregister struct rx_call *z_call;\n");
+ f_print(fout, "\tstruct rx_call *z_call;\n");
}
for (plist = defp->pc.plists; plist; plist = plist->next) {
if (plist->component_kind == DEF_PARAM
for (listp = special_defined; listp != NULL; listp = listp->next) {
defp1 = (definition *) listp->val;
+
for (plist = defp->pc.plists; plist; plist = plist->next) {
if (plist->component_kind == DEF_PARAM
&& (plist->pl.param_kind == DEF_INPARAM
*somefrees = 1;
switch (defp1->pc.rel) {
case REL_ARRAY:
- f_print(fout, "\n\t%s.%s_val = 0;",
- plist->pl.param_name, defp1->def_name);
- f_print(fout, "\n\t%s.%s_len = 0;",
- plist->pl.param_name, defp1->def_name);
plist->pl.string_name = alloc(40);
- s_print(plist->pl.string_name, "%s_val",
- defp1->def_name);
+ if (brief_flag) {
+ f_print(fout, "\n\t%s.val = 0;",
+ plist->pl.param_name);
+ f_print(fout, "\n\t%s.len = 0;",
+ plist->pl.param_name);
+ s_print(plist->pl.string_name, "val");
+ } else {
+ f_print(fout, "\n\t%s.%s_val = 0;",
+ plist->pl.param_name, defp1->def_name);
+ f_print(fout, "\n\t%s.%s_len = 0;",
+ plist->pl.param_name, defp1->def_name);
+ s_print(plist->pl.string_name, "%s_val",
+ defp1->def_name);
+ }
break;
case REL_POINTER:
f_print(fout, "\n\t%s = 0;", plist->pl.param_name);
}
}
}
+ for (listp = complex_defined; listp != NULL; listp = listp->next) {
+ defp1 = (definition *) listp->val;
+ for (plist = defp->pc.plists; plist; plist = plist->next) {
+ if (plist->component_kind == DEF_PARAM) {
+ if (streq(defp1->def_name, structname(plist->pl.param_type))) {
+ plist->pl.param_flag |= FREETHIS_PARAM;
+ *somefrees = 1;
+ fprintf(fout, "\n\tmemset(&%s, 0, sizeof(%s));",
+ plist->pl.param_name, defp1->def_name);
+ }
+ }
+ }
+ }
+
f_print(fout, "\n");
}
f_print(fout, "\tz_xdrs->x_op = XDR_FREE;\n");
for (plist = defp->pc.plists; plist; plist = plist->next) {
if (plist->component_kind == DEF_PARAM
- && (plist->pl.param_flag & FREETHIS_PARAM)) {
- char *dot = "", *extens = "";
- if (plist->pl.string_name) {
- dot = ".";
- extens = plist->pl.string_name;
- }
+ && (plist->pl.param_flag & FREETHIS_PARAM))
f_print(fout, "\tif (!%s) goto fail1;\n", plist->scode);
- }
}
for (listp = typedef_defined; listp != NULL; listp = listp->next) {
defp1 = (definition *) listp->val;
if (!cflag) {
if (ansic_flag) {
- f_print(fout, "int %s%s%s%s(register struct ubik_client *aclient, afs_int32 aflags",
+ f_print(fout, "int %s%s%s%s(struct ubik_client *aclient, afs_int32 aflags",
procheader, prefix, PackagePrefix[PackageIndex],
defp->pc.proc_name);
} else {
if (ansic_flag)
return;
- f_print(fout, "\tregister struct ubik_client *aclient;\n\tafs_int32 aflags;\n");
+ f_print(fout, "\tstruct ubik_client *aclient;\n\tafs_int32 aflags;\n");
for (plist = defp->pc.plists; plist; plist = plist->next) {
if (plist->component_kind == DEF_PARAM
&& !(plist->pl.param_flag & PROCESSED_PARAM)) {
f_print(fout, "\t\tif ((pass == 0) && (aclient->states[_ucount] & CFLastFailed)) {\n");
f_print(fout, "\t\t\tcontinue; /* this guy's down */\n");
f_print(fout, "\t\t}\n");
-
+
f_print(fout, "\t\trcode = %s%s%s(tc\n", prefix, PackagePrefix[PackageIndex], defp->pc.proc_name);
for (plist = defp->pc.plists; plist; plist = plist->next) {
if (plist->component_kind == DEF_PARAM) {
list *listp;
definition *defp;
+ if ( !Sflag )
+ return;
+
f_print(fout, "\n");
for (listp = proc_defined[PackageIndex]; listp != NULL;
listp = listp->next) {
if ((listp = proc_defined[PackageIndex])) {
defp = (definition *) listp->val;
- if (defp->pc.proc_serverstub) {
- f_print(fout, "\nstatic afs_int32 (*StubProcsArray%d[])() = {%s",
- PackageIndex, defp->pc.proc_serverstub);
- } else {
- f_print(fout,
- "\nstatic afs_int32 (*StubProcsArray%d[])(struct rx_call *z_call, XDR *z_xdrs) = {_%s%s%s",
- PackageIndex, prefix, defp->pc.proc_prefix,
- ((definition *) listp->val)->pc.proc_name);
- defp = (definition *) listp->val;
+ if ( cflag ) {
+ f_print(fout, "\nstatic char *opnames%d[] = {\"%s%s\"",
+ PackageIndex, defp->pc.proc_prefix, defp->pc.proc_name);
+ }
+ else {
+ if (defp->pc.proc_serverstub) {
+ f_print(fout, "\nstatic afs_int32 (*StubProcsArray%d[])() = {%s",
+ PackageIndex, defp->pc.proc_serverstub);
+ } else {
+ f_print(fout,
+ "\nstatic afs_int32 (*StubProcsArray%d[])(struct rx_call *z_call, XDR *z_xdrs) = {_%s%s%s",
+ PackageIndex, prefix, defp->pc.proc_prefix,
+ ((definition *) listp->val)->pc.proc_name);
+ defp = (definition *) listp->val;
+ }
}
listp = listp->next;
}
for (; listp != NULL; listp = listp->next) {
defp = (definition *) listp->val;
- if (defp->pc.proc_serverstub) {
- f_print(fout, ",%s", defp->pc.proc_serverstub);
- } else {
- f_print(fout, ", _%s%s%s", prefix, defp->pc.proc_prefix,
- defp->pc.proc_name);
+ if ( cflag ) {
+ f_print(fout, ", \"%s%s\"",defp->pc.proc_prefix,defp->pc.proc_name);
+ }
+ else {
+ if (defp->pc.proc_serverstub) {
+ f_print(fout, ",%s", defp->pc.proc_serverstub);
+ } else {
+ f_print(fout, ", _%s%s%s", prefix, defp->pc.proc_prefix,
+ defp->pc.proc_name);
+ }
}
}
f_print(fout, "};\n\n");
static void
er_ProcMainBody_setup(void)
{
- f_print(fout, "int %s%sExecuteRequest(register struct rx_call *z_call)\n",
+ if ( cflag ) {
+ f_print(fout, "char *%sTranslateOpCode(int op)\n{\n",
+ PackagePrefix[PackageIndex]);
+ f_print(fout, "\tif (op < %sLOWEST_OPCODE || op > %sHIGHEST_OPCODE)\n\t\treturn NULL;\n",
+ PackagePrefix[PackageIndex], PackagePrefix[PackageIndex]);
+ f_print(fout, "\treturn opnames%d[op - %sLOWEST_OPCODE];\n}\n",
+ PackageIndex, PackagePrefix[PackageIndex]);
+ return;
+ }
+ f_print(fout, "int %s%sExecuteRequest(struct rx_call *z_call)\n",
prefix, PackagePrefix[PackageIndex]);
f_print(fout, "{\n\tint op;\n");
f_print(fout, "\tXDR z_xdrs;\n");
static void
er_HeadofOldStyleProc_setup(void)
{
- f_print(fout,
- "\nint %s%sExecuteRequest (register struct rx_call *z_call)\n",
- prefix,
+ if ( cflag ) {
+ f_print(fout, "char *%sTranslateOpCode(int op)\n{\n",
(combinepackages ? MasterPrefix : PackagePrefix[PackageIndex]));
- f_print(fout, "{\n");
- f_print(fout, "\tint op;\n");
- f_print(fout, "\tXDR z_xdrs;\n");
- f_print(fout, "\t" "afs_int32 z_result;\n\n");
- f_print(fout, "\txdrrx_create(&z_xdrs, z_call, XDR_DECODE);\n");
- f_print(fout, "\tz_result = RXGEN_DECODE;\n");
- f_print(fout, "\tif (!xdr_int(&z_xdrs, &op)) goto fail;\n");
+ }
+ else {
+ f_print(fout,
+ "\nint %s%sExecuteRequest (struct rx_call *z_call)\n",
+ prefix,
+ (combinepackages ? MasterPrefix : PackagePrefix[PackageIndex]));
+ f_print(fout, "{\n");
+ f_print(fout, "\tint op;\n");
+ f_print(fout, "\tXDR z_xdrs;\n");
+ f_print(fout, "\t" "afs_int32 z_result;\n\n");
+ f_print(fout, "\txdrrx_create(&z_xdrs, z_call, XDR_DECODE);\n");
+ f_print(fout, "\tz_result = RXGEN_DECODE;\n");
+ f_print(fout, "\tif (!xdr_int(&z_xdrs, &op)) goto fail;\n");
+ }
f_print(fout, "\tswitch (op) {\n");
}
static void
proc_er_case(definition * defp)
{
+ if ( cflag ) {
+ f_print(fout, "\t\tcase %d:", defp->pc.proc_opcodenum);
+ f_print(fout, "\treturn \"%s%s\";\n",
+ defp->pc.proc_prefix, defp->pc.proc_name);
+ return;
+ }
if (opcodesnotallowed[PackageIndex]) {
f_print(fout, "\t\tcase %d:\n", defp->pc.proc_opcodenum);
} else {
er_TailofOldStyleProc_setup(void)
{
f_print(fout, "\t\tdefault:\n");
+ if ( cflag ) {
+ f_print(fout, "\t\t\treturn NULL;\n\t}\n}\n");
+ return;
+ }
f_print(fout, "\t\t\tz_result = RXGEN_OPCODE;\n");
f_print(fout, "\t\t\tbreak;\n\t}\n");
f_print(fout, "fail:\n");
git://git.openafs.org / openafs.git / blobdiff