* 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_main.c, Top level of the RPC protocol compiler.
- * Copyright (C) 1987, Sun Microsystems, Inc.
+ * rpc_main.c, Top level of the RPC protocol compiler.
+ * Copyright (C) 1987, Sun Microsystems, Inc.
*/
#include <afsconfig.h>
#include <afs/param.h>
+#include <roken.h>
#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <ctype.h>
-#include <string.h>
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+
#include "rpc_scan.h"
#include "rpc_parse.h"
#include "rpc_util.h"
struct commandline {
int ansic_flag;
+ int brief_flag;
int cflag;
int hflag;
int lflag;
char OutFile[256];
char Sflag = 0, Cflag = 0, hflag = 0, cflag = 0, kflag = 0, uflag = 0;
char ansic_flag = 0; /* If set, build ANSI C style prototypes */
+char brief_flag = 0; /* If set, shorten names */
char zflag = 0; /* If set, abort server stub if rpc call returns non-zero */
char xflag = 0; /* if set, add stats code to stubs */
char yflag = 0; /* if set, only emit function name arrays to xdr file */
int debug = 0;
+static int pclose_fin = 0;
static char *cmdname;
#ifdef AFS_NT40_ENV
static char *CPP = NULL;
if (!CPP)
CPP = "cl /EP /C /nologo";
#endif /* AFS_NT40_ENV */
-
+
#ifdef AFS_AIX32_ENV
/*
- * The following signal action for AIX is necessary so that in case of a
- * crash (i.e. core is generated) we can include the user's data section
+ * The following signal action for AIX is necessary so that in case of a
+ * crash (i.e. core is generated) we can include the user's data section
* in the core dump. Unfortunately, by default, only a partial core is
* generated which, in many cases, isn't too useful.
*/
if (!parseargs(argc, argv, &cmd)) {
f_print(stderr, "usage: %s infile\n", cmdname);
f_print(stderr,
- " %s [-c | -h | -l | -m | -C | -S | -r | -k | -R | -p | -d | -z | -u] [-Pprefix] [-Idir] [-o outfile] [infile]\n",
+ " %s [-c | -h | -l | -m | -C | -S | -r | -b | -k | -R | -p | -d | -z | -u] [-Pprefix] [-Idir] [-o outfile] [infile]\n",
cmdname);
f_print(stderr, " %s [-s udp|tcp]* [-o outfile] [infile]\n",
cmdname);
reinitialize();
}
}
+ if (fin && pclose_fin) {
+ /* the cpp command we called returned a non-zero exit status */
+ if (pclose(fin)) {
+ crash();
+ }
+ }
exit(0);
}
/*
- * add extension to filename
+ * add extension to filename
*/
static char *
extendfile(char *file, char *ext)
}
/*
- * Open output file with given extension
+ * Open output file with given extension
*/
static void
open_output(char *infile, char *outfile)
}
/*
- * Open input file with given define for C-preprocessor
+ * Open input file with given define for C-preprocessor
*/
static void
open_input(char *infile, char *define)
fin = popen(cpp_cmdline, "r");
if (fin == NULL)
perror("popen");
+ pclose_fin = 1;
} else {
if (infile == NULL) {
f_print(fout, "/* Machine generated file -- Do NOT edit */\n\n");
if (xflag) {
if (kflag) {
+ f_print(fout, "#include \"afsconfig.h\"\n");
f_print(fout, "#include \"afs/param.h\"\n");
} else {
+ f_print(fout, "#include <afsconfig.h>\n");
f_print(fout, "#include <afs/param.h>\n");
+ f_print(fout, "#include <roken.h>\n");
}
f_print(fout, "#ifdef AFS_NT40_ENV\n");
f_print(fout, "#define AFS_RXGEN_EXPORT __declspec(dllexport)\n");
+ f_print(fout, "#include <winsock2.h>\n");
f_print(fout, "#endif /* AFS_NT40_ENV */\n");
}
if (currfile && (include = extendfile(currfile, ".h"))) {
f_print(fout, "#include \"netinet/in.h\"\n");
f_print(fout, "#include \"h/time.h\"\n");
f_print(fout, "#include \"rx/xdr.h\"\n");
- f_print(fout, "#include \"rxgen_consts.h\"\n");
+ f_print(fout, "#include \"afs/rxgen_consts.h\"\n");
} else {
f_print(fout, "#include <rx/xdr.h>\n");
}
}
}
+
f_print(fout, "\n};\n");
}
+ er_Proc_CodeGeneration();
}
if (extend && tell == ftell(fout)) {
if (xflag) {
f_print(fout, "#include \"rx/rx_globals.h\"\n");
}
+ if (brief_flag) {
+ f_print(fout, "#include \"rx/rx_opaque.h\"\n");
+ }
if (uflag)
f_print(fout, "#include <ubik.h>\n");
f_print(fout, "#else /* UKERNEL */\n");
f_print(fout, "#include \"rx/xdr.h\"\n");
f_print(fout, "#endif /* XDR_GETLONG */\n");
f_print(fout, "#endif /* UKERNEL */\n");
- f_print(fout, "#include \"rxgen_consts.h\"\n");
+ f_print(fout, "#include \"afs/rxgen_consts.h\"\n");
f_print(fout, "#include \"afs_osi.h\"\n");
f_print(fout, "#include \"rx/rx.h\"\n");
if (xflag) {
f_print(fout, "#include \"rx/rx_globals.h\"\n");
}
+ if (brief_flag) {
+ f_print(fout, "#include \"rx/rx_opaque.h\"\n");
+ }
f_print(fout, "#else /* KERNEL */\n");
f_print(fout, "#include <afs/param.h>\n");
f_print(fout, "#include <afs/stds.h>\n");
if (xflag) {
f_print(fout, "#include <rx/rx_globals.h>\n");
}
+ if (brief_flag) {
+ f_print(fout, "#include <rx/rx_opaque.h>\n");
+ }
f_print(fout, "#include <afs/rxgen_consts.h>\n");
if (uflag)
f_print(fout, "#include <ubik.h>\n");
while ((def = get_definition())) {
print_datadef(def);
}
+ h_Proc_CodeGeneration();
h_opcode_stats();
hflag = 0;
f_print(fout, "#endif /* _RXGEN_%s_ */\n", uppercase(fullname));
}
/*
- * Perform registrations for service output
+ * Perform registrations for service output
*/
static void
do_registers(int argc, char *argv[])
if (kflag) {
f_print(fout, "#include \"%s\"\n\n", include);
} else {
+ f_print(fout, "#include <afsconfig.h>\n");
+ f_print(fout, "#include <afs/param.h>\n");
+ f_print(fout, "#include <roken.h>\n");
f_print(fout, "#include \"%s\"\n\n", include);
}
free(include);
f_print(fout, "#include \"h/time.h\"\n");
f_print(fout, "#include \"rpc/types.h\"\n");
f_print(fout, "#include \"rx/xdr.h\"\n");
- f_print(fout, "#include \"rxgen_consts.h\"\n");
+ f_print(fout, "#include \"afs/rxgen_consts.h\"\n");
f_print(fout, "#include \"afs/afs_osi.h\"\n");
f_print(fout, "#include \"rx/rx.h\"\n");
if (xflag) {
f_print(fout, "#include \"rx/rx_globals.h\"\n");
}
+ if (brief_flag) {
+ f_print(fout, "#include \"rx/rx_opaque.h\"\n");
+ }
} else {
f_print(fout, "#include <sys/types.h>\n");
f_print(fout, "#include <rx/xdr.h>\n");
if (xflag) {
f_print(fout, "#include <rx/rx_globals.h>\n");
}
+ if (brief_flag) {
+ f_print(fout, "#include <rx/rx_opaque.h\"\n");
+ }
f_print(fout, "#include <afs/rxgen_consts.h>\n");
}
}
if (kflag) {
f_print(fout, "#include \"%s\"\n", include);
} else {
+ f_print(fout, "#include <afsconfig.h>\n");
+ f_print(fout, "#include <afs/param.h>\n");
+ f_print(fout, "#include <roken.h>\n");
f_print(fout, "#include \"%s\"\n\n", include);
}
free(include);
f_print(fout, "#include \"h/time.h\"\n");
f_print(fout, "#include \"rpc/types.h\"\n");
f_print(fout, "#include \"rx/xdr.h\"\n");
- f_print(fout, "#include \"rxgen_consts.h\"\n");
+ f_print(fout, "#include \"afs/rxgen_consts.h\"\n");
f_print(fout, "#include \"afs/afs_osi.h\"\n");
f_print(fout, "#include \"rx/rx.h\"\n");
if (xflag) {
f_print(fout, "#include \"rx/rx_globals.h\"\n");
}
+ if (brief_flag) {
+ f_print(fout, "#include \"rx/rx_opaque.h\"\n");
+ }
} else {
f_print(fout, "#include <sys/types.h>\n");
f_print(fout, "#include <rx/xdr.h>\n");
if (xflag) {
f_print(fout, "#include <rx/rx_globals.h>\n");
}
+ if (brief_flag) {
+ f_print(fout, "#include <rx/rx_opaque.h>\n");
+ }
f_print(fout, "#include <afs/rxgen_consts.h>\n");
}
}
}
/*
- * Parse command line arguments
+ * Parse command line arguments
*/
static int
parseargs(int argc, char *argv[], struct commandline *cmd)
case 'm':
case 'C':
case 'S':
+ case 'b':
case 'r':
case 'R':
case 'k':
}
}
cmd->ansic_flag = ansic_flag = flag['A'];
+ cmd->brief_flag = brief_flag = flag['b'];
cmd->cflag = cflag = flag['c'];
cmd->hflag = hflag = flag['h'];
cmd->sflag = flag['s'];