* dpkg-deb/dpkg-deb.h (MAXFILENAME): New macro.

	* dpkg-deb/build.c (getfi): Use MAXFILENAME instead of the hardcoded
	value '2048'.

diff --git a/ChangeLog b/ChangeLog
index 1ca73ee9468495ec7e7ea9abd5c8224bb401c991..22d5eadda0083e2fa7362752f44d2b9e5828ff67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-13  Guillem Jover  <guillem@debian.org>
+
+       * dpkg-deb/dpkg-deb.h (MAXFILENAME): New macro.
+       * dpkg-deb/build.c (getfi): Use MAXFILENAME instead of the hardcoded
+       value '2048'.
+
 2007-02-13  Guillem Jover  <guillem@debian.org>
 
        * lib/compression.c (decompress_cat): Use BZ_IO_ERROR instead of

diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index 6c7fc3f0d334df0734cc5d46da118ffb6f1467c7..50fb63277b3c152ec8d542aeea1143e35f435b81 100644 (file)
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -80,10 +80,10 @@ static struct _finfo* getfi(const char* root, int fd) {
   size_t rl = strlen(root);
 
   if (fn == NULL) {
-    fnlen=rl+2048;
+    fnlen = rl + MAXFILENAME;
     fn=(char*)malloc(fnlen);
-  } else if (fnlen < (rl+2048)) {
-    fnlen=rl+2048;
+  } else if (fnlen < (rl + MAXFILENAME)) {
+    fnlen = rl + MAXFILENAME;
     fn=(char*)realloc(fn,fnlen);
   }
   i=sprintf(fn,"%s/",root);
@@ -91,7 +91,7 @@ static struct _finfo* getfi(const char* root, int fd) {
   while (1) {
     int        res;
     if (i>=fnlen) {
-      fnlen+=2048;
+      fnlen += MAXFILENAME;
       fn=(char*)realloc(fn,fnlen);
     }
     if ((res=read(fd, (fn+i), sizeof(*fn)))<0) {
@@ -106,7 +106,7 @@ static struct _finfo* getfi(const char* root, int fd) {
       break;
 
     i++;
-    assert(i<2048);
+    assert(i < MAXFILENAME);
   }
 
   fi=(struct _finfo*)malloc(sizeof(struct _finfo));

diff --git a/dpkg-deb/dpkg-deb.h b/dpkg-deb/dpkg-deb.h
index daa9c74c0fc570a7f76770a3e5236e9da0203a82..cc8dc7e7aa532a326e12d0f6083c5099d8cc2e61 100644 (file)
--- a/dpkg-deb/dpkg-deb.h
+++ b/dpkg-deb/dpkg-deb.h
@@ -50,4 +50,6 @@ extern enum compression_type compress_type;
 #define DATAMEMBER_CAT         "data.tar        "
 #define DATAMEMBER_COMPAT_CAT          "data.tar/       "
 
+#define MAXFILENAME 2048
+
 #endif /* DPKG_DEB_H */