1 diff -urN apt-0.3.19cnc55.org/apt-pkg/acquire-method.cc apt-0.3.19cnc55/apt-pkg/acquire-method.cc
2 --- apt-0.3.19cnc55.org/apt-pkg/acquire-method.cc Tue Mar 12 18:04:10 2002
3 +++ apt-0.3.19cnc55/apt-pkg/acquire-method.cc Tue Mar 12 17:18:31 2002
12 // AcqMethod::pkgAcqMethod - Constructor /*{{{*/
14 void pkgAcqMethod::Fail(string Err,bool Transient)
16 // Strip out junk from the error messages
17 - for (char *I = Err.begin(); I != Err.end(); I++)
18 + for (string::iterator I = Err.begin(); I != Err.end(); I++)
24 ::Configuration &Cnf = *_config;
26 - const char *I = Message.begin();
27 + const char *I = Message.data();
29 unsigned int Length = strlen("Config-Item");
30 - for (; I + Length < Message.end(); I++)
31 + for (; I + Length < Message.data()+Message.size(); I++)
34 if (I[Length] != ':' || stringcasecmp(I,I+Length,"Config-Item") != 0)
39 - for (; I < Message.end() && *I == ' '; I++);
40 + for (; I < Message.data()+Message.size() && *I == ' '; I++);
41 const char *Equals = I;
42 - for (; Equals < Message.end() && *Equals != '='; Equals++);
43 + for (; Equals < Message.data()+Message.size() && *Equals != '='; Equals++);
44 const char *End = Equals;
45 - for (; End < Message.end() && *End != '\n'; End++);
46 + for (; End < Message.data()+Message.size() && *End != '\n'; End++);
50 diff -urN apt-0.3.19cnc55.org/apt-pkg/acquire-worker.cc apt-0.3.19cnc55/apt-pkg/acquire-worker.cc
51 --- apt-0.3.19cnc55.org/apt-pkg/acquire-worker.cc Tue Mar 12 18:04:10 2002
52 +++ apt-0.3.19cnc55/apt-pkg/acquire-worker.cc Tue Mar 12 17:18:31 2002
55 dup2(Pipes[1],STDOUT_FILENO);
56 dup2(Pipes[2],STDIN_FILENO);
57 - dup2(((filebuf *)clog.rdbuf())->fd(),STDERR_FILENO);
58 +// dup2(((filebuf *)clog.rdbuf())->fd(),STDERR_FILENO);
59 SetCloseExec(STDOUT_FILENO,false);
60 SetCloseExec(STDIN_FILENO,false);
61 SetCloseExec(STDERR_FILENO,false);
66 - Res = write(OutFd,OutQueue.begin(),OutQueue.length());
67 + Res = write(OutFd,OutQueue.data(),OutQueue.length());
69 while (Res < 0 && errno == EINTR);
71 diff -urN apt-0.3.19cnc55.org/apt-pkg/acquire-worker.h apt-0.3.19cnc55/apt-pkg/acquire-worker.h
72 --- apt-0.3.19cnc55.org/apt-pkg/acquire-worker.h Tue Mar 12 18:04:10 2002
73 +++ apt-0.3.19cnc55/apt-pkg/acquire-worker.h Tue Mar 12 17:18:38 2002
75 // Interfacing to the method process
76 class pkgAcquire::Worker
79 + friend class pkgAcquire;
85 /* Linked list starting at a Queue and a linked list starting
87 diff -urN apt-0.3.19cnc55.org/apt-pkg/acquire.cc apt-0.3.19cnc55/apt-pkg/acquire.cc
88 --- apt-0.3.19cnc55.org/apt-pkg/acquire.cc Tue Mar 12 18:04:10 2002
89 +++ apt-0.3.19cnc55/apt-pkg/acquire.cc Tue Mar 12 17:18:31 2002
93 // Shut down the items
94 - for (Item **I = Items.begin(); I != Items.end(); I++)
95 + for (vector<Item *>::iterator I = Items.begin(); I != Items.end(); I++)
98 if (_error->PendingError())
99 diff -urN apt-0.3.19cnc55.org/apt-pkg/acquire.h apt-0.3.19cnc55/apt-pkg/acquire.h
100 --- apt-0.3.19cnc55.org/apt-pkg/acquire.h Tue Mar 12 18:04:10 2002
101 +++ apt-0.3.19cnc55/apt-pkg/acquire.h Tue Mar 12 17:18:38 2002
106 +using namespace std;
109 #pragma interface "apt-pkg/acquire.h"
117 + friend class Queue;
122 // Simple iteration mechanism
123 inline Worker *WorkersBegin() {return Workers;};
124 Worker *WorkerStep(Worker *I);
125 - inline Item **ItemsBegin() {return Items.begin();};
126 - inline Item **ItemsEnd() {return Items.end();};
127 + inline Item **ItemsBegin() {return &*Items.begin();};
128 + inline Item **ItemsEnd() {return &*Items.end();};
130 // Iterate over queued Item URIs
133 // List of possible items queued for download.
134 class pkgAcquire::Queue
137 - friend pkgAcquire::UriIterator;
138 + friend class pkgAcquire;
139 + friend class pkgAcquire::UriIterator;
143 diff -urN apt-0.3.19cnc55.org/apt-pkg/algorithms.cc apt-0.3.19cnc55/apt-pkg/algorithms.cc
144 --- apt-0.3.19cnc55.org/apt-pkg/algorithms.cc Tue Mar 12 18:04:10 2002
145 +++ apt-0.3.19cnc55/apt-pkg/algorithms.cc Tue Mar 12 17:21:54 2002
147 #include <apt-pkg/algorithms.h>
148 #include <apt-pkg/error.h>
149 #include <apt-pkg/configuration.h>
150 -#include <iostream.h>
155 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/cdromutl.h apt-0.3.19cnc55/apt-pkg/contrib/cdromutl.h
156 --- apt-0.3.19cnc55.org/apt-pkg/contrib/cdromutl.h Tue Mar 12 18:04:10 2002
157 +++ apt-0.3.19cnc55/apt-pkg/contrib/cdromutl.h Tue Mar 12 17:18:38 2002
159 #define PKGLIB_ACQUIRE_METHOD_H
162 +using namespace std;
165 #pragma interface "apt-pkg/cdromutl.h"
166 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/configuration.cc apt-0.3.19cnc55/apt-pkg/contrib/configuration.cc
167 --- apt-0.3.19cnc55.org/apt-pkg/contrib/configuration.cc Tue Mar 12 18:04:10 2002
168 +++ apt-0.3.19cnc55/apt-pkg/contrib/configuration.cc Tue Mar 12 17:19:51 2002
170 #include <apt-pkg/strutl.h>
173 -#include <fstream.h>
178 Configuration *_config = new Configuration;
182 for (; I != 0; Last = &I->Next, I = I->Next)
183 - if ((Res = stringcasecmp(I->Tag.begin(),I->Tag.end(),S,S + Len)) == 0)
184 + if ((Res = stringcasecmp(I->Tag.data(),I->Tag.data()+I->Tag.size(),S,S + Len)) == 0)
191 // Open the stream for reading
192 - ifstream F(FName.c_str(),ios::in | ios::nocreate);
193 + ifstream F(FName.c_str(),ios::in);
195 return _error->Errno("ifstream::ifstream","Opening configuration file %s",FName.c_str());
197 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/configuration.h apt-0.3.19cnc55/apt-pkg/contrib/configuration.h
198 --- apt-0.3.19cnc55.org/apt-pkg/contrib/configuration.h Tue Mar 12 18:04:10 2002
199 +++ apt-0.3.19cnc55/apt-pkg/contrib/configuration.h Tue Mar 12 17:18:38 2002
204 +using namespace std;
209 string FindFile(const char *Name,const char *Default = 0) const;
210 string FindDir(const char *Name,const char *Default = 0) const;
211 int FindI(const char *Name,int Default = 0) const;
212 - int FindI(string Name,bool Default = 0) const {return FindI(Name.c_str(),Default);};
213 + int FindI(string Name,bool Default = 0) const {return FindI(Name.c_str(),int (Default));};
214 bool FindB(const char *Name,bool Default = false) const;
215 bool FindB(string Name,bool Default = false) const {return FindB(Name.c_str(),Default);};
216 string FindAny(const char *Name,const char *Default = 0) const;
217 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/error.cc apt-0.3.19cnc55/apt-pkg/contrib/error.cc
218 --- apt-0.3.19cnc55.org/apt-pkg/contrib/error.cc Tue Mar 12 18:04:10 2002
219 +++ apt-0.3.19cnc55/apt-pkg/contrib/error.cc Tue Mar 12 17:18:31 2002
225 +using namespace std;
230 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/error.h apt-0.3.19cnc55/apt-pkg/contrib/error.h
231 --- apt-0.3.19cnc55.org/apt-pkg/contrib/error.h Tue Mar 12 18:04:10 2002
232 +++ apt-0.3.19cnc55/apt-pkg/contrib/error.h Tue Mar 12 17:18:38 2002
237 +using namespace std;
241 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/fileutl.cc apt-0.3.19cnc55/apt-pkg/contrib/fileutl.cc
242 --- apt-0.3.19cnc55.org/apt-pkg/contrib/fileutl.cc Tue Mar 12 18:04:10 2002
243 +++ apt-0.3.19cnc55/apt-pkg/contrib/fileutl.cc Tue Mar 12 17:18:31 2002
245 #include <sys/wait.h>
249 +using namespace std;
252 // CopyFile - Buffered copy of a file /*{{{*/
253 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/fileutl.h apt-0.3.19cnc55/apt-pkg/contrib/fileutl.h
254 --- apt-0.3.19cnc55.org/apt-pkg/contrib/fileutl.h Tue Mar 12 18:04:10 2002
255 +++ apt-0.3.19cnc55/apt-pkg/contrib/fileutl.h Tue Mar 12 17:18:38 2002
260 +using namespace std;
264 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/i18n.h apt-0.3.19cnc55/apt-pkg/contrib/i18n.h
265 --- apt-0.3.19cnc55.org/apt-pkg/contrib/i18n.h Tue Mar 12 18:04:10 2002
266 +++ apt-0.3.19cnc55/apt-pkg/contrib/i18n.h Tue Mar 12 17:18:31 2002
268 # define bindtextdomain(Domain, Directory) /* empty */
270 # define textdomain(Domain) /* empty */
272 -# define setlocale(cat, log)
274 +//# define setlocale(cat, log)
278 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/md5.cc apt-0.3.19cnc55/apt-pkg/contrib/md5.cc
279 --- apt-0.3.19cnc55.org/apt-pkg/contrib/md5.cc Tue Mar 12 18:04:10 2002
280 +++ apt-0.3.19cnc55/apt-pkg/contrib/md5.cc Tue Mar 12 17:18:31 2002
282 /* Converts the hex string into a set of chars */
283 bool MD5SumValue::Set(string Str)
285 - return Hex2Num(Str.begin(),Str.end(),Sum,sizeof(Sum));
286 + return Hex2Num(Str.data(),Str.data()+Str.size(),Sum,sizeof(Sum));
289 // MD5SumValue::Value - Convert the number into a string /*{{{*/
290 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/md5.h apt-0.3.19cnc55/apt-pkg/contrib/md5.h
291 --- apt-0.3.19cnc55.org/apt-pkg/contrib/md5.h Tue Mar 12 18:04:10 2002
292 +++ apt-0.3.19cnc55/apt-pkg/contrib/md5.h Tue Mar 12 17:18:38 2002
297 +using namespace std;
303 - friend MD5Summation;
304 + friend class MD5Summation;
305 unsigned char Sum[4*4];
308 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/mmap.h apt-0.3.19cnc55/apt-pkg/contrib/mmap.h
309 --- apt-0.3.19cnc55.org/apt-pkg/contrib/mmap.h Tue Mar 12 18:04:10 2002
310 +++ apt-0.3.19cnc55/apt-pkg/contrib/mmap.h Tue Mar 12 17:18:38 2002
312 unsigned long RawAllocate(unsigned long Size,unsigned long Aln = 0);
313 unsigned long Allocate(unsigned long ItemSize);
314 unsigned long WriteString(const char *String,unsigned long Len = (unsigned long)-1);
315 - inline unsigned long WriteString(string S) {return WriteString(S.begin(),S.size());};
316 + inline unsigned long WriteString(string S) {return WriteString(S.data(),S.size());};
317 void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;};
319 DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace = 2*1024*1024);
320 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/progress.cc apt-0.3.19cnc55/apt-pkg/contrib/progress.cc
321 --- apt-0.3.19cnc55.org/apt-pkg/contrib/progress.cc Tue Mar 12 18:04:10 2002
322 +++ apt-0.3.19cnc55/apt-pkg/contrib/progress.cc Tue Mar 12 17:18:31 2002
324 #include <apt-pkg/error.h>
325 #include <apt-pkg/configuration.h>
331 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/progress.h apt-0.3.19cnc55/apt-pkg/contrib/progress.h
332 --- apt-0.3.19cnc55.org/apt-pkg/contrib/progress.h Tue Mar 12 18:04:10 2002
333 +++ apt-0.3.19cnc55/apt-pkg/contrib/progress.h Tue Mar 12 17:18:38 2002
337 #include <sys/time.h>
338 +using namespace std;
342 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/strutl.cc apt-0.3.19cnc55/apt-pkg/contrib/strutl.cc
343 --- apt-0.3.19cnc55.org/apt-pkg/contrib/strutl.cc Tue Mar 12 18:04:10 2002
344 +++ apt-0.3.19cnc55/apt-pkg/contrib/strutl.cc Tue Mar 12 17:18:31 2002
345 @@ -464,22 +464,22 @@
347 // Look for a matching tag.
348 int Length = strlen(Tag);
349 - for (string::iterator I = Message.begin(); I + Length < Message.end(); I++)
350 + for (const char *I = Message.data(); I + Length < Message.data()+Message.size(); I++)
353 if (I[Length] == ':' && stringcasecmp(I,I+Length,Tag) == 0)
355 // Find the end of line and strip the leading/trailing spaces
356 - string::iterator J;
359 - for (; isspace(*I) != 0 && I < Message.end(); I++);
360 - for (J = I; *J != '\n' && J < Message.end(); J++);
361 + for (; isspace(*I) != 0 && I < Message.data()+Message.size(); I++);
362 + for (J = I; *J != '\n' && J < Message.data()+Message.size(); J++);
363 for (; J > I && isspace(J[-1]) != 0; J--);
365 return string(I,J-I);
368 - for (; *I != '\n' && I < Message.end(); I++);
369 + for (; *I != '\n' && I < Message.data()+Message.size(); I++);
372 // Failed to find a match
374 // ---------------------------------------------------------------------
375 /* This inspects the string to see if it is true or if it is false and
376 then returns the result. Several varients on true/false are checked. */
377 -int StringToBool(string Text,int Default = -1)
378 +int StringToBool(string Text,int Default)
381 int Res = strtol(Text.c_str(),&End,0);
382 @@ -867,16 +867,16 @@
383 matched against the argument */
384 bool CheckDomainList(string Host,string List)
386 - string::const_iterator Start = List.begin();
387 - for (string::const_iterator Cur = List.begin(); Cur <= List.end(); Cur++)
388 + const char *Start = List.data();
389 + for (const char *Cur = List.data(); Cur <= List.data()+List.size(); Cur++)
391 - if (Cur < List.end() && *Cur != ',')
392 + if (Cur < List.data()+List.size() && *Cur != ',')
395 // Match the end of the string..
396 if ((Host.size() >= (unsigned)(Cur - Start)) &&
398 - stringcasecmp(Host.end() - (Cur - Start),Host.end(),Start,Cur) == 0)
399 + stringcasecmp(Host.data()+Host.size() - (Cur - Start),Host.data()+Host.size(),Start,Cur) == 0)
403 diff -urN apt-0.3.19cnc55.org/apt-pkg/contrib/strutl.h apt-0.3.19cnc55/apt-pkg/contrib/strutl.h
404 --- apt-0.3.19cnc55.org/apt-pkg/contrib/strutl.h Tue Mar 12 18:04:10 2002
405 +++ apt-0.3.19cnc55/apt-pkg/contrib/strutl.h Tue Mar 12 17:18:38 2002
411 +using namespace std;
413 char *_strstrip(char *String);
414 char *_strtabexpand(char *String,size_t Len);
415 bool ParseQuoteWord(const char *&String,string &Res);
418 int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
419 inline int stringcmp(const char *A,const char *AEnd,const char *B) {return stringcmp(A,AEnd,B,B+strlen(B));};
420 -inline int stringcmp(string A,const char *B) {return stringcmp(A.begin(),A.end(),B,B+strlen(B));};
421 +inline int stringcmp(string A,const char *B) {return stringcmp(A.data(),A.data()+A.size(),B,B+strlen(B));};
422 int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
423 inline int stringcasecmp(const char *A,const char *AEnd,const char *B) {return stringcasecmp(A,AEnd,B,B+strlen(B));};
424 -inline int stringcasecmp(string A,const char *B) {return stringcasecmp(A.begin(),A.end(),B,B+strlen(B));};
425 -inline int stringcasecmp(string A,string B) {return stringcasecmp(A.begin(),A.end(),B.begin(),B.end());};
426 +inline int stringcasecmp(string A,const char *B) {return stringcasecmp(A.data(),A.data()+A.size(),B,B+strlen(B));};
427 +inline int stringcasecmp(string A,string B) {return stringcasecmp(A.data(),A.data()+A.size(),B.data(),B.data()+B.size());};
431 diff -urN apt-0.3.19cnc55.org/apt-pkg/deb/deblistparser.cc apt-0.3.19cnc55/apt-pkg/deb/deblistparser.cc
432 --- apt-0.3.19cnc55.org/apt-pkg/deb/deblistparser.cc Tue Mar 12 18:04:10 2002
433 +++ apt-0.3.19cnc55/apt-pkg/deb/deblistparser.cc Tue Mar 12 17:18:31 2002
435 #include <apt-pkg/crc-16.h>
441 // ListParser::debListParser - Constructor /*{{{*/
443 if (Section.Find("Architecture",Start,Stop) == false)
446 - if (stringcmp(Start,Stop,Arch.begin(),Arch.end()) == 0)
447 + if (stringcmp(Start,Stop,Arch.data(),Arch.data()+Arch.size()) == 0)
450 if (stringcmp(Start,Stop,"all") == 0)
451 diff -urN apt-0.3.19cnc55.org/apt-pkg/deb/debsrcrecords.cc apt-0.3.19cnc55/apt-pkg/deb/debsrcrecords.cc
452 --- apt-0.3.19cnc55.org/apt-pkg/deb/debsrcrecords.cc Tue Mar 12 18:04:10 2002
453 +++ apt-0.3.19cnc55/apt-pkg/deb/debsrcrecords.cc Tue Mar 12 17:18:31 2002
456 // XXX no bounds check: exploitable?
457 // Strip any leading spaces
458 - string::const_iterator Start = Bins.begin();
459 - for (; Start != Bins.end() && isspace(*Start) != 0; Start++);
460 + const char *Start = Bins.data();
461 + for (; Start != Bins.data()+Bins.size() && isspace(*Start) != 0; Start++);
463 - string::const_iterator Pos = Start;
464 - while (Pos != Bins.end())
465 + const char *Pos = Start;
466 + while (Pos != Bins.data()+Bins.size())
468 // Skip to the next ','
469 - for (; Pos != Bins.end() && *Pos != ','; Pos++);
470 + for (; Pos != Bins.data()+Bins.size() && *Pos != ','; Pos++);
472 // Back remove spaces
473 - string::const_iterator End = Pos;
474 + const char *End = Pos;
475 for (; End > Start && (End[-1] == ',' || isspace(End[-1]) != 0); End--);
482 - for (; Pos != Bins.end() && (*Pos == ',' || isspace(*Pos) != 0); Pos++);
483 + for (; Pos != Bins.data()+Bins.size() && (*Pos == ',' || isspace(*Pos) != 0); Pos++);
487 diff -urN apt-0.3.19cnc55.org/apt-pkg/deb/dpkginit.cc apt-0.3.19cnc55/apt-pkg/deb/dpkginit.cc
488 --- apt-0.3.19cnc55.org/apt-pkg/deb/dpkginit.cc Tue Mar 12 18:04:10 2002
489 +++ apt-0.3.19cnc55/apt-pkg/deb/dpkginit.cc Tue Mar 12 17:18:31 2002
491 #include <sys/types.h>
497 // DpkgLock::pkgDpkgLock - Constructor /*{{{*/
498 diff -urN apt-0.3.19cnc55.org/apt-pkg/deb/dpkgpm.cc apt-0.3.19cnc55/apt-pkg/deb/dpkgpm.cc
499 --- apt-0.3.19cnc55.org/apt-pkg/deb/dpkgpm.cc Tue Mar 12 18:04:10 2002
500 +++ apt-0.3.19cnc55/apt-pkg/deb/dpkgpm.cc Tue Mar 12 17:18:31 2002
506 +using namespace std;
509 // DPkgPM::pkgDPkgPM - Constructor /*{{{*/
512 /* Feed the filename of each package that is pending install
514 - if (Fd.Write(I->File.begin(),I->File.length()) == false ||
515 + if (Fd.Write(I->File.data(),I->File.length()) == false ||
516 Fd.Write("\n",1) == false)
518 kill(Process,SIGINT);
519 diff -urN apt-0.3.19cnc55.org/apt-pkg/pkgcache.cc apt-0.3.19cnc55/apt-pkg/pkgcache.cc
520 --- apt-0.3.19cnc55.org/apt-pkg/pkgcache.cc Tue Mar 12 18:04:10 2002
521 +++ apt-0.3.19cnc55/apt-pkg/pkgcache.cc Tue Mar 12 17:18:31 2002
523 for (const char *I = Str.begin(); I != Str.end(); I++)
524 Hash = 5*Hash + tolower(*I);
526 - for (const char *I = Str.begin(); I != Str.end(); I++)
527 + for (const char *I = Str.data(); I != Str.data()+Str.size(); I++)
530 return Hash % _count(HeaderP->HashTable);
532 return PkgIterator(*this,Pkg);
534 if (Pkg->Name != 0 && StrP[Pkg->Name] == Name[0] &&
535 - stringcmp(Name.begin(),Name.end(),StrP + Pkg->Name) == 0)
536 + stringcmp(Name.data(),Name.data()+Name.size(),StrP + Pkg->Name) == 0)
537 return PkgIterator(*this,Pkg);
540 diff -urN apt-0.3.19cnc55.org/apt-pkg/pkgcache.h apt-0.3.19cnc55/apt-pkg/pkgcache.h
541 --- apt-0.3.19cnc55.org/apt-pkg/pkgcache.h Tue Mar 12 18:04:10 2002
542 +++ apt-0.3.19cnc55/apt-pkg/pkgcache.h Tue Mar 12 17:18:38 2002
545 class PkgFileIterator;
546 class VerFileIterator;
547 - friend PkgIterator;
548 - friend VerIterator;
549 - friend DepIterator;
550 - friend PrvIterator;
551 - friend PkgFileIterator;
552 - friend VerFileIterator;
553 + friend class PkgIterator;
554 + friend class VerIterator;
555 + friend class DepIterator;
556 + friend class PrvIterator;
557 + friend class PkgFileIterator;
558 + friend class VerFileIterator;
560 // These are all the constants used in the cache structures
562 diff -urN apt-0.3.19cnc55.org/apt-pkg/pkgcachegen.cc apt-0.3.19cnc55/apt-pkg/pkgcachegen.cc
563 --- apt-0.3.19cnc55.org/apt-pkg/pkgcachegen.cc Tue Mar 12 18:04:10 2002
564 +++ apt-0.3.19cnc55/apt-pkg/pkgcachegen.cc Tue Mar 12 17:18:31 2002
567 for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
569 - Res = _system->versionCompare(Version.begin(),Version.end(),Ver.VerStr(),
570 + Res = _system->versionCompare(Version.data(),Version.data()+Version.size(),Ver.VerStr(),
571 Ver.VerStr() + strlen(Ver.VerStr()));
576 for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
578 - Res = _system->versionCompare(Version.begin(),Version.end(),Ver.VerStr(),
579 + Res = _system->versionCompare(Version.data(),Version.data()+Version.size(),Ver.VerStr(),
580 Ver.VerStr() + strlen(Ver.VerStr()));
583 diff -urN apt-0.3.19cnc55.org/apt-pkg/pkgcachegen.h apt-0.3.19cnc55/apt-pkg/pkgcachegen.h
584 --- apt-0.3.19cnc55.org/apt-pkg/pkgcachegen.h Tue Mar 12 18:04:10 2002
585 +++ apt-0.3.19cnc55/apt-pkg/pkgcachegen.h Tue Mar 12 17:18:38 2002
591 + friend class ListParser;
596 class pkgCacheGenerator::ListParser
598 pkgCacheGenerator *Owner;
599 - friend pkgCacheGenerator;
600 + friend class pkgCacheGenerator;
603 pkgCache::VerIterator OldDepVer;
604 diff -urN apt-0.3.19cnc55.org/apt-pkg/pkgrecords.h apt-0.3.19cnc55/apt-pkg/pkgrecords.h
605 --- apt-0.3.19cnc55.org/apt-pkg/pkgrecords.h Tue Mar 12 18:04:10 2002
606 +++ apt-0.3.19cnc55/apt-pkg/pkgrecords.h Tue Mar 12 17:18:38 2002
612 + friend class pkgRecords;
614 virtual bool Jump(pkgCache::VerFileIterator const &Ver) = 0;
616 diff -urN apt-0.3.19cnc55.org/apt-pkg/rpm/rpmfactory.h apt-0.3.19cnc55/apt-pkg/rpm/rpmfactory.h
617 --- apt-0.3.19cnc55.org/apt-pkg/rpm/rpmfactory.h Tue Mar 12 18:04:10 2002
618 +++ apt-0.3.19cnc55/apt-pkg/rpm/rpmfactory.h Tue Mar 12 17:18:38 2002
621 #include <apt-pkg/systemfactory.h>
627 class RPMFactory : public SystemFactory
628 diff -urN apt-0.3.19cnc55.org/apt-pkg/rpm/rpmlistparser.cc apt-0.3.19cnc55/apt-pkg/rpm/rpmlistparser.cc
629 --- apt-0.3.19cnc55.org/apt-pkg/rpm/rpmlistparser.cc Tue Mar 12 18:04:10 2002
630 +++ apt-0.3.19cnc55/apt-pkg/rpm/rpmlistparser.cc Tue Mar 12 17:18:31 2002
635 - AllowedDupPackages = new slist<regex_t*>;
636 + AllowedDupPackages = new list<regex_t*>;
638 const Configuration::Item *Top = _config->Tree("RPM::AllowedDupPkgs");
641 AllowedDupPackages = NULL;//akk
644 - HoldPackages = new slist<regex_t*>;
645 + HoldPackages = new list<regex_t*>;
647 Top = _config->Tree("RPM::HoldPkgs");
651 if (AllowedDupPackages != NULL)
653 - for (slist<regex_t*>::iterator iter = AllowedDupPackages->begin();
654 + for (list<regex_t*>::iterator iter = AllowedDupPackages->begin();
655 iter != AllowedDupPackages->end();
660 const char *str = Package().c_str();
662 - for (slist<regex_t*>::iterator iter = HoldPackages->begin();
663 + for (list<regex_t*>::iterator iter = HoldPackages->begin();
664 iter != HoldPackages->end();
667 diff -urN apt-0.3.19cnc55.org/apt-pkg/rpm/rpmlistparser.h apt-0.3.19cnc55/apt-pkg/rpm/rpmlistparser.h
668 --- apt-0.3.19cnc55.org/apt-pkg/rpm/rpmlistparser.h Tue Mar 12 18:04:10 2002
669 +++ apt-0.3.19cnc55/apt-pkg/rpm/rpmlistparser.h Tue Mar 12 17:18:38 2002
671 #include <apt-pkg/pkgcachegen.h>
672 #include <rpm/rpmlib.h>
678 +using namespace std;
680 class rpmListParser : public pkgCacheGenerator::ListParser
683 map<string,string> *multiarchs;
685 map<string,long> *DupPackages;
686 - slist<regex_t*> *AllowedDupPackages;
687 + list<regex_t*> *AllowedDupPackages;
690 - slist<regex_t*> *HoldPackages;
691 + list<regex_t*> *HoldPackages;
695 diff -urN apt-0.3.19cnc55.org/apt-pkg/rpm/rpmpm.cc apt-0.3.19cnc55/apt-pkg/rpm/rpmpm.cc
696 --- apt-0.3.19cnc55.org/apt-pkg/rpm/rpmpm.cc Tue Mar 12 18:04:10 2002
697 +++ apt-0.3.19cnc55/apt-pkg/rpm/rpmpm.cc Tue Mar 12 17:18:31 2002
703 +using namespace std;
709 /* Feed the filename of each package that is pending install
711 - if (Fd.Write(I->File.begin(),I->File.length()) == false ||
712 + if (Fd.Write(I->File.data(),I->File.length()) == false ||
713 Fd.Write("\n",1) == false)
715 kill(Process,SIGINT);
720 -bool pkgRPMPM::ExecRPM(Operation operation, slist<char*> *files, bool nodeps)
721 +bool pkgRPMPM::ExecRPM(Operation operation, list<char*> *files, bool nodeps)
723 // Generate the argument list
724 const char *Args[10000];
729 - for (slist<char*>::iterator i = files->begin();
730 + for (list<char*>::iterator i = files->begin();
731 i != files->end() && n < sizeof(Args);
738 -bool pkgRPMPM::Process(slist<char*> *install,
739 - slist<char*> *upgrade,
740 - slist<char*> *uninstall)
741 +bool pkgRPMPM::Process(list<char*> *install,
742 + list<char*> *upgrade,
743 + list<char*> *uninstall)
745 if (_config->FindB("RPM::Check-Signatures", false) == true)
748 if (RunScriptsWithPkgs("RPM::Pre-Install-Pkgs") == false)
751 - slist<char*> *install = new slist<char*>;
752 - slist<char*> *upgrade = new slist<char*>;
753 - slist<char*> *uninstall = new slist<char*>;
754 + list<char*> *install = new list<char*>;
755 + list<char*> *upgrade = new list<char*>;
756 + list<char*> *uninstall = new list<char*>;
758 for (vector<Item>::iterator I = List.begin(); I != List.end(); I++)
760 diff -urN apt-0.3.19cnc55.org/apt-pkg/rpm/rpmpm.h apt-0.3.19cnc55/apt-pkg/rpm/rpmpm.h
761 --- apt-0.3.19cnc55.org/apt-pkg/rpm/rpmpm.h Tue Mar 12 18:04:10 2002
762 +++ apt-0.3.19cnc55/apt-pkg/rpm/rpmpm.h Tue Mar 12 17:18:38 2002
765 #include <apt-pkg/packagemanager.h>
771 class pkgRPMPM : public pkgPackageManager
773 virtual bool Configure(PkgIterator Pkg);
774 virtual bool Remove(PkgIterator Pkg,bool Purge = false);
776 - bool ExecRPM(Operation operation, slist<char*> *files, bool nodeps);
777 - bool Process(slist<char*> *install,
778 - slist<char*> *upgrade,
779 - slist<char*> *uninstall);
780 + bool ExecRPM(Operation operation, list<char*> *files, bool nodeps);
781 + bool Process(list<char*> *install,
782 + list<char*> *upgrade,
783 + list<char*> *uninstall);
786 virtual void Reset();
787 diff -urN apt-0.3.19cnc55.org/apt-pkg/rpm/rpmversion.cc apt-0.3.19cnc55/apt-pkg/rpm/rpmversion.cc
788 --- apt-0.3.19cnc55.org/apt-pkg/rpm/rpmversion.cc Tue Mar 12 18:04:10 2002
789 +++ apt-0.3.19cnc55/apt-pkg/rpm/rpmversion.cc Tue Mar 12 17:18:31 2002
792 int RPMFactory::versionCompare(string A,string B)
794 - return versionCompare(A.begin(),A.end(),B.begin(),B.end());
795 + return versionCompare(A.data(),A.data()+A.size(),B.data(),B.data()+B.size());
799 diff -urN apt-0.3.19cnc55.org/apt-pkg/sourcelist.cc apt-0.3.19cnc55/apt-pkg/sourcelist.cc
800 --- apt-0.3.19cnc55.org/apt-pkg/sourcelist.cc Tue Mar 12 18:04:10 2002
801 +++ apt-0.3.19cnc55/apt-pkg/sourcelist.cc Tue Mar 12 17:21:01 2002
806 -#include <fstream.h>
812 bool pkgSourceList::Read(string File)
814 // Open the stream for reading
815 - ifstream F(File.c_str(),ios::in | ios::nocreate);
816 + ifstream F(File.c_str(),ios::in);
818 return _error->Errno("ifstream::ifstream","Opening %s",File.c_str());
820 diff -urN apt-0.3.19cnc55.org/apt-pkg/sourcelist.h apt-0.3.19cnc55/apt-pkg/sourcelist.h
821 --- apt-0.3.19cnc55.org/apt-pkg/sourcelist.h Tue Mar 12 18:04:10 2002
822 +++ apt-0.3.19cnc55/apt-pkg/sourcelist.h Tue Mar 12 17:20:20 2002
827 -#include <iostream.h>
829 #include <apt-pkg/pkgcache.h>
832 diff -urN apt-0.3.19cnc55.org/apt-pkg/tagfile.cc apt-0.3.19cnc55/apt-pkg/tagfile.cc
833 --- apt-0.3.19cnc55.org/apt-pkg/tagfile.cc Tue Mar 12 18:04:10 2002
834 +++ apt-0.3.19cnc55/apt-pkg/tagfile.cc Tue Mar 12 17:18:31 2002
840 +using namespace std;
843 // TagFile::pkgTagFile - Constructor /*{{{*/
844 diff -urN apt-0.3.19cnc55.org/apt-pkg/version.cc apt-0.3.19cnc55/apt-pkg/version.cc
845 --- apt-0.3.19cnc55.org/apt-pkg/version.cc Tue Mar 12 18:04:10 2002
846 +++ apt-0.3.19cnc55/apt-pkg/version.cc Tue Mar 12 17:18:31 2002
849 int SystemFactory::versionCompare(string A,string B)
851 - return versionCompare(A.begin(),A.end(),B.begin(),B.end());
852 + return versionCompare(A.data(),A.data()+A.size(),B.data(),B.data()+B.size());
856 diff -urN apt-0.3.19cnc55.org/cmdline/apt-cache.cc apt-0.3.19cnc55/cmdline/apt-cache.cc
857 --- apt-0.3.19cnc55.org/cmdline/apt-cache.cc Tue Mar 12 18:04:10 2002
858 +++ apt-0.3.19cnc55/cmdline/apt-cache.cc Tue Mar 12 17:24:41 2002
863 -#include <iostream.h>
868 diff -urN apt-0.3.19cnc55.org/cmdline/apt-cdrom.cc apt-0.3.19cnc55/cmdline/apt-cdrom.cc
869 --- apt-0.3.19cnc55.org/cmdline/apt-cdrom.cc Tue Mar 12 18:04:10 2002
870 +++ apt-0.3.19cnc55/cmdline/apt-cdrom.cc Tue Mar 12 17:31:04 2002
875 +using namespace std;
877 #define PACKAGES "pkglist"
878 #define SOURCES "srclist"
880 string File = _config->FindFile("Dir::Etc::sourcelist");
882 // Open the stream for reading
883 - ifstream F(File.c_str(),ios::in | ios::nocreate);
884 + ifstream F((FileExists(File)?File.c_str():"/dev/null"),
887 return _error->Errno("ifstream::ifstream","Opening %s",File.c_str());
889 diff -urN apt-0.3.19cnc55.org/cmdline/apt-get.cc apt-0.3.19cnc55/cmdline/apt-get.cc
890 --- apt-0.3.19cnc55.org/cmdline/apt-get.cc Tue Mar 12 18:04:10 2002
891 +++ apt-0.3.19cnc55/cmdline/apt-get.cc Tue Mar 12 17:28:13 2002
894 #include "acqprogress.h"
896 -#include <fstream.h>
899 #include <sys/ioctl.h>
900 #include <sys/stat.h>
903 #include <sys/wait.h>
905 +using namespace std;
914 ofstream devnull("/dev/null");
915 unsigned int ScreenWidth = 80;
917 @@ -1202,7 +1202,7 @@
918 // Populate it with the source selection
919 for (I = List.begin(); I != List.end(); I++)
921 - new pkgAcqIndex(&Fetcher,I);
922 + new pkgAcqIndex(&Fetcher,&*I);
923 if (_error->PendingError() == true)
926 diff -urN apt-0.3.19cnc55.org/cmdline/rpmindexcopy.cc apt-0.3.19cnc55/cmdline/rpmindexcopy.cc
927 --- apt-0.3.19cnc55.org/cmdline/rpmindexcopy.cc Tue Mar 12 18:04:10 2002
928 +++ apt-0.3.19cnc55/cmdline/rpmindexcopy.cc Tue Mar 12 17:31:30 2002
930 #include <apt-pkg/tagfile.h>
933 -#include <iostream.h>
936 #include <sys/stat.h>
938 diff -urN apt-0.3.19cnc55.org/methods/cdrom.cc apt-0.3.19cnc55/methods/cdrom.cc
939 --- apt-0.3.19cnc55.org/methods/cdrom.cc Tue Mar 12 18:04:10 2002
940 +++ apt-0.3.19cnc55/methods/cdrom.cc Tue Mar 12 17:18:31 2002
943 #include <sys/stat.h>
946 +using namespace std;
949 class CDROMMethod : public pkgAcqMethod
950 diff -urN apt-0.3.19cnc55.org/methods/gpg.cc apt-0.3.19cnc55/methods/gpg.cc
951 --- apt-0.3.19cnc55.org/methods/gpg.cc Tue Mar 12 18:04:10 2002
952 +++ apt-0.3.19cnc55/methods/gpg.cc Tue Mar 12 17:18:31 2002
956 #include <sys/wait.h>
960 class GPGMethod : public pkgAcqMethod
961 diff -urN apt-0.3.19cnc55.org/tools/cached_md5.cc apt-0.3.19cnc55/tools/cached_md5.cc
962 --- apt-0.3.19cnc55.org/tools/cached_md5.cc Tue Mar 12 18:04:10 2002
963 +++ apt-0.3.19cnc55/tools/cached_md5.cc Tue Mar 12 17:40:00 2002
969 #include <rpm/rpmlib.h>
970 #include <rpm/misc.h>
973 #include <sys/stat.h>
976 diff -urN apt-0.3.19cnc55.org/tools/cached_md5.h apt-0.3.19cnc55/tools/cached_md5.h
977 --- apt-0.3.19cnc55.org/tools/cached_md5.h Tue Mar 12 18:04:10 2002
978 +++ apt-0.3.19cnc55/tools/cached_md5.h Tue Mar 12 17:39:18 2002
983 +using namespace std;
988 diff -urN apt-0.3.19cnc55.org/tools/genpkglist.cc apt-0.3.19cnc55/tools/genpkglist.cc
989 --- apt-0.3.19cnc55.org/tools/genpkglist.cc Tue Mar 12 18:04:10 2002
990 +++ apt-0.3.19cnc55/tools/genpkglist.cc Tue Mar 12 17:38:11 2002
997 #include <apt-pkg/error.h>
998 #include <apt-pkg/tagfile.h>
1001 #include "cached_md5.h"
1004 +using namespace std;
1006 #define CRPMTAG_TIMESTAMP 1012345
1008 diff -urN apt-0.3.19cnc55.org/tools/gensrclist.cc apt-0.3.19cnc55/tools/gensrclist.cc
1009 --- apt-0.3.19cnc55.org/tools/gensrclist.cc Tue Mar 12 18:04:10 2002
1010 +++ apt-0.3.19cnc55/tools/gensrclist.cc Tue Mar 12 17:49:06 2002
1015 +#include <iostream>
1020 #include <apt-pkg/error.h>
1021 #include <apt-pkg/tagfile.h>
1024 #include "cached_md5.h"
1027 +using namespace std;
1035 -bool readRPMTable(char *file, map<string, slist<char*>* > &table)
1036 +bool readRPMTable(char *file, map<string, list<char*>* > &table)
1040 @@ -129,14 +130,14 @@
1043 if (table.find(srpm) != table.end()) {
1044 - slist<char*> *list = table[srpm];
1045 + list<char*> *xlist = table[srpm];
1047 - list->push_front(strdup(f));
1048 + xlist->push_front(strdup(f));
1050 - slist<char*> *list = new slist<char*>;
1051 + list<char*> *xlist = new list<char*>;
1053 - list->push_front(strdup(f));
1054 - table[srpm] = list;
1055 + xlist->push_front(strdup(f));
1056 + table[srpm] = xlist;
1063 CachedMD5 *md5cache;
1064 - map<string, slist<char*>* > rpmTable; // table that maps srpm -> generated rpm
1065 + map<string, list<char*>* > rpmTable; // table that maps srpm -> generated rpm
1067 bool progressBar = false;
1068 bool flatStructure = false;
1069 @@ -329,24 +330,24 @@
1070 foundInIndex = false;
1073 - char **list = NULL;
1074 - slist<char*> *rpmlist = rpmTable[string(dirEntries[entry_cur]->d_name)];
1075 + char **xlist = NULL;
1076 + list<char*> *rpmlist = rpmTable[string(dirEntries[entry_cur]->d_name)];
1079 - list = new char *[rpmlist->size()];
1080 + xlist = new char *[rpmlist->size()];
1082 foundInIndex = true;
1084 - for (slist<char*>::const_iterator i = rpmlist->begin();
1085 + for (list<char*>::const_iterator i = rpmlist->begin();
1086 i != rpmlist->end();
1088 - list[count++] = *i;
1089 + xlist[count++] = *i;
1094 headerAddEntry(newHeader, CRPMTAG_BINARY,
1095 - RPM_STRING_ARRAY_TYPE, list, count);
1096 + RPM_STRING_ARRAY_TYPE, xlist, count);
1099 if (foundInIndex || !mapi)
1100 diff -urN apt-0.3.19cnc55.org/tools/hdlist2pkglist.cc apt-0.3.19cnc55/tools/hdlist2pkglist.cc
1101 --- apt-0.3.19cnc55.org/tools/hdlist2pkglist.cc Tue Mar 12 18:04:10 2002
1102 +++ apt-0.3.19cnc55/tools/hdlist2pkglist.cc Tue Mar 12 17:50:29 2002
1107 +#include <string.h>
1109 #include <rpm/misc.h>
1111 -#include <string.h>
1112 #include <sys/stat.h>
1113 #include <sys/types.h>
1118 +#include <iostream>
1120 #include <apt-pkg/error.h>
1121 #include <apt-pkg/tagfile.h>
1122 #include <apt-pkg/rpminit.h>
1124 +using namespace std;
1128 extern int mdfile(const char *fn, unsigned char *digest);