Преглед на файлове

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

Guillem Jover преди 19 години
родител
ревизия
b4bc02dcd5
променени са 3 файла, в които са добавени 13 реда и са изтрити 5 реда
  1. 6 0
      ChangeLog
  2. 5 5
      dpkg-deb/build.c
  3. 2 0
      dpkg-deb/dpkg-deb.h

+ 6 - 0
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

+ 5 - 5
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));

+ 2 - 0
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 */