DragonFlyBSD

CONTRIBDIR= ${.CURDIR}/../../../contrib/amd/amd

.PATH: ${CONTRIBDIR}

SRCS= conf_parse.y.patch conf_tok.l.patch

$DragonFly$

--- conf_parse.y.orig 2006-12-31 17:02:18.000000000 -0500

+++ conf_parse.y 2006-12-31 17:04:00.000000000 -0500

@@ -66,7 +66,7 @@

#endif /* not __GNUC__ */

extern char *yytext;

-extern int yylineno;

+extern int ayylineno;

extern int yylex(void);

static int yyerror(const char *s);

@@ -78,7 +78,7 @@

#define PARSE_DEBUG 0

#if PARSE_DEBUG

-# define dprintf(f,s) fprintf(stderr, (f), yylineno, (s))

+# define dprintf(f,s) fprintf(stderr, (f), ayylineno, (s))

# define amu_return(v)

#else

# define dprintf(f,s)

@@ -168,7 +168,7 @@

yyerror(const char *s)

{

fprintf(stderr, "AMDCONF: %s on line %d (section %s)\n",

- s, yylineno,

+ s, ayylineno,

(header_section ? header_section : "null"));

exit(1);

return 1; /* to full compilers that insist on a return statement */

$DragonFly$

--- conf_tok.l.orig 2003-06-16 22:42:47.000000000 -0400

+++ conf_tok.l 2006-12-31 16:52:52.000000000 -0500

@@ -77,9 +77,10 @@

# ifndef ECHO

# define ECHO (void) fwrite( yytext, yyleng, 1, yyout )

# endif /* not ECHO */

-int yylineno = 0;

#endif /* FLEX_SCANNER */

+int ayylineno = 0;

+

int yylex(void);

/*

* some systems such as DU-4.x have a different GNU flex in /usr/bin

@@ -93,19 +94,25 @@

#define TOK_DEBUG 0

#if TOK_DEBUG

-# define dprintf(f,s) fprintf(stderr, (f), yylineno, (s))

+# define dprintf(f,s) fprintf(stderr, (f), ayylineno, (s))

# define amu_return(v)

#else

# define dprintf(f,s)

# define amu_return(v) return((v))

#endif /* TOK_DEBUG */

-/* no need to use yyunput() or yywrap() */

-#define YY_NO_UNPUT

+/* no need to use yywrap() */

#define YY_SKIP_YYWRAP

%}

+/* This option causes Solaris lex to fail. Use flex. See BUGS file */

+/* no need to use yyunput() */

+%option nounput

+

+/* allocate more output slots so lex scanners don't run out of mem */

+%o 1024

+

DIGIT [0-9]

ALPHA [A-Za-z]

ALPHANUM [A-Za-z0-9]

@@ -119,7 +126,7 @@

%%

\n {

- yylineno++;

+ ayylineno++;

amu_return(NEWLINE);

}

@@ -146,7 +153,7 @@

}

"#"[^\n]*\n {

/* a comment line includes the terminating \n */

- yylineno++;

+ ayylineno++;

yytext[strlen((char *)yytext)-1] = '\0';

dprintf("%8d: Comment \"%s\"\n", yytext);

}

CONTRIBDIR= ${.CURDIR}/../../../contrib/amd/fsinfo

.PATH: ${CONTRIBDIR}

SRCS= fsinfo.h.patch fsi_gram.y fsi_lex.l.patch

CFLAGS+= -I${.OBJDIR} -I${CONTRIBDIR}

CLEANFILES+= fsi_gram.c fsi_gram.h fsi_lex.c fsinfo.h

$DragonFly$

--- fsi_lex.l.orig 2006-12-31 17:08:23.000000000 -0500

+++ fsi_lex.l 2006-12-31 17:12:03.000000000 -0500

@@ -48,8 +48,9 @@

* TODO: Needs rewriting.

*/

+static int ayylineno;

+

#ifdef FLEX_SCANNER

-static int yylineno;

# define INIT_STATE { \

switch ((yy_start - 1) / 2) { \

case 0: \

@@ -159,6 +160,13 @@

%}

+/* This option causes Solaris lex to fail. Use flex. See BUGS file */

+/* no need to use yyunput() */

+%option nounput

+

+/* allocate more output slots so lex scanners don't run out of mem */

+%o 1024

+

%start F Q

%%

@@ -166,22 +174,22 @@

<F>[^ \t\n"={}]+ { return find_resword(yytext); } /* dummy " */

<F>[ \t] ;

-<F>"\n" { yylineno++; }

+<F>"\n" { ayylineno++; }

<F>[={}] { return *yytext; }

<F>\" { BEGIN Q; optr = ostr; quoted = 1; }

-<Q>\n { yylineno++; yyerror("\" expected"); BEGIN F; }

+<Q>\n { ayylineno++; yyerror("\" expected"); BEGIN F; }

<Q>\\b { *optr++ = '\b'; /* escape */ }

<Q>\\t { *optr++ = '\t'; /* escape */ }

<Q>\\\" { *optr++ = '\"'; /* escape */ }

<Q>\\\\ { *optr++ = '\\'; /* escape */ }

-<Q>\\\n { yylineno++; /* continue */ }

+<Q>\\\n { ayylineno++; /* continue */ }

<Q>\\r { *optr++ = '\r'; /* escape */ }

<Q>\\n { *optr++ = '\n'; /* escape */ }

<Q>\\f { *optr++ = '\f'; /* escape */ }

<Q>"\\ " { *optr++ = ' '; /* force space */ }

<Q>\\. { yyerror("Unknown \\ sequence"); }

-<Q>([ \t]|"\\\n"){2,} { char *p = (char *) yytext-1; while ((p = strchr(p+1, '\n'))) yylineno++; }

+<Q>([ \t]|"\\\n"){2,} { char *p = (char *) yytext-1; while ((p = strchr(p+1, '\n'))) ayylineno++; }

<Q>\" { BEGIN F; quoted = 0;

*optr = '\0';

yylval.s = strdup(ostr);

@@ -235,12 +243,11 @@

va_start(ap, fmt);

col_cleanup(0);

- fprintf(stderr, "%s:%d: ", fsi_filename ? fsi_filename : "/dev/stdin", yylineno);

- fprintf(stderr, fmt, ap);

+ fprintf(stderr, "%s:%d: ", fsi_filename ? fsi_filename : "/dev/stdin", ayylineno);

+ vfprintf(stderr, fmt, ap);

fputc('\n', stderr);

parse_errors++;

va_end(ap);

- if (0) unput(0);/* dummy to shut gcc up: "unput defined but not used" */

return 0;

}

@@ -249,7 +256,7 @@

current_location(void)

{

ioloc *ip = CALLOC(struct ioloc);

- ip->i_line = yylineno;

+ ip->i_line = ayylineno;

ip->i_file = fsi_filename;

return ip;

}

$DragonFly$

--- fsinfo.h.orig 2006-12-31 17:23:10.000000000 -0500

+++ fsinfo.h 2006-12-31 17:23:56.000000000 -0500

@@ -109,7 +109,6 @@

*/

#ifndef yywrap

extern int yywrap(void);

-# define yywrap() 1

#endif /* not yywrap */

extern int yyparse(void);

extern int write_atab(qelem *q);