diff options
author | Guillem Jover <guillem@debian.org> | 2013-12-14 03:52:20 +0100 |
---|---|---|
committer | Guillem Jover <guillem@debian.org> | 2013-12-17 05:28:45 +0100 |
commit | a363181bda0e752130176542fb259e5a5bab24d1 (patch) | |
tree | 400b1da446328db4840c886203691c74b46530b4 /dpkg-deb | |
parent | 6e0998adc4ec377aedd264674f0b186c08278cde (diff) | |
download | dpkg-a363181bda0e752130176542fb259e5a5bab24d1.tar.gz |
dpkg-deb: Change conffile name length warning into an error
Such packages will not be accepted by dpkg at install time anyway, so
catch this early on, and don't let it through.
Diffstat (limited to 'dpkg-deb')
-rw-r--r-- | dpkg-deb/build.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c index d200c022a..93ac3940b 100644 --- a/dpkg-deb/build.c +++ b/dpkg-deb/build.c @@ -295,15 +295,9 @@ check_conffiles(const char *dir) if (!n) ohshite(_("empty string from fgets reading conffiles")); - if (conffilename[n - 1] != '\n') { - int c; - - warning(_("conffile name '%.50s...' is too long, or missing final newline"), - conffilename); - while ((c = getc(cf)) != EOF && c != '\n'); - - continue; - } + if (conffilename[n - 1] != '\n') + ohshit(_("conffile name '%.50s...' is too long, or missing final newline"), + conffilename); conffilename[n - 1] = '\0'; varbuf_reset(&controlfile); |