diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-18 08:32:47 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-18 08:32:47 +0200 |
| commit | aa0bd601ea3db281187275bbbece760d85ff29d9 (patch) | |
| tree | c84bebb3966255cdae36562024592c6b4eb6a2f2 /apt-pkg/contrib | |
| parent | 80624be7c54aec6ed98ee254366155024fca1a71 (diff) | |
| parent | 6074bc9ba4ecdd08674a828bdb46323b5d8bf957 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
debian/changelog
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 02b30dc1f..29450ada0 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1278,7 +1278,8 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C if (d->lzma == NULL) d->lzma = new FileFdPrivate::LZMAFILE; d->lzma->file = (FILE*) compress_struct; - d->lzma->stream = LZMA_STREAM_INIT; + lzma_stream tmp_stream = LZMA_STREAM_INIT; + d->lzma->stream = tmp_stream; if ((Mode & ReadWrite) == ReadWrite) return FileFdError("ReadWrite mode is not supported for file %s", FileName.c_str()); @@ -1834,7 +1835,8 @@ static bool StatFileFd(char const * const msg, int const iFd, std::string const // higher-level code will generate more meaningful messages, // even translated this would be meaningless for users return _error->Errno("fstat", "Unable to determine %s for fd %i", msg, iFd); - ispipe = S_ISFIFO(Buf.st_mode); + if (FileName.empty() == false) + ispipe = S_ISFIFO(Buf.st_mode); } // for compressor pipes st_size is undefined and at 'best' zero |