Просмотр исходного кода

Fix inverted test of eof in parsedb, while looking for eof after field
name.

Adam Heath лет назад: 23
Родитель
Сommit
83e5ce9c7b
3 измененных файлов с 9 добавлено и 1 удалено
  1. 5 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 1 1
      lib/parse.c

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+Sat Sep 13 14:36:37 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * lib/parse.c: Fix inverted test of eof in parsedb, while looking for eof
+    after field name.
+
 Sat Sep 13 14:34:10 CDT 2003 Adam Heath <doogie@debian.org>
 
   * scripts/update-alternatives.pl: Fix inversion test of $state against

+ 3 - 0
debian/changelog

@@ -12,6 +12,9 @@ dpkg (1.10.11) unstable; urgency=low
   * Sebastian Ley <sebastian.ley@mmweg.rwth-aachen.de>:
     Fix inversion test of $state against 'expected' when removing an
     alternative.  Closes: #203791.
+  * Andrew Suffield <asuffield@debian.org>:
+    Fix inverted test of eof in parsedb, while looking for eof after
+    field name.  Closes: #198218
 
  -- Wichert Akkerman <debian@extern.wiggy.net>  UNRELEASED
 

+ 1 - 1
lib/parse.c

@@ -142,7 +142,7 @@ int parsedb(const char *filename, enum parsedbflags flags,
       while (!EOF_mmap(dataptr, endptr) && !isspace(c) && c!=':' && c!=MSDOS_EOF_CHAR)
         c= getc_mmap(dataptr);
       fieldlen= dataptr - fieldstart - 1;
-      while (EOF_mmap(dataptr, endptr) && c != '\n' && isspace(c)) c= getc_mmap(dataptr);
+      while (!EOF_mmap(dataptr, endptr) && c != '\n' && isspace(c)) c= getc_mmap(dataptr);
       if (EOF_mmap(dataptr, endptr))
         parseerr(NULL,filename,lno, warnto,warncount,&newpig,0,
                  _("EOF after field name `%.*s'"),fieldlen,fieldstart);