projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
support long keyid and fingerprint in gpgv's GOODSIG
[apt.git]
/
apt-inst
/
contrib
/
extracttar.h
diff --git
a/apt-inst/contrib/extracttar.h
b/apt-inst/contrib/extracttar.h
index 6daf00a275f4793dccce69015b74fcc2d6beb8c3..edd3cec8ed20f0de9a0bdb116ed6f4ef4f00da53 100644
(file)
--- a/
apt-inst/contrib/extracttar.h
+++ b/
apt-inst/contrib/extracttar.h
@@
-14,16
+14,18
@@
#ifndef PKGLIB_EXTRACTTAR_H
#define PKGLIB_EXTRACTTAR_H
#ifndef PKGLIB_EXTRACTTAR_H
#define PKGLIB_EXTRACTTAR_H
-#ifdef __GNUG__
-#pragma interface "apt-pkg/extracttar.h"
-#endif
-
#include <apt-pkg/fileutl.h>
#include <apt-pkg/fileutl.h>
-#include <apt-pkg/
dirstream
.h>
+#include <apt-pkg/
macros
.h>
-#include <
algorithm
>
+#include <
string
>
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/dirstream.h>
+#include <algorithm>
using std::min;
using std::min;
+#endif
+
+class pkgDirStream;
class ExtractTar
{
class ExtractTar
{
@@
-38,21
+40,22
@@
class ExtractTar
GNU_LongLink = 'K',GNU_LongName = 'L'};
FileFd &File;
GNU_LongLink = 'K',GNU_LongName = 'L'};
FileFd &File;
- unsigned long MaxInSize;
+ unsigned long
long
MaxInSize;
int GZPid;
FileFd InFd;
bool Eof;
int GZPid;
FileFd InFd;
bool Eof;
- string DecompressProg;
+ st
d::st
ring DecompressProg;
// Fork and reap gzip
bool StartGzip();
// Fork and reap gzip
bool StartGzip();
- bool Done(bool Force);
-
+ bool Done();
+ APT_DEPRECATED_MSG("Parameter Force is ignored, use Done() instead.") bool Done(bool Force);
+
public:
bool Go(pkgDirStream &Stream);
public:
bool Go(pkgDirStream &Stream);
-
- ExtractTar(FileFd &Fd,unsigned long
Max,
string DecompressionProgram);
+
+ ExtractTar(FileFd &Fd,unsigned long
long Max,std::
string DecompressionProgram);
virtual ~ExtractTar();
};
virtual ~ExtractTar();
};