main/filesdb.c: fix putat logic we broke earlier today

main/help.c: ensure_package_clientdata() only needs to allocate memory
  for a perpackagestate struct, not a pkginfoperfile.

diff --git a/ChangeLog b/ChangeLog
index 80a488d79dd98dbed8ab75bfeeb490481ba0e743..476779092587ed0377ee1c54ae6a7763bf8314ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
+Sun Apr 22 17:13:17 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * main/filesdb.c: fix putat logic we broke earlier today
+
 Sun Apr 22 16:42:22 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * main/filesdb.c: don't read a statoverride or .list file if they
     are 0 bytes
 
+Sun Apr 22 15:15:56 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * main/help.c: ensure_package_clientdata() only needs to allocate memory
+    for a perpackagestate struct, not a pkginfoperfile.
+
 Sun Apr 22 02:46:06 CDT 2001 Adam Heath <doogie@debian.org>
 
   * dpkg-deb/build.c, dpkg-deb/extract.c, dpkg-deb/main.c, lib/mlib.c(*),

diff --git a/main/filesdb.c b/main/filesdb.c
index 2e40aba36d60e40d2479bfaa6b3e1ac54f4e0fcb..209f80946f2a49307143d703174a9ae2447db15a 100644 (file)
--- a/main/filesdb.c
+++ b/main/filesdb.c
@@ -58,8 +58,6 @@ static int saidread=0;
   * list if it is there but stale
   */
 void ensure_packagefiles_available(struct pkginfo *pkg) {
-  static struct varbuf fnvb;
-  
   int fd;
   const char *filelistfile;
   struct fileinlist **lendp, *newent, *current;
@@ -170,8 +168,6 @@ void ensure_packagefiles_available(struct pkginfo *pkg) {
   pop_cleanup(ehflag_normaltidy); /* fd= open() */
   if (close(fd))
     ohshite(_("error closing files list file for package `%.250s'"),pkg->name);
-  if (fnvb.used)
-    ohshit(_("files list file for package `%.250s' is truncated"),pkg->name);
 
   onerr_abort--;
 
@@ -187,6 +183,7 @@ void ensure_packagefiles_available(struct pkginfo *pkg) {
       packageslump= nfmalloc(sizeof(struct filepackages));
       packageslump->more= newent->namenode->packages;
       newent->namenode->packages= packageslump;
+      putat= 0;
     }
     packageslump->pkgs[putat]= pkg;
     if (++putat < PERFILEPACKAGESLUMP) packageslump->pkgs[putat]= 0;

diff --git a/main/help.c b/main/help.c
index 5919dadf1019856e6f5125c7879814d157396db9..561a14a17734d3c783c70882bb9be18212bb4a5e 100644 (file)
--- a/main/help.c
+++ b/main/help.c
@@ -113,7 +113,7 @@ void checkpath(void) {
 
 void ensure_package_clientdata(struct pkginfo *pkg) {
   if (pkg->clientdata) return;
-  pkg->clientdata= nfmalloc(sizeof(struct pkginfoperfile));
+  pkg->clientdata= nfmalloc(sizeof(struct perpackagestate));
   pkg->clientdata->istobe= itb_normal;
   pkg->clientdata->fileslistvalid= 0;
   pkg->clientdata->files= 0;