#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;
};
#define MAXCPPARGS 256 /* maximum number of arguments to cpp */
-#define MAXCMDLINE 1024 /* MAX chars on a single cmd line */
char *prefix = "";
static char *IncludeDir[MAXCPPARGS];
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;
-#else /* AFS_NT40_ENV */
#ifdef PATH_CPP
-static char CPP[] = PATH_CPP;
+static char *CPP = PATH_CPP;
+#else
+#ifdef AFS_NT40_ENV
+static char *CPP = "cl /EP /C /nologo";
#else
-static char CPP[] = "/lib/cpp";
+static char *CPP = "/lib/cpp";
+#endif
#endif
-#endif /* AFS_NT40_ENV */
-static char CPPFLAGS[] = "-C";
-#ifdef AFS_ALPHA_ENV
/*
* Running "cpp" directly on DEC OSF/1 does not define anything; the "cc"
* driver is responsible. To compensate (and allow for other definitions
* which should always be passed to "cpp"), place definitions which whould
- * always be passed to "rxgen" in this table.
+ * always be passed to "rxgen" in this string.
*/
-static char *XTRA_CPPFLAGS[] = {
+static char *CPPFLAGS = "-C"
+#ifdef AFS_ALPHA_ENV
#ifdef __alpha
- "-D__alpha",
+ " -D__alpha"
#endif /* __alpha */
#ifdef OSF
- "-DOSF",
+ " -DOSF"
#endif /* OSF */
- NULL
-};
#endif
+;
#include "AFS_component_version_number.c"
main(int argc, char *argv[])
{
struct commandline cmd;
+ char *ep;
-#ifdef AFS_NT40_ENV
- /* initialize CPP with the correct pre-processor for Windows */
- CPP = getenv("RXGEN_CPPCMD");
- if (!CPP)
- CPP = "cl /EP /C /nologo";
-#endif /* AFS_NT40_ENV */
-
+ ep = getenv("RXGEN_CPPCMD");
+ if (ep)
+ CPP = ep;
#ifdef AFS_AIX32_ENV
/*
* The following signal action for AIX is necessary so that in case of a
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);
static void
open_input(char *infile, char *define)
{
- char cpp_cmdline[MAXCMDLINE];
+ char *cpp_cmdline;
+ int i, l = 0;
- int i;
if (debug == 0) {
infilename = (infile == NULL) ? "<stdin>" : infile;
- strcpy(cpp_cmdline, CPP);
- strcat(cpp_cmdline, " ");
- strcat(cpp_cmdline, CPPFLAGS);
- strcat(cpp_cmdline, " ");
- strcat(cpp_cmdline, define);
-
-#ifdef AFS_ALPHA_ENV
- for (i = 0;
- i < (sizeof(XTRA_CPPFLAGS) / sizeof(XTRA_CPPFLAGS[0])) - 1;
- i++) {
- strcat(cpp_cmdline, " ");
- strcat(cpp_cmdline, XTRA_CPPFLAGS[i]);
+ l = strlen(CPP) + strlen(CPPFLAGS) + strlen(define) + 3;
+ for (i = 0; i < nincludes; i++)
+ l += strlen(IncludeDir[i]) + 1;
+ l += strlen(infile) + 1;
+ cpp_cmdline = malloc(l);
+ if (!cpp_cmdline) {
+ perror("Unable to allocate space for cpp command line");
+ crash();
}
-#endif
+
+ sprintf(cpp_cmdline, "%s %s %s", CPP, CPPFLAGS, define);
+ l = strlen(cpp_cmdline);
for (i = 0; i < nincludes; i++) {
- strcat(cpp_cmdline, " ");
- strcat(cpp_cmdline, IncludeDir[i]);
+ cpp_cmdline[l++] = ' ';
+ strcpy(cpp_cmdline + l, IncludeDir[i]);
+ l += strlen(IncludeDir[i]);
}
-
- strcat(cpp_cmdline, " ");
- strcat(cpp_cmdline, infile);
+ cpp_cmdline[l++] = ' ';
+ strcpy(cpp_cmdline + l, infile);
fin = popen(cpp_cmdline, "r");
if (fin == NULL)
}
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"))) {
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");
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");
return;
}
if (nomain) {
- write_programs((char *)NULL);
+ write_programs(NULL);
} else {
write_most();
do_registers(argc, argv);
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 <afs/opr.h>\n");
+ f_print(fout, "#ifdef AFS_PTHREAD_ENV\n");
+ f_print(fout, "# include <opr/lock.h>\n");
+ f_print(fout, "#endif\n");
f_print(fout, "#include \"%s\"\n\n", include);
}
free(include);
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 (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");
}
}
case 'm':
case 'C':
case 'S':
+ case 'b':
case 'r':
case 'R':
case 'k':
prefix = &argv[i][j + 1];
goto nextarg;
case 'I':
+ if (nincludes >= MAXCPPARGS) {
+ f_print(stderr, "Too many -I arguments\n");
+ return (0);
+ }
if (argv[i][j - 1] != '-')
return (0);
IncludeDir[nincludes++] = &argv[i][j - 1];
}
}
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'];