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
546 lines
9.8 KiB
C
546 lines
9.8 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_scan.c 1.11 89/02/22 (C) 1987 SMI
|
|
*/
|
|
char scan_rcsid[] =
|
|
"$Id$";
|
|
|
|
/*
|
|
* rpc_scan.c, Scanner for the RPC protocol compiler
|
|
* Copyright (C) 1987, Sun Microsystems, Inc.
|
|
*/
|
|
#include <stdio.h>
|
|
#include <ctype.h>
|
|
#include <string.h>
|
|
#include "rpc_scan.h"
|
|
#include "rpc_parse.h"
|
|
#include "rpc_util.h"
|
|
#include "proto.h"
|
|
|
|
#define startcomment(where) (where[0] == '/' && where[1] == '*')
|
|
#define endcomment(where) (where[-1] == '*' && where[0] == '/')
|
|
|
|
static int pushed = 0; /* is a token pushed */
|
|
static token lasttok; /* last token, if pushed */
|
|
|
|
static void unget_token (token * tokp);
|
|
static void findstrconst (const char **str, const char **val);
|
|
static void findchrconst (const char **str, const char **val);
|
|
static void findconst (const char **str, const char **val);
|
|
static void findkind (const char **mark, token * tokp);
|
|
static int cppline (const char *line);
|
|
static int directive (const char *line);
|
|
static void printdirective (const char *line);
|
|
static void docppline (const char *line, int *lineno, const char **fname);
|
|
|
|
/*
|
|
* scan expecting 1 given token
|
|
*/
|
|
void
|
|
scan (tok_kind expect, token * tokp)
|
|
{
|
|
get_token (tokp);
|
|
if (tokp->kind != expect)
|
|
expected1 (expect);
|
|
}
|
|
|
|
/*
|
|
* scan expecting any of the 2 given tokens
|
|
*/
|
|
void
|
|
scan2 (tok_kind expect1, tok_kind expect2, token * tokp)
|
|
{
|
|
get_token (tokp);
|
|
if (tokp->kind != expect1 && tokp->kind != expect2)
|
|
{
|
|
expected2 (expect1, expect2);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* scan expecting any of the 3 given token
|
|
*/
|
|
void
|
|
scan3 (tok_kind expect1, tok_kind expect2, tok_kind expect3, token * tokp)
|
|
{
|
|
get_token (tokp);
|
|
if (tokp->kind != expect1 && tokp->kind != expect2
|
|
&& tokp->kind != expect3)
|
|
{
|
|
expected3 (expect1, expect2, expect3);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* scan expecting a constant, possibly symbolic
|
|
*/
|
|
void
|
|
scan_num (token *tokp)
|
|
{
|
|
get_token (tokp);
|
|
switch (tokp->kind)
|
|
{
|
|
case TOK_IDENT:
|
|
break;
|
|
default:
|
|
error (_("constant or identifier expected"));
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Peek at the next token
|
|
*/
|
|
void
|
|
peek (token *tokp)
|
|
{
|
|
get_token (tokp);
|
|
unget_token (tokp);
|
|
}
|
|
|
|
/*
|
|
* Peek at the next token and scan it if it matches what you expect
|
|
*/
|
|
int
|
|
peekscan (tok_kind expect, token *tokp)
|
|
{
|
|
peek (tokp);
|
|
if (tokp->kind == expect)
|
|
{
|
|
get_token (tokp);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Get the next token, printing out any directive that are encountered.
|
|
*/
|
|
void
|
|
get_token (token *tokp)
|
|
{
|
|
int commenting;
|
|
|
|
if (pushed)
|
|
{
|
|
pushed = 0;
|
|
*tokp = lasttok;
|
|
return;
|
|
}
|
|
commenting = 0;
|
|
for (;;)
|
|
{
|
|
if (*where == 0)
|
|
{
|
|
for (;;)
|
|
{
|
|
if (!fgets (curline, MAXLINESIZE, fin))
|
|
{
|
|
tokp->kind = TOK_EOF;
|
|
*curline = 0;
|
|
where = curline;
|
|
return;
|
|
}
|
|
linenum++;
|
|
if (commenting)
|
|
{
|
|
break;
|
|
}
|
|
else if (cppline (curline))
|
|
{
|
|
docppline (curline, &linenum,
|
|
&infilename);
|
|
}
|
|
else if (directive (curline))
|
|
{
|
|
printdirective (curline);
|
|
}
|
|
else
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
where = curline;
|
|
}
|
|
else if (isspace (*where))
|
|
{
|
|
while (isspace (*where))
|
|
{
|
|
where++; /* eat */
|
|
}
|
|
}
|
|
else if (commenting)
|
|
{
|
|
for (where++; *where; where++)
|
|
{
|
|
if (endcomment (where))
|
|
{
|
|
where++;
|
|
commenting--;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
else if (startcomment (where))
|
|
{
|
|
where += 2;
|
|
commenting++;
|
|
}
|
|
else
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* 'where' is not whitespace, comment or directive Must be a token!
|
|
*/
|
|
switch (*where)
|
|
{
|
|
case ':':
|
|
tokp->kind = TOK_COLON;
|
|
where++;
|
|
break;
|
|
case ';':
|
|
tokp->kind = TOK_SEMICOLON;
|
|
where++;
|
|
break;
|
|
case ',':
|
|
tokp->kind = TOK_COMMA;
|
|
where++;
|
|
break;
|
|
case '=':
|
|
tokp->kind = TOK_EQUAL;
|
|
where++;
|
|
break;
|
|
case '*':
|
|
tokp->kind = TOK_STAR;
|
|
where++;
|
|
break;
|
|
case '[':
|
|
tokp->kind = TOK_LBRACKET;
|
|
where++;
|
|
break;
|
|
case ']':
|
|
tokp->kind = TOK_RBRACKET;
|
|
where++;
|
|
break;
|
|
case '{':
|
|
tokp->kind = TOK_LBRACE;
|
|
where++;
|
|
break;
|
|
case '}':
|
|
tokp->kind = TOK_RBRACE;
|
|
where++;
|
|
break;
|
|
case '(':
|
|
tokp->kind = TOK_LPAREN;
|
|
where++;
|
|
break;
|
|
case ')':
|
|
tokp->kind = TOK_RPAREN;
|
|
where++;
|
|
break;
|
|
case '<':
|
|
tokp->kind = TOK_LANGLE;
|
|
where++;
|
|
break;
|
|
case '>':
|
|
tokp->kind = TOK_RANGLE;
|
|
where++;
|
|
break;
|
|
|
|
case '"':
|
|
tokp->kind = TOK_STRCONST;
|
|
findstrconst (&where, &tokp->str);
|
|
break;
|
|
case '\'':
|
|
tokp->kind = TOK_CHARCONST;
|
|
findchrconst (&where, &tokp->str);
|
|
break;
|
|
|
|
case '-':
|
|
case '0':
|
|
case '1':
|
|
case '2':
|
|
case '3':
|
|
case '4':
|
|
case '5':
|
|
case '6':
|
|
case '7':
|
|
case '8':
|
|
case '9':
|
|
tokp->kind = TOK_IDENT;
|
|
findconst (&where, &tokp->str);
|
|
break;
|
|
|
|
default:
|
|
if (!(isalpha (*where) || *where == '_'))
|
|
{
|
|
char buf[100];
|
|
char *p;
|
|
|
|
s_print (buf, _("illegal character in file: "));
|
|
p = buf + strlen (buf);
|
|
if (isprint (*where))
|
|
{
|
|
s_print (p, "%c", *where);
|
|
}
|
|
else
|
|
{
|
|
s_print (p, "%d", *where);
|
|
}
|
|
error (buf);
|
|
}
|
|
findkind (&where, tokp);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
unget_token (token * tokp)
|
|
{
|
|
lasttok = *tokp;
|
|
pushed = 1;
|
|
}
|
|
|
|
static void
|
|
findstrconst (const char **str, const char **val)
|
|
{
|
|
const char *p;
|
|
char *tmp;
|
|
int size;
|
|
|
|
p = *str;
|
|
do
|
|
{
|
|
p++;
|
|
}
|
|
while (*p && *p != '"');
|
|
if (*p == 0)
|
|
{
|
|
error (_("unterminated string constant"));
|
|
}
|
|
p++;
|
|
size = p - *str;
|
|
tmp = alloc (size + 1);
|
|
strncpy (tmp, *str, size);
|
|
tmp[size] = 0;
|
|
*val = tmp;
|
|
*str = p;
|
|
}
|
|
|
|
static void
|
|
findchrconst (const char **str, const char **val)
|
|
{
|
|
const char *p;
|
|
char *tmp;
|
|
int size;
|
|
|
|
p = *str;
|
|
do
|
|
{
|
|
p++;
|
|
}
|
|
while (*p && *p != '\'');
|
|
if (*p == 0)
|
|
{
|
|
error (_("unterminated string constant"));
|
|
}
|
|
p++;
|
|
size = p - *str;
|
|
if (size != 3)
|
|
{
|
|
error (_("empty char string"));
|
|
}
|
|
tmp = alloc (size + 1);
|
|
strncpy (tmp, *str, size);
|
|
tmp[size] = 0;
|
|
*val = tmp;
|
|
*str = p;
|
|
}
|
|
|
|
static void
|
|
findconst (const char **str, const char **val)
|
|
{
|
|
const char *p;
|
|
char *tmp;
|
|
int size;
|
|
|
|
p = *str;
|
|
if (*p == '0' && *(p + 1) == 'x')
|
|
{
|
|
p++;
|
|
do
|
|
{
|
|
p++;
|
|
}
|
|
while (isxdigit (*p));
|
|
}
|
|
else
|
|
{
|
|
do
|
|
{
|
|
p++;
|
|
}
|
|
while (isdigit (*p));
|
|
}
|
|
size = p - *str;
|
|
tmp = alloc (size + 1);
|
|
strncpy (tmp, *str, size);
|
|
tmp[size] = 0;
|
|
*val = tmp;
|
|
*str = p;
|
|
}
|
|
|
|
static const token symbols[] =
|
|
{
|
|
{TOK_CONST, "const"},
|
|
{TOK_UNION, "union"},
|
|
{TOK_SWITCH, "switch"},
|
|
{TOK_CASE, "case"},
|
|
{TOK_DEFAULT, "default"},
|
|
{TOK_STRUCT, "struct"},
|
|
{TOK_TYPEDEF, "typedef"},
|
|
{TOK_ENUM, "enum"},
|
|
{TOK_OPAQUE, "opaque"},
|
|
{TOK_BOOL, "bool"},
|
|
{TOK_VOID, "void"},
|
|
{TOK_CHAR, "char"},
|
|
{TOK_INT, "int"},
|
|
{TOK_UNSIGNED, "unsigned"},
|
|
{TOK_SHORT, "short"},
|
|
{TOK_LONG, "long"},
|
|
{TOK_FLOAT, "float"},
|
|
{TOK_DOUBLE, "double"},
|
|
{TOK_STRING, "string"},
|
|
{TOK_PROGRAM, "program"},
|
|
{TOK_VERSION, "version"},
|
|
{TOK_EOF, "??????"},
|
|
};
|
|
|
|
static void
|
|
findkind (const char **mark, token *tokp)
|
|
{
|
|
int len;
|
|
const token *s;
|
|
const char *str;
|
|
char *tmp;
|
|
|
|
str = *mark;
|
|
for (s = symbols; s->kind != TOK_EOF; s++)
|
|
{
|
|
len = strlen (s->str);
|
|
if (strncmp (str, s->str, len) == 0)
|
|
{
|
|
if (!isalnum (str[len]) && str[len] != '_')
|
|
{
|
|
tokp->kind = s->kind;
|
|
tokp->str = s->str;
|
|
*mark = str + len;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
tokp->kind = TOK_IDENT;
|
|
for (len = 0; isalnum (str[len]) || str[len] == '_'; len++);
|
|
tmp = alloc (len + 1);
|
|
strncpy (tmp, str, len);
|
|
tmp[len] = 0;
|
|
tokp->str = tmp;
|
|
*mark = str + len;
|
|
}
|
|
|
|
static int
|
|
cppline (const char *line)
|
|
{
|
|
return line == curline && *line == '#';
|
|
}
|
|
|
|
static int
|
|
directive (const char *line)
|
|
{
|
|
return line == curline && *line == '%';
|
|
}
|
|
|
|
static void
|
|
printdirective (const char *line)
|
|
{
|
|
f_print (fout, "%s", line + 1);
|
|
}
|
|
|
|
static void
|
|
docppline (const char *line, int *lineno, const char **fname)
|
|
{
|
|
char *file;
|
|
int num;
|
|
char *p;
|
|
|
|
line++;
|
|
while (isspace (*line))
|
|
{
|
|
line++;
|
|
}
|
|
num = atoi (line);
|
|
while (isdigit (*line))
|
|
{
|
|
line++;
|
|
}
|
|
while (isspace (*line))
|
|
{
|
|
line++;
|
|
}
|
|
if (*line != '"')
|
|
{
|
|
error (_("preprocessor error"));
|
|
}
|
|
line++;
|
|
p = file = alloc (strlen (line) + 1);
|
|
while (*line && *line != '"')
|
|
{
|
|
*p++ = *line++;
|
|
}
|
|
if (*line == 0)
|
|
{
|
|
error (_("preprocessor error"));
|
|
}
|
|
*p = 0;
|
|
if (*file == 0)
|
|
{
|
|
*fname = NULL;
|
|
}
|
|
else
|
|
{
|
|
*fname = file;
|
|
}
|
|
*lineno = num - 1;
|
|
}
|