El Te Dee Patch

[apt.git] / apt-pkg / contrib / strutl.h

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index f93184a24c35748c294b4dcd46593f09fc53ce38..14293ae058fe9e22706d6c6cf6ff1171a08bb93a 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: strutl.h,v 1.9 1998/11/01 05:27:38 jgg Exp $
+// $Id: strutl.h,v 1.15 1999/08/02 03:07:48 jgg Exp $
 /* ######################################################################
 
    String Util - These are some usefull string functions
@@ -16,15 +16,21 @@
 #ifndef STRUTL_H
 #define STRUTL_H
 
+#ifdef __GNUG__
+#pragma interface "apt-pkg/strutl.h"
+#endif 
+
 #include <stdlib.h>
 #include <string>
 #include <vector>
+#include <time.h>
 
 char *_strstrip(char *String);
 char *_strtabexpand(char *String,size_t Len);
 bool ParseQuoteWord(const char *&String,string &Res);
 bool ParseCWord(const char *String,string &Res);
 string QuoteString(string Str,const char *Bad);
+string DeQuoteString(string Str);
 string SizeToStr(double Bytes);
 string TimeToStr(unsigned long Sec);
 string SubstVar(string Str,string Subst,string Contents);
@@ -35,6 +41,9 @@ bool StrToTime(string Val,time_t &Result);
 string LookupTag(string Message,const char *Tag,const char *Default = 0);
 int StringToBool(string Text,int Default = -1);
 bool ReadMessages(int Fd, vector<string> &List);
+bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0);
+bool Hex2Num(const char *Start,const char *End,unsigned char *Num,
+            unsigned int Length);
 
 int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
 inline int stringcmp(const char *A,const char *AEnd,const char *B) {return stringcmp(A,AEnd,B,B+strlen(B));};
@@ -56,8 +65,8 @@ class URI
    string Path;
    unsigned int Port;
    
-   inline operator string();
-   inline operator =(string From) {CopyFrom(From);};
+   operator string();
+   inline void operator =(string From) {CopyFrom(From);};
    inline bool empty() {return Access.empty();};
    
    URI(string Path) {CopyFrom(Path);};