mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-28 20:11:00 +01:00
9f506b229f
declares them to return char *. For some reason, this causes no problems
with the old compiler tools, but doing a 'make world' with gcc 2.6.3 in a
seperate DESTDIR got me this error:
yacc -d /usr/src/usr.bin/compile_et/error_table.y
cc -O2 -I. -I/usr/src/usr.bin/compile_et/../../lib/libcom_err -I/mnt/usr/include -c y.tab.c -o error_table.o
In file included from /usr/src/usr.bin/compile_et/et_lex.lex.l:11,
from /usr/src/usr.bin/compile_et/error_table.y:233:
/mnt/usr/include/stdlib.h💯 conflicting types for `malloc'
/usr/src/usr.bin/compile_et/error_table.y:80: previous declaration of `malloc'
/mnt/usr/include/stdlib.h:104: conflicting types for `realloc'
/usr/src/usr.bin/compile_et/error_table.y:80: previous declaration of `realloc'
*** Error code 1
Stop.
Declaring malloc and realloc to return void * fixes this. It could be that
the new gcc is a bit more picky about these things.
234 lines
4.6 KiB
Plaintext
234 lines
4.6 KiB
Plaintext
%{
|
|
#include <stdio.h>
|
|
char *str_concat(), *ds(), *quote();
|
|
void *malloc(), *realloc();
|
|
char *current_token = (char *)NULL;
|
|
extern char *table_name;
|
|
%}
|
|
%union {
|
|
char *dynstr;
|
|
}
|
|
|
|
%token ERROR_TABLE ERROR_CODE_ENTRY END
|
|
%token <dynstr> STRING QUOTED_STRING
|
|
%type <dynstr> ec_name description table_id
|
|
%{
|
|
%}
|
|
%start error_table
|
|
%%
|
|
|
|
error_table : ERROR_TABLE table_id error_codes END
|
|
{ table_name = ds($2);
|
|
current_token = table_name;
|
|
put_ecs(); }
|
|
;
|
|
|
|
table_id : STRING
|
|
{ current_token = $1;
|
|
set_table_num($1);
|
|
$$ = $1; }
|
|
;
|
|
|
|
error_codes : error_codes ec_entry
|
|
| ec_entry
|
|
;
|
|
|
|
ec_entry : ERROR_CODE_ENTRY ec_name ',' description
|
|
{ add_ec($2, $4);
|
|
free($2);
|
|
free($4); }
|
|
| ERROR_CODE_ENTRY ec_name '=' STRING ',' description
|
|
{ add_ec_val($2, $4, $6);
|
|
free($2);
|
|
free($4);
|
|
free($6);
|
|
}
|
|
;
|
|
|
|
ec_name : STRING
|
|
{ $$ = ds($1);
|
|
current_token = $$; }
|
|
;
|
|
|
|
description : QUOTED_STRING
|
|
{ $$ = ds($1);
|
|
current_token = $$; }
|
|
;
|
|
|
|
%%
|
|
/*
|
|
*
|
|
* Copyright 1986, 1987 by the MIT Student Information Processing Board
|
|
*
|
|
* For copyright info, see mit-sipb-copyright.h.
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
#include <ctype.h>
|
|
#include <sys/types.h>
|
|
#include <sys/time.h>
|
|
#include "internal.h"
|
|
#include "error_table.h"
|
|
#include "mit-sipb-copyright.h"
|
|
|
|
#ifndef lint
|
|
static char const rcsid_error_table_y[] =
|
|
"$Header: /home/ncvs/src/usr.bin/compile_et/error_table.y,v 1.2 1995/01/14 22:29:33 wollman Exp $";
|
|
#endif
|
|
|
|
void *malloc(), *realloc();
|
|
extern FILE *hfile, *cfile;
|
|
|
|
static long gensym_n = 0;
|
|
char *
|
|
gensym(x)
|
|
char const *x;
|
|
{
|
|
char *symbol;
|
|
if (!gensym_n) {
|
|
struct timeval tv;
|
|
struct timezone tzp;
|
|
gettimeofday(&tv, &tzp);
|
|
gensym_n = (tv.tv_sec%10000)*100 + tv.tv_usec/10000;
|
|
}
|
|
symbol = malloc(32 * sizeof(char));
|
|
gensym_n++;
|
|
sprintf(symbol, "et%ld", gensym_n);
|
|
return(symbol);
|
|
}
|
|
|
|
char *
|
|
ds(string)
|
|
char const *string;
|
|
{
|
|
char *rv;
|
|
rv = malloc(strlen(string)+1);
|
|
strcpy(rv, string);
|
|
return(rv);
|
|
}
|
|
|
|
char *
|
|
quote(string)
|
|
char const *string;
|
|
{
|
|
char *rv;
|
|
rv = malloc(strlen(string)+3);
|
|
strcpy(rv, "\"");
|
|
strcat(rv, string);
|
|
strcat(rv, "\"");
|
|
return(rv);
|
|
}
|
|
|
|
long table_number;
|
|
int current = 0;
|
|
char **error_codes = (char **)NULL;
|
|
|
|
add_ec(name, description)
|
|
char const *name, *description;
|
|
{
|
|
fprintf(cfile, "\t\"%s\",\n", description);
|
|
if (error_codes == (char **)NULL) {
|
|
error_codes = (char **)malloc(sizeof(char *));
|
|
*error_codes = (char *)NULL;
|
|
}
|
|
error_codes = (char **)realloc((char *)error_codes,
|
|
(current + 2)*sizeof(char *));
|
|
error_codes[current++] = ds(name);
|
|
error_codes[current] = (char *)NULL;
|
|
}
|
|
|
|
add_ec_val(name, val, description)
|
|
char const *name, *val, *description;
|
|
{
|
|
const int ncurrent = atoi(val);
|
|
if (ncurrent < current) {
|
|
printf("Error code %s (%d) out of order", name,
|
|
current);
|
|
return;
|
|
}
|
|
|
|
while (ncurrent > current)
|
|
fputs("\t(char *)NULL,\n", cfile), current++;
|
|
|
|
fprintf(cfile, "\t\"%s\",\n", description);
|
|
if (error_codes == (char **)NULL) {
|
|
error_codes = (char **)malloc(sizeof(char *));
|
|
*error_codes = (char *)NULL;
|
|
}
|
|
error_codes = (char **)realloc((char *)error_codes,
|
|
(current + 2)*sizeof(char *));
|
|
error_codes[current++] = ds(name);
|
|
error_codes[current] = (char *)NULL;
|
|
}
|
|
|
|
put_ecs()
|
|
{
|
|
int i;
|
|
for (i = 0; i < current; i++) {
|
|
if (error_codes[i] != (char *)NULL)
|
|
fprintf(hfile, "#define %-40s (%ldL)\n",
|
|
error_codes[i], table_number + i);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* char_to_num -- maps letters and numbers into a small numbering space
|
|
* uppercase -> 1-26
|
|
* lowercase -> 27-52
|
|
* digits -> 53-62
|
|
* underscore-> 63
|
|
*/
|
|
|
|
static const char char_set[] =
|
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_";
|
|
|
|
int char_to_num(c)
|
|
char c;
|
|
{
|
|
const char *where;
|
|
int diff;
|
|
|
|
where = strchr (char_set, c);
|
|
if (where) {
|
|
diff = where - char_set + 1;
|
|
assert (diff < (1 << ERRCODE_RANGE));
|
|
return diff;
|
|
}
|
|
else if (isprint (c))
|
|
fprintf (stderr,
|
|
"Illegal character `%c' in error table name\n",
|
|
c);
|
|
else
|
|
fprintf (stderr,
|
|
"Illegal character %03o in error table name\n",
|
|
c);
|
|
exit (1);
|
|
}
|
|
|
|
set_table_num(string)
|
|
char *string;
|
|
{
|
|
if (char_to_num (string[0]) > char_to_num ('z')) {
|
|
fprintf (stderr, "%s%s%s%s",
|
|
"First character of error table name must be ",
|
|
"a letter; name ``",
|
|
string, "'' rejected\n");
|
|
exit (1);
|
|
}
|
|
if (strlen(string) > 4) {
|
|
fprintf(stderr, "Table name %s too long, truncated ",
|
|
string);
|
|
string[4] = '\0';
|
|
fprintf(stderr, "to %s\n", string);
|
|
}
|
|
while (*string != '\0') {
|
|
table_number = (table_number << BITS_PER_CHAR)
|
|
+ char_to_num(*string);
|
|
string++;
|
|
}
|
|
table_number = table_number << ERRCODE_RANGE;
|
|
}
|
|
|
|
#include "et_lex.lex.c"
|