projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarify the --help for 'purge' (LP: #243948)
[apt.git]
/
apt-inst
/
contrib
/
extracttar.cc
diff --git
a/apt-inst/contrib/extracttar.cc
b/apt-inst/contrib/extracttar.cc
index 2585986d71775082b7b93bdb6610af364050e48a..8338fd89d2803e69b97775728a50e37eb660da67 100644
(file)
--- a/
apt-inst/contrib/extracttar.cc
+++ b/
apt-inst/contrib/extracttar.cc
@@
-16,9
+16,6
@@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/extracttar.h"
-#endif
#include <apt-pkg/extracttar.h>
#include <apt-pkg/error.h>
#include <apt-pkg/extracttar.h>
#include <apt-pkg/error.h>
@@
-136,7
+133,8
@@
bool ExtractTar::StartGzip()
const char *Args[3];
string confvar = string("dir::bin::") + DecompressProg;
const char *Args[3];
string confvar = string("dir::bin::") + DecompressProg;
- Args[0] = _config->Find(confvar.c_str(),DecompressProg.c_str()).c_str();
+ string argv0 = _config->Find(confvar.c_str(),DecompressProg.c_str());
+ Args[0] = argv0.c_str();
Args[1] = "-d";
Args[2] = 0;
execvp(Args[0],(char **)Args);
Args[1] = "-d";
Args[2] = 0;
execvp(Args[0],(char **)Args);
@@
-210,14
+208,14
@@
bool ExtractTar::Go(pkgDirStream &Stream)
Itm.Name = (char *)LastLongName.c_str();
else
{
Itm.Name = (char *)LastLongName.c_str();
else
{
- Tar->Name[sizeof(Tar->Name)] = 0;
+ Tar->Name[sizeof(Tar->Name)
-1
] = 0;
Itm.Name = Tar->Name;
}
if (Itm.Name[0] == '.' && Itm.Name[1] == '/' && Itm.Name[2] != 0)
Itm.Name += 2;
// Grab the link target
Itm.Name = Tar->Name;
}
if (Itm.Name[0] == '.' && Itm.Name[1] == '/' && Itm.Name[2] != 0)
Itm.Name += 2;
// Grab the link target
- Tar->Name[sizeof(Tar->LinkName)] = 0;
+ Tar->Name[sizeof(Tar->LinkName)
-1
] = 0;
Itm.LinkTarget = Tar->LinkName;
if (LastLongLink.empty() == false)
Itm.LinkTarget = Tar->LinkName;
if (LastLongLink.empty() == false)
@@
-309,7
+307,7
@@
bool ExtractTar::Go(pkgDirStream &Stream)
while (Size != 0)
{
unsigned char Junk[32*1024];
while (Size != 0)
{
unsigned char Junk[32*1024];
- unsigned long Read =
MIN(Size,
sizeof(Junk));
+ unsigned long Read =
min(Size,(unsigned long)
sizeof(Junk));
if (InFd.Read(Junk,((Read+511)/512)*512) == false)
return false;
if (InFd.Read(Junk,((Read+511)/512)*512) == false)
return false;
@@
-334,7
+332,7
@@
bool ExtractTar::Go(pkgDirStream &Stream)
}
// And finish up
}
// And finish up
- if (Itm.Size
!
= 0 && BadRecord == false)
+ if (Itm.Size
>
= 0 && BadRecord == false)
if (Stream.FinishedFile(Itm,Fd) == false)
return false;
if (Stream.FinishedFile(Itm,Fd) == false)
return false;