summaryrefslogtreecommitdiff
path: root/cmdline/indexcopy.cc
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:58:05 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:58:05 +0000
commit076d01b04c20200fc72fc22de41c4872af484650 (patch)
tree69b1cf0aefd04868fb193132a2623fea137528f7 /cmdline/indexcopy.cc
parent43b3b6267f24ef28f74f9b16999844fb9809e72b (diff)
G++3 fixes from Randolph
Author: jgg Date: 2001-05-27 04:45:49 GMT G++3 fixes from Randolph
Diffstat (limited to 'cmdline/indexcopy.cc')
-rw-r--r--cmdline/indexcopy.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/cmdline/indexcopy.cc b/cmdline/indexcopy.cc
index 73d9e5077..d7efaa949 100644
--- a/cmdline/indexcopy.cc
+++ b/cmdline/indexcopy.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: indexcopy.cc,v 1.7 2001/03/13 05:23:42 jgg Exp $
+// $Id: indexcopy.cc,v 1.8 2001/05/27 04:47:21 jgg Exp $
/* ######################################################################
Index Copying - Aid for copying and verifying the index files
@@ -25,6 +25,8 @@
#include <stdio.h>
/*}}}*/
+using namespace std;
+
// IndexCopy::CopyPackages - Copy the package files from the CD /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -94,7 +96,8 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List)
SetCloseExec(STDOUT_FILENO,false);
const char *Args[3];
- Args[0] = _config->Find("Dir::bin::gzip","gzip").c_str();
+ string Tmp = _config->Find("Dir::bin::gzip","gzip");
+ Args[0] = Tmp.c_str();
Args[1] = "-d";
Args[2] = 0;
execvp(Args[0],(char **)Args);
@@ -394,7 +397,7 @@ void IndexCopy::ConvertToSourceList(string CD,string &Path)
return;
// Not a dists type.
- if (stringcmp(Path.begin(),Path.begin()+strlen("dists/"),"dists/") != 0)
+ if (stringcmp(Path.c_str(),Path.c_str()+strlen("dists/"),"dists/") != 0)
return;
// Isolate the dist