Index: head/usr.bin/rpcgen/rpc_util.c =================================================================== --- head/usr.bin/rpcgen/rpc_util.c (revision 299508) +++ head/usr.bin/rpcgen/rpc_util.c (revision 299509) @@ -1,511 +1,511 @@ /* * 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. * * 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 */ #if 0 #ifndef lint #ident "@(#)rpc_util.c 1.14 93/07/05 SMI" static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI"; #endif #endif #include __FBSDID("$FreeBSD$"); /* * rpc_util.c, Utility routines for the RPC protocol compiler * Copyright (C) 1989, Sun Microsystems, Inc. */ #include #include #include #include #include #include "rpc_parse.h" #include "rpc_scan.h" #include "rpc_util.h" #define ARGEXT "argument" char curline[MAXLINESIZE]; /* current read line */ char *where = curline; /* current point in line */ int linenum = 0; /* current line number */ const char *infilename; /* input filename */ #define NFILES 7 static const char *outfiles[NFILES]; /* output file names */ static int nfiles; FILE *fout; /* file pointer of current output */ FILE *fin; /* file pointer of current input */ list *defined; /* list of defined things */ static void printwhere( void ); /* * Reinitialize the world */ void reinitialize(void) { memset(curline, 0, MAXLINESIZE); where = curline; linenum = 0; defined = NULL; } /* * string equality */ int streq(const char *a, const char *b) { return (strcmp(a, b) == 0); } /* * find a value in a list */ definition * findval(list *lst, const char *val, int (*cmp)(definition *, const char *)) { for (; lst != NULL; lst = lst->next) { if ((*cmp) (lst->val, val)) { return (lst->val); } } return (NULL); } /* * store a value in a list */ void storeval(list **lstp, definition *val) { list **l; list *lst; for (l = lstp; *l != NULL; l = (list **) & (*l)->next); lst = XALLOC(list); lst->val = val; lst->next = NULL; *l = lst; } static int findit(definition *def, const char *type) { return (streq(def->def_name, type)); } static const char * fixit(const char *type, const char *orig) { definition *def; def = (definition *) FINDVAL(defined, type, findit); if (def == NULL || def->def_kind != DEF_TYPEDEF) { return (orig); } switch (def->def.ty.rel) { case REL_VECTOR: if (streq(def->def.ty.old_type, "opaque")) return ("char"); else return (def->def.ty.old_type); case REL_ALIAS: return (fixit(def->def.ty.old_type, orig)); default: return (orig); } } const char * fixtype(const char *type) { return (fixit(type, type)); } const char * stringfix(const char *type) { if (streq(type, "string")) { return ("wrapstring"); } else { return (type); } } void ptype(const char *prefix, const char *type, int follow) { if (prefix != NULL) { if (streq(prefix, "enum")) { f_print(fout, "enum "); } else { f_print(fout, "struct "); } } if (streq(type, "bool")) { f_print(fout, "bool_t "); } else if (streq(type, "string")) { f_print(fout, "char *"); } else { f_print(fout, "%s ", follow ? fixtype(type) : type); } } static int typedefed(definition *def, const char *type) { if (def->def_kind != DEF_TYPEDEF || def->def.ty.old_prefix != NULL) { return (0); } else { return (streq(def->def_name, type)); } } int isvectordef(const char *type, relation rel) { definition *def; for (;;) { switch (rel) { case REL_VECTOR: return (!streq(type, "string")); case REL_ARRAY: return (0); case REL_POINTER: return (0); case REL_ALIAS: def = (definition *) FINDVAL(defined, type, typedefed); if (def == NULL) { return (0); } type = def->def.ty.old_type; rel = def->def.ty.rel; } } return (0); } char * locase(const char *str) { char c; static char buf[100]; char *p = buf; while ( (c = *str++) ) { *p++ = (c >= 'A' && c <= 'Z') ? (c - 'A' + 'a') : c; } *p = 0; return (buf); } void pvname_svc(const char *pname, const char *vnum) { f_print(fout, "%s_%s_svc", locase(pname), vnum); } void pvname(const char *pname, const char *vnum) { f_print(fout, "%s_%s", locase(pname), vnum); } /* * print a useful (?) error message, and then die */ void error(const char *msg) { printwhere(); warnx("%s, line %d: %s", infilename, linenum, msg); crash(); } /* * Something went wrong, unlink any files that we may have created and then * die. */ -void +void __dead2 crash(void) { int i; for (i = 0; i < nfiles; i++) { (void) unlink(outfiles[i]); } exit(1); } void record_open(const char *file) { if (nfiles < NFILES) { outfiles[nfiles++] = file; } else { warnx("too many files"); crash(); } } static char expectbuf[100]; static const char *toktostr(tok_kind kind); /* * error, token encountered was not the expected one */ void expected1(tok_kind exp1) { s_print(expectbuf, "expected '%s'", toktostr(exp1)); error(expectbuf); } /* * error, token encountered was not one of two expected ones */ void expected2(tok_kind exp1, tok_kind exp2) { s_print(expectbuf, "expected '%s' or '%s'", toktostr(exp1), toktostr(exp2)); error(expectbuf); } /* * error, token encountered was not one of 3 expected ones */ void expected3(tok_kind exp1, tok_kind exp2, tok_kind exp3) { s_print(expectbuf, "expected '%s', '%s' or '%s'", toktostr(exp1), toktostr(exp2), toktostr(exp3)); error(expectbuf); } void tabify(FILE *f, int tab) { while (tab--) { (void) fputc('\t', f); } } static token tokstrings[] = { {TOK_IDENT, "identifier"}, {TOK_CONST, "const"}, {TOK_RPAREN, ")"}, {TOK_LPAREN, "("}, {TOK_RBRACE, "}"}, {TOK_LBRACE, "{"}, {TOK_LBRACKET, "["}, {TOK_RBRACKET, "]"}, {TOK_STAR, "*"}, {TOK_COMMA, ","}, {TOK_EQUAL, "="}, {TOK_COLON, ":"}, {TOK_SEMICOLON, ";"}, {TOK_UNION, "union"}, {TOK_STRUCT, "struct"}, {TOK_SWITCH, "switch"}, {TOK_CASE, "case"}, {TOK_DEFAULT, "default"}, {TOK_ENUM, "enum"}, {TOK_TYPEDEF, "typedef"}, {TOK_INT, "int"}, {TOK_SHORT, "short"}, {TOK_LONG, "long"}, {TOK_UNSIGNED, "unsigned"}, {TOK_DOUBLE, "double"}, {TOK_FLOAT, "float"}, {TOK_CHAR, "char"}, {TOK_STRING, "string"}, {TOK_OPAQUE, "opaque"}, {TOK_BOOL, "bool"}, {TOK_VOID, "void"}, {TOK_PROGRAM, "program"}, {TOK_VERSION, "version"}, {TOK_EOF, "??????"} }; static const char * toktostr(tok_kind kind) { token *sp; for (sp = tokstrings; sp->kind != TOK_EOF && sp->kind != kind; sp++); return (sp->str); } static void printbuf(void) { char c; int i; int cnt; # define TABSIZE 4 for (i = 0; (c = curline[i]); i++) { if (c == '\t') { cnt = 8 - (i % TABSIZE); c = ' '; } else { cnt = 1; } while (cnt--) { (void) fputc(c, stderr); } } } static void printwhere(void) { int i; char c; int cnt; printbuf(); for (i = 0; i < where - curline; i++) { c = curline[i]; if (c == '\t') { cnt = 8 - (i % TABSIZE); } else { cnt = 1; } while (cnt--) { (void) fputc('^', stderr); } } (void) fputc('\n', stderr); } char * make_argname(const char *pname, const char *vname) { char *name; name = xmalloc(strlen(pname) + strlen(vname) + strlen(ARGEXT) + 3); sprintf(name, "%s_%s_%s", locase(pname), vname, ARGEXT); return (name); } bas_type *typ_list_h; bas_type *typ_list_t; void add_type(int len, const char *type) { bas_type *ptr; ptr = XALLOC(bas_type); ptr->name = type; ptr->length = len; ptr->next = NULL; if (typ_list_t == NULL) { typ_list_t = ptr; typ_list_h = ptr; } else { typ_list_t->next = ptr; typ_list_t = ptr; } } bas_type * find_type(const char *type) { bas_type * ptr; ptr = typ_list_h; while (ptr != NULL) { if (strcmp(ptr->name, type) == 0) return (ptr); else ptr = ptr->next; } return (NULL); } void * xmalloc(size_t size) { void *p; if ((p = malloc(size)) == NULL) { warnx("malloc failed"); crash(); } return (p); } void * xrealloc(void *ptr, size_t size) { void *p; if ((p = realloc(ptr, size)) == NULL) { warnx("realloc failed"); crash(); } return (p); } char * xstrdup(const char *str) { char *p; if ((p = strdup(str)) == NULL) { warnx("strdup failed"); crash(); } return (p); } Index: head/usr.bin/rpcgen/rpc_util.h =================================================================== --- head/usr.bin/rpcgen/rpc_util.h (revision 299508) +++ head/usr.bin/rpcgen/rpc_util.h (revision 299509) @@ -1,230 +1,230 @@ /* * $FreeBSD$ */ /* * 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. * * 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 */ /* #pragma ident "@(#)rpc_util.h 1.16 94/05/15 SMI" */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF AT&T */ /* The copyright notice above does not evidence any */ /* actual or intended publication of such source code. */ /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++ * PROPRIETARY NOTICE (Combined) * * This source code is unpublished proprietary information * constituting, or derived under license from AT&T's UNIX(r) System V. * In addition, portions of such source code were derived from Berkeley * 4.3 BSD under license from the Regents of the University of * California. * * * * Copyright Notice * * Notice of copyright on this source code product does not indicate * publication. * * (c) 1986,1987,1988.1989 Sun Microsystems, Inc * (c) 1983,1984,1985,1986,1987,1988,1989 AT&T. * All rights reserved. */ /* @(#)rpc_util.h 1.5 90/08/29 (C) 1987 SMI */ /* * rpc_util.h, Useful definitions for the RPC protocol compiler */ #include #include #define XALLOC(object) (object *) xmalloc(sizeof(object)) #define s_print (void) sprintf #define f_print (void) fprintf struct list { definition *val; struct list *next; }; typedef struct list list; struct xdrfunc { const char *name; int pointerp; struct xdrfunc *next; }; typedef struct xdrfunc xdrfunc; struct commandline { int cflag; /* xdr C routines */ int hflag; /* header file */ int lflag; /* client side stubs */ int mflag; /* server side stubs */ int nflag; /* netid flag */ int sflag; /* server stubs for the given transport */ int tflag; /* dispatch Table file */ int Ssflag; /* produce server sample code */ int Scflag; /* produce client sample code */ int makefileflag; /* Generate a template Makefile */ const char *infile; /* input module name */ const char *outfile; /* output module name */ }; #define PUT 1 #define GET 2 /* * Global variables */ #define MAXLINESIZE 1024 extern char curline[MAXLINESIZE]; extern char *where; extern int linenum; extern int tirpc_socket; extern const char *infilename; extern FILE *fout; extern FILE *fin; extern list *defined; extern bas_type *typ_list_h; extern bas_type *typ_list_t; extern xdrfunc *xdrfunc_head, *xdrfunc_tail; /* * All the option flags */ extern int inetdflag; extern int pmflag; extern int tblflag; extern int logflag; extern int newstyle; extern int CCflag; /* C++ flag */ extern int tirpcflag; /* flag for generating tirpc code */ extern int inline_size; /* if this is 0, then do not generate inline code */ extern int mtflag; /* * Other flags related with inetd jumpstart. */ extern int indefinitewait; extern int exitnow; extern int timerflag; extern int nonfatalerrors; extern pid_t childpid; /* * rpc_util routines */ void reinitialize(void); -void crash(void); +void crash(void) __dead2; void add_type(int len, const char *type); void storeval(list **lstp, definition *val); void *xmalloc(size_t size); void *xrealloc(void *ptr, size_t size); char *xstrdup(const char *); char *make_argname(const char *pname, const char *vname); #define STOREVAL(list,item) \ storeval(list,item) definition *findval(list *lst, const char *val, int (*cmp)(definition *, const char *)); #define FINDVAL(list,item,finder) \ findval(list, item, finder) const char *fixtype(const char *type); const char *stringfix(const char *type); char *locase(const char *str); void pvname_svc(const char *pname, const char *vnum); void pvname(const char *pname, const char *vnum); void ptype(const char *prefix, const char *type, int follow); int isvectordef(const char *type, relation rel); int streq(const char *a, const char *b); void error(const char *msg); void expected1(tok_kind exp1); void expected2(tok_kind exp1, tok_kind exp2); void expected3(tok_kind exp1, tok_kind exp2, tok_kind exp3); void tabify(FILE *f, int tab); void record_open(const char *file); bas_type *find_type(const char *type); /* * rpc_cout routines */ void emit(definition *def); /* * rpc_hout routines */ void pdeclaration(const char *name, declaration *dec, int tab, const char *separator); void print_datadef(definition *def, int headeronly); void print_funcdef(definition *def, int headeronly); void print_xdr_func_def(const char* name, int pointerp); /* * rpc_svcout routines */ void write_most(const char *infile, int netflag, int nomain); void write_rest(void); void write_programs(const char *storage); void write_svc_aux(int nomain); void write_inetd_register(const char *transp); void write_netid_register(const char *transp); void write_nettype_register(const char *transp); int nullproc(proc_list *proc); /* * rpc_clntout routines */ void write_stubs(void); void printarglist(proc_list *proc, const char *result, const char *addargname, const char *addargtype); /* * rpc_tblout routines */ void write_tables(void); /* * rpc_sample routines */ void write_sample_svc(definition *); int write_sample_clnt(definition *); void write_sample_clnt_main(void); void add_sample_msg(void);