diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:17 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:17 +0000 |
| commit | 20ebd488ff29272654ab101d5ca25fa5fd4905f5 (patch) | |
| tree | 7d9400abe56d19191c356b21ddaa3e617f5cf57e /cmdline | |
| parent | e28f10c4b7db4283bb1d65e3a1a9b025f3becd5b (diff) | |
Core correctness patches
Author: jgg
Date: 2001-03-13 05:23:42 GMT
Core correctness patches
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-cdrom.cc | 5 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 4 | ||||
| -rw-r--r-- | cmdline/indexcopy.cc | 11 |
3 files changed, 11 insertions, 9 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index c43029e5e..0c948098b 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-cdrom.cc,v 1.36 2001/02/20 07:03:17 jgg Exp $ +// $Id: apt-cdrom.cc,v 1.37 2001/03/13 05:23:42 jgg Exp $ /* ###################################################################### APT CDROM - Tool for handling APT's CDROM database. @@ -134,7 +134,8 @@ bool FindPackages(string CD,vector<string> &List,vector<string> &SList, bool DropBinaryArch(vector<string> &List) { char S[300]; - sprintf(S,"/binary-%s/",_config->Find("Apt::Architecture").c_str()); + snprintf(S,sizeof(S),"/binary-%s/", + _config->Find("Apt::Architecture").c_str()); for (unsigned int I = 0; I < List.size(); I++) { diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2ddf240d6..c449b3379 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-get.cc,v 1.103 2001/03/03 23:12:07 jgg Exp $ +// $Id: apt-get.cc,v 1.104 2001/03/13 05:23:42 jgg Exp $ /* ###################################################################### apt-get - Cover for dpkg @@ -429,7 +429,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache) Added[P->ID] = true; char S[300]; - sprintf(S,_("%s (due to %s) "),P.Name(),I.Name()); + snprintf(S,sizeof(S),_("%s (due to %s) "),P.Name(),I.Name()); List += S; } } diff --git a/cmdline/indexcopy.cc b/cmdline/indexcopy.cc index 389d3c547..73d9e5077 100644 --- a/cmdline/indexcopy.cc +++ b/cmdline/indexcopy.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: indexcopy.cc,v 1.6 2001/02/20 07:03:17 jgg Exp $ +// $Id: indexcopy.cc,v 1.7 2001/03/13 05:23:42 jgg Exp $ /* ###################################################################### Index Copying - Aid for copying and verifying the index files @@ -113,8 +113,8 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List) // Open the output file char S[400]; - sprintf(S,"cdrom:[%s]/%s%s",Name.c_str(),(*I).c_str() + CDROM.length(), - GetFileName()); + snprintf(S,sizeof(S),"cdrom:[%s]/%s%s",Name.c_str(), + (*I).c_str() + CDROM.length(),GetFileName()); string TargetF = _config->FindDir("Dir::State::lists") + "partial/"; TargetF += URItoFileName(S); if (_config->FindB("APT::CDROM::NoAct",false) == true) @@ -229,7 +229,8 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List) return _error->Errno("rename","Failed to rename"); // Copy the release file - sprintf(S,"cdrom:[%s]/%sRelease",Name.c_str(),(*I).c_str() + CDROM.length()); + snprintf(S,sizeof(S),"cdrom:[%s]/%sRelease",Name.c_str(), + (*I).c_str() + CDROM.length()); string TargetF = _config->FindDir("Dir::State::lists") + "partial/"; TargetF += URItoFileName(S); if (FileExists(*I + "Release") == true) @@ -381,7 +382,7 @@ bool IndexCopy::ReconstructChop(unsigned long &Chop,string Dir,string File) void IndexCopy::ConvertToSourceList(string CD,string &Path) { char S[300]; - sprintf(S,"binary-%s",_config->Find("Apt::Architecture").c_str()); + snprintf(S,sizeof(S),"binary-%s",_config->Find("Apt::Architecture").c_str()); // Strip the cdrom base path Path = string(Path,CD.length()); |