fix libapt-inst for >2G debs (closes: #725483)

diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index d7ee528ba9624f94a97e12e313da3e10547def5e..9d84c1784ab395a3240aaf81524723fc9b350744 100644 (file)
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -64,7 +64,7 @@ ARArchive::~ARArchive()
    byte plain text header then the file data, another header, data, etc */
 bool ARArchive::LoadHeaders()
 {
    byte plain text header then the file data, another header, data, etc */
 bool ARArchive::LoadHeaders()
 {

-   signed long Left = File.Size();
+   off_t Left = File.Size();

    
    // Check the magic byte
    char Magic[8];
    
    // Check the magic byte
    char Magic[8];


@@ -123,7 +123,7 @@ bool ARArchive::LoadHeaders()
       }
 
       // Account for the AR header alignment 
       }
 
       // Account for the AR header alignment 

-      unsigned Skip = Memb->Size % 2;
+      off_t Skip = Memb->Size % 2;

       
       // Add it to the list
       Memb->Next = List;
       
       // Add it to the list
       Memb->Next = List;


@@ -131,7 +131,7 @@ bool ARArchive::LoadHeaders()
       Memb->Start = File.Tell();
       if (File.Skip(Memb->Size + Skip) == false)
         return false;
       Memb->Start = File.Tell();
       if (File.Skip(Memb->Size + Skip) == false)
         return false;

-      if (Left < (signed)(Memb->Size + Skip))
+      if (Left < (off_t)(Memb->Size + Skip))

         return _error->Error(_("Archive is too short"));
       Left -= Memb->Size + Skip;
    }   
         return _error->Error(_("Archive is too short"));
       Left -= Memb->Size + Skip;
    }   

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 3966eb0edd41f1e175469e5f1108638020292736..0261119ba120001b2f233b343a9f40503f4eb5f4 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -656,9 +656,9 @@ string flNoLink(string File)
    while (1)
    {
       // Read the link
    while (1)
    {
       // Read the link

-      int Res;
+      ssize_t Res;

       if ((Res = readlink(NFile.c_str(),Buffer,sizeof(Buffer))) <= 0 || 
       if ((Res = readlink(NFile.c_str(),Buffer,sizeof(Buffer))) <= 0 || 

-         (unsigned)Res >= sizeof(Buffer))
+         (size_t)Res >= sizeof(Buffer))

          return File;
       
       // Append or replace the previous path
          return File;
       
       // Append or replace the previous path


@@ -1244,7 +1244,7 @@ FileFd::~FileFd()
    gracefully. */
 bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 {
    gracefully. */
 bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual)
 {

-   int Res;
+   ssize_t Res;

    errno = 0;
    if (Actual != 0)
       *Actual = 0;
    errno = 0;
    if (Actual != 0)
       *Actual = 0;


@@ -1344,7 +1344,7 @@ char* FileFd::ReadLine(char *To, unsigned long long const Size)
 /* */
 bool FileFd::Write(const void *From,unsigned long long Size)
 {
 /* */
 bool FileFd::Write(const void *From,unsigned long long Size)
 {

-   int Res;
+   ssize_t Res;

    errno = 0;
    do
    {
    errno = 0;
    do
    {


@@ -1398,7 +1398,7 @@ bool FileFd::Write(const void *From,unsigned long long Size)
 }
 bool FileFd::Write(int Fd, const void *From, unsigned long long Size)
 {
 }
 bool FileFd::Write(int Fd, const void *From, unsigned long long Size)
 {

-   int Res;
+   ssize_t Res;

    errno = 0;
    do
    {
    errno = 0;
    do
    {


@@ -1471,14 +1471,14 @@ bool FileFd::Seek(unsigned long long To)
       d->seekpos = To;
       return true;
    }
       d->seekpos = To;
       return true;
    }

-   int res;
+   off_t res;

 #ifdef HAVE_ZLIB
    if (d != NULL && d->gz)
       res = gzseek(d->gz,To,SEEK_SET);
    else
 #endif
       res = lseek(iFd,To,SEEK_SET);
 #ifdef HAVE_ZLIB
    if (d != NULL && d->gz)
       res = gzseek(d->gz,To,SEEK_SET);
    else
 #endif
       res = lseek(iFd,To,SEEK_SET);

-   if (res != (signed)To)
+   if (res != (off_t)To)

       return FileFdError("Unable to seek to %llu", To);
 
    if (d != NULL)
       return FileFdError("Unable to seek to %llu", To);
 
    if (d != NULL)


@@ -1509,7 +1509,7 @@ bool FileFd::Skip(unsigned long long Over)
       return true;
    }
 
       return true;
    }
 

-   int res;
+   off_t res;

 #ifdef HAVE_ZLIB
    if (d != NULL && d->gz != NULL)
       res = gzseek(d->gz,Over,SEEK_CUR);
 #ifdef HAVE_ZLIB
    if (d != NULL && d->gz != NULL)
       res = gzseek(d->gz,Over,SEEK_CUR);

diff --git a/debian/changelog b/debian/changelog
index 6e31784f204d429f94bd53b57229336d5b9444a2..86d2197c15a085829470d7930b22bf0fcbe70e04 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 apt (0.9.11.5) UNRELEASED; urgency=low
 
 apt (0.9.11.5) UNRELEASED; urgency=low
 

+  [ Christian Perrier ]

   * Fix typo in apt-private/private-show.cc. Thanks to Benjamin
     Keresa. Closes: #724073
   * Fix typo in apt-private/private-show.cc. Thanks to Benjamin
     Keresa. Closes: #724073

+  
+  [  Mark Hymers ]
+  * fix libapt-inst for >2G debs (closes: #725483)

 
  -- Christian Perrier <bubulle@debian.org>  Mon, 23 Sep 2013 07:05:34 +0200
 
 
  -- Christian Perrier <bubulle@debian.org>  Mon, 23 Sep 2013 07:05:34 +0200