head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.116 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.114 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.112 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.110 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.108 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.106 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.104 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.102 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.100 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.98 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.96 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.94 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.92 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.90 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.88 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.86 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.84 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.82 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.80 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.78 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.76 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.74 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.72 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.68 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.48 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.70 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.66 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.64 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.62 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.60 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.58 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.56 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.54 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.52 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.50 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.46 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.44 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.42 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.40 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.38 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.36 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.34 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.32 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.30 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.28 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.26 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.24 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.22 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.20 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.18 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.16 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.14 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.12 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.10 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.8 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.6 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.4 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.2 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.1.0.18 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.16 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.14 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.12 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.10 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.8 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.6 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.4 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.2 pkgsrc-2009Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2011.12.18.16.54.09; author dholland; state Exp; branches; next 1.1; 1.1 date 2009.09.03.13.14.10; author joerg; state Exp; branches; next ; desc @@ 1.2 log @Assorted fixes: - explain why we need post-extract chmods - sort PLIST - add patch comments - clean up some pkglint - fix a symbol name conflict with logf (from math.h + a gcc builtin) - fix some other bugs/issues found by gcc - add standard headers - remove some bogus BSD/System V include probing - probably fix gcc 4.5 build (not fully tested) - bump PKGREVISION @ text @$NetBSD: patch-ac,v 1.1 2009/09/03 13:14:10 joerg Exp $ - fix symbol conflict with getline (which is now a POSIX thing) - fix symbol conflict with logf (from math.h) - fix wrong printf format --- lex.c.orig 1991-04-24 20:30:40.000000000 +0000 +++ lex.c @@@@ -500,7 +500,7 @@@@ void counterror() if (outf != stdout) printf("Translation aborted: Too many errors.\n"); if (verbose) - fprintf(logf, "Translation aborted: Too many errors.\n"); + fprintf(loggf, "Translation aborted: Too many errors.\n"); closelogfile(); exit(EXIT_FAILURE); } @@@@ -521,9 +521,9 @@@@ char *msg; printf("Translation aborted.\n"); } if (verbose) { - fprintf(logf, "%s, line %d/%d: %s\n", + fprintf(loggf, "%s, line %d/%d: %s\n", infname, inf_lnum, outf_lnum, msg); - fprintf(logf, "Translation aborted.\n"); + fprintf(loggf, "Translation aborted.\n"); } closelogfile(); exit(EXIT_FAILURE); @@@@ -542,7 +542,7 @@@@ char *msg; { if (checkeatnote(msg)) { if (verbose) - fprintf(logf, "%s, %d/%d: Omitted warning: %s\n", + fprintf(loggf, "%s, %d/%d: Omitted warning: %s\n", infname, inf_lnum, outf_lnum, msg); return; } @@@@ -557,7 +557,7 @@@@ char *proc, *msg; { if (checkeatnote(msg)) { if (verbose) - fprintf(logf, "%s, %d/%d: Omitted internal error in %s: %s\n", + fprintf(loggf, "%s, %d/%d: Omitted internal error in %s: %s\n", infname, inf_lnum, outf_lnum, proc, msg); return; } @@@@ -576,7 +576,7 @@@@ char *msg; { if (blockkind == TOK_IMPORT || checkeatnote(msg)) { if (verbose) - fprintf(logf, "%s, %d/%d: Omitted note: %s\n", + fprintf(loggf, "%s, %d/%d: Omitted note: %s\n", infname, inf_lnum, outf_lnum, msg); return; } @@@@ -592,12 +592,12 @@@@ char *msg; { if (blockkind == TOK_IMPORT || checkeatnote(msg)) { if (verbose) - fprintf(logf, "%s, %d/%d: Omitted end-note: %s\n", + fprintf(loggf, "%s, %d/%d: Omitted end-note: %s\n", infname, inf_lnum, outf_lnum, msg); return; } if (verbose) - fprintf(logf, "%s, %d/%d: Recorded end-note: %s\n", + fprintf(loggf, "%s, %d/%d: Recorded end-note: %s\n", infname, inf_lnum, outf_lnum, msg); (void) strlist_add(&endnotelist, msg); } @@@@ -969,7 +969,7 @@@@ void progress() -void getline() +void my_getline() { char *cp, *cp2; @@@@ -995,7 +995,7 @@@@ void getline() infname = stralloc(cp); infname[cp2 - cp] = 0; } - getline(); + my_getline(); return; } if (copysource && *inbuf) { @@@@ -1012,7 +1012,7 @@@@ void getline() fprintf(stderr, "\n"); if (inputkind == INP_INCFILE) { pop_input(); - getline(); + my_getline(); } else strcpy(inbuf, "\001"); } @@@@ -1103,7 +1103,7 @@@@ char *fname; infname = fname; inf_lnum = 0; } else - inf_lnum--; /* adjust for extra getline() */ + inf_lnum--; /* adjust for extra my_getline() */ *inbuf = 0; inbufptr = inbuf; gettok(); @@@@ -1251,7 +1251,7 @@@@ char *fn; else printf("Reading include file \"%s\"\n", fn); if (verbose) - fprintf(logf, "Reading include file \"%s\"\n", fn); + fprintf(loggf, "Reading include file \"%s\"\n", fn); if (expandincludes == 0) { push_input_file(fp, fn, 2); curtok = TOK_INCLUDE; @@@@ -2206,7 +2206,7 @@@@ int starparen; /* 0={ }, 1=(* *), 2=C else commentline(CMT_POST); trailing = 0; - getline(); + my_getline(); i = 0; for (;;) { if (*inbufptr == ' ') { @@@@ -2258,7 +2258,7 @@@@ char *getinlinepart() if (isspace(*inbufptr)) { inbufptr++; } else if (!*inbufptr) { - getline(); + my_getline(); } else if (*inbufptr == '{') { inbufptr++; comment(0); @@@@ -2352,7 +2352,7 @@@@ void leadingcomments() switch (*inbufptr++) { case 0: - getline(); + my_getline(); break; case ' ': @@@@ -2529,7 +2529,7 @@@@ void gettok() case TOK_OCTLIT: case TOK_INTLIT: case TOK_MININT: - printf(", curtokint = %d", curtokint); + printf(", curtokint = %ld", curtokint); break; case TOK_REALLIT: case TOK_STRLIT: @@@@ -2559,7 +2559,7 @@@@ void gettok() case 0: if (commenting_flag) saveinputcomment(inbufptr-1); - getline(); + my_getline(); cp = curtokbuf; for (;;) { inbufindent = 0; @@@@ -2576,7 +2576,7 @@@@ void gettok() } if (!*inbufptr && !commenting_flag) { /* blank line */ *cp++ = '\001'; - getline(); + my_getline(); } else break; } @ 1.1 log @DESTDIR support. Fix getline issues. @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 1 --- lex.c.orig 1991-04-24 22:30:40.000000000 +0200 d9 63 d108 9 d144 9 @