head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.92 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.90 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.88 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.86 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.84 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.82 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.80 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.78 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.76 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.74 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.72 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.70 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.68 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.66 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.64 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.62 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.60 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.58 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.56 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.54 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.52 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.50 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.48 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.44 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.24 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.46 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.42 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.40 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.38 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.36 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.34 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.32 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.30 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.28 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.26 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.22 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.20 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.18 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.16 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.14 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.12 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.10 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.8 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.6 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.4 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.2 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.1.0.32 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.30 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.28 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.26 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.24 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.22 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.20 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.18 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.16 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.14 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.12 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.10 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.8 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.6 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.4 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.2 pkgsrc-2010Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2014.12.15.11.35.42; author mef; state Exp; branches; next 1.1; commitid ZKDPe5VMWcGL382y; 1.1 date 2010.12.11.23.40.08; author mrg; state Exp; branches; next ; desc @@ 1.2 log @(pkgsrc) - Add two patches, to avoid error: incompatible types when assigning to type '__off_t' from type 'fpos_t' fp_->_offset = u.f; - Remove one patch patch-af, which had a comment, not necessary for now " also look in *.mk files as makefiles. bump pkg revision." (upstream) - Update 4.2 to 4.6 ---------------------- * Noteworthy changes in release 4.6 (2012-02-03) [stable] ** Bug fixes - lid -L no longer mishandles open-ended ranges like "..2" and "2.." - lid's -d, -o and -x options now work properly * Noteworthy changes in release 4.5 (2010-06-17) [stable] * Noteworthy changes in release 4.4 (2009-10-30) [beta] ------------ ** New features mkid and xtokid accept a new option --files0-from=FILE, to make them process only the files named in FILE. FILE must contain a list of NUL-terminated file names. ** Bug fixes mkid and xtokid now accept language specific options via the command line. * Noteworthy changes in release 4.3.92 (2008-10-18) [beta] -------------- ** Bug fixes fid: avoid a buffer overrun handle failed allocation, e.g., by strdup avoid potential realloc overflow mkid: avoid an infloop on some .el files all programs: detect write error on stdout ** Miscellaneous improvements revamp code and infrastructure, bringing it closer to coreutils' standards add automatically-generated man pages mkid recognize more suffixes: .ac, .mk, .bz2, .lzma. idutils is now licensed under the General Public License version 3 or later (GPLv3+). @ text @$NetBSD$ --- libidu/scanners.c.orig 2014-11-20 23:07:03.000000000 +0900 +++ libidu/scanners.c 2014-11-20 23:19:21.000000000 +0900 @@@@ -1628,6 +1628,7 @@@@ get_token_lisp (FILE *in_FILE, void cons switch (c) { case EOF: + out: obstack_free (&tokens_obstack, obstack_finish (&tokens_obstack)); return 0; @ 1.1 log @fix the lisp scanner to properly exit when EOF is reached. there are two files in netbsd 'src' that trigger this bug, but now i can run 'mkid' on all of 'src' again. @ text @d1 5 a5 3 --- libidu/scanners.c.orig 2010-12-11 15:27:10.000000000 -0800 +++ libidu/scanners.c 2010-12-11 15:26:59.000000000 -0800 @@@@ -1618,6 +1618,7 @@@@ d12 1 a12 144 @@@@ -1634,19 +1635,25 @@@@ case ';': /* comment */ do { c = getc (in_FILE); - } while ( (c != EOF) && (c != '\n')); + if (c == EOF) + goto out; + } while (c != '\n'); goto top; case '"': /* string with or without ansi-C escapes */ string: do { c = getc (in_FILE); + if (c == EOF) + goto out; if (c == '\\') { c = getc (in_FILE); + if (c == EOF) + goto out; continue; } - } while ( (c != EOF) && (c != '"')); + } while (c != '"'); goto top; case '.': @@@@ -1654,11 +1661,12 @@@@ id = scanner_buffer; *id++ = c; c = getc (in_FILE); + if (c == EOF) + goto out; if (is_DIGIT (c) || (scanner_buffer[0] != '.' && (c == '.' || c == 'i' || c == 'I'))) goto number; - if (c != EOF) - ungetc (c, in_FILE); + ungetc (c, in_FILE); goto ident; case '#': @@@@ -1667,20 +1675,23 @@@@ c = getc (in_FILE); if (c == EOF) - goto top; + goto out; else if (is_RADIX (c)) goto number; else if (c == '\\') /* #\... literal Character */ { *id++ = c; c = getc (in_FILE); + if (c == EOF) + goto out; *id++ = c; if (is_LETTER (c)) { while (is_LETTER (c = getc (in_FILE))) *id++ = c; - if (c != EOF) - ungetc (c, in_FILE); + if (c == EOF) + goto out; + ungetc (c, in_FILE); } *flags = TOK_LITERAL; obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer); @@@@ -1694,8 +1705,9 @@@@ { while (is_LETTER (c = getc (in_FILE))) *id++ = c; - if (c != EOF) - ungetc (c, in_FILE); + if (c == EOF) + goto out; + ungetc (c, in_FILE); *flags = TOK_LITERAL; obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer); return (struct token *) obstack_finish (&tokens_obstack); @@@@ -1712,13 +1724,17 @@@@ break; } } while (c != EOF); + if (c == EOF) + goto out; goto top; } else if (c == '@@') /* #@@LENGTH ...^_ EMACS byte-code comment */ { do { c = getc (in_FILE); - } while ( (c != EOF) && (c != '\037')); + if (c == EOF) + goto out; + } while (c != '\037'); goto top; } else if (c == '[') /* #[ ... ] EMACS byte-code object */ @@@@ -1742,23 +1758,24 @@@@ { while (is_IDENT (c = getc (in_FILE))) *id++ = c; + if (c == EOF) + goto out; if (c == '[') { c = getc (in_FILE); + if (c == EOF) + goto out; if (c == ']') { *id++ = '['; *id++ = ']'; continue; } - if (c != EOF) - ungetc (c, in_FILE); - ungetc ('[', in_FILE); + ungetc (c, in_FILE); } break; } - if (c != EOF) - ungetc (c, in_FILE); + ungetc (c, in_FILE); *flags = TOK_NAME | TOK_LITERAL; obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer); return (struct token *) obstack_finish (&tokens_obstack); @@@@ -1770,8 +1787,9 @@@@ *id++ = c; while (is_NUMBER (c = getc (in_FILE))) *id++ = c; - if (c != EOF) - ungetc (c, in_FILE); + if (c == EOF) + goto out; + ungetc (c, in_FILE); *flags = TOK_NUMBER | TOK_LITERAL; obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer); return (struct token *) obstack_finish (&tokens_obstack); @