diff options
author | Jay Freeman <saurik@saurik.com> | 2016-12-30 02:36:59 +0000 |
---|---|---|
committer | Jay Freeman <saurik@saurik.com> | 2016-12-30 02:36:59 +0000 |
commit | f48670ad413a129d2980bac67ac02a5f6099ae77 (patch) | |
tree | b5ac10b45a50f6a0dc4e5bb581d8cfee8a658d2d | |
parent | 781b57de9cca90df1b2681d54c4a35be06e19a94 (diff) |
Remove the dpkg blank_line misfeature.
git-svn-id: http://svn.telesphoreo.org/trunk@820 514c082c-b64e-11dc-b46d-3d985efe055d
-rw-r--r-- | data/dpkg/blankline.diff | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/data/dpkg/blankline.diff b/data/dpkg/blankline.diff new file mode 100644 index 000000000..4c743aabe --- /dev/null +++ b/data/dpkg/blankline.diff @@ -0,0 +1,39 @@ +diff -ru dpkg-1.18.10/lib/dpkg/parse.c dpkg-1.18.10+iPhone/lib/dpkg/parse.c +--- dpkg-1.18.10/lib/dpkg/parse.c 2016-07-05 01:55:13.000000000 +0000 ++++ dpkg-1.18.10+iPhone/lib/dpkg/parse.c 2016-12-30 02:19:22.000000000 +0000 +@@ -622,8 +622,6 @@ + + /* Loop per field. */ + for (;;) { +- bool blank_line; +- + /* Scan field name. */ + fs->fieldstart = ps->dataptr - 1; + while (!parse_at_eof(ps) && !c_isspace(c) && c != ':' && c != MSDOS_EOF_CHAR) +@@ -667,16 +665,10 @@ + parse_error(ps, _("MSDOS end of file (^Z) in value of field '%.*s' (missing newline?)"), + fs->fieldlen, fs->fieldstart); + +- blank_line = false; +- + /* Scan field value. */ + fs->valuestart = ps->dataptr - 1; + for (;;) { + if (c == '\n' || c == MSDOS_EOF_CHAR) { +- if (blank_line) +- parse_error(ps, +- _("blank line in value of field '%.*s'"), +- fs->fieldlen, fs->fieldstart); + ps->lno++; + + if (parse_at_eof(ps)) +@@ -688,9 +680,6 @@ + break; + + parse_ungetc(c, ps); +- blank_line = true; +- } else if (blank_line && !c_isspace(c)) { +- blank_line = false; + } + + if (parse_at_eof(ps)) |