diff options
| author | Eugene V. Lyubimkin <jackyf@1501-debian> | 2008-11-07 23:59:28 +0200 |
|---|---|---|
| committer | Eugene V. Lyubimkin <jackyf@1501-debian> | 2008-11-07 23:59:28 +0200 |
| commit | 8669a82ef889bdb947d62ab3ff11f27d70a9d2d6 (patch) | |
| tree | 45401aef2b4e7e9bd0930640727af2c82f575c50 /apt-pkg/contrib | |
| parent | 425684e05521bba07b03dc2c5e647908ce757141 (diff) | |
| parent | f03edb29dfcc1ece0dd4161705830274bf0f7739 (diff) | |
Merged from debian-sid.
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/cdromutl.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/contrib/mmap.cc | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index 6f00e1451..b6524a178 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -176,7 +176,8 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version) Hash.Add(Dir->d_name); }; - chdir(StartDir.c_str()); + if (chdir(StartDir.c_str()) != 0) + return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str()); closedir(D); // Some stats from the fsys diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index abcae46fe..eed438250 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -192,7 +192,8 @@ DynamicMMap::~DynamicMMap() unsigned long EndOfFile = iSize; iSize = WorkSpace; Close(false); - ftruncate(Fd->Fd(),EndOfFile); + if(ftruncate(Fd->Fd(),EndOfFile) < 0) + _error->Errno("ftruncate", _("Failed to truncate file")); } /*}}}*/ // DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space /*{{{*/ @@ -209,7 +210,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln) // Just in case error check if (Result + Size > WorkSpace) { - _error->Error("Dynamic MMap ran out of room"); + _error->Error(_("Dynamic MMap ran out of room")); return 0; } |