diff options
Diffstat (limited to 'apt-pkg/contrib/strutl.h')
| -rw-r--r-- | apt-pkg/contrib/strutl.h | 101 |
1 files changed, 50 insertions, 51 deletions
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 56487b60f..c25c6208a 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -29,35 +29,34 @@ namespace APT { namespace String { - std::string Strip(const std::string &s); - bool Endswith(const std::string &s, const std::string &ending); - bool Startswith(const std::string &s, const std::string &starting); - std::string Join(std::vector<std::string> list, const std::string &sep); + APT_PUBLIC std::string Strip(const std::string &s); + APT_PUBLIC bool Endswith(const std::string &s, const std::string &ending); + APT_PUBLIC bool Startswith(const std::string &s, const std::string &starting); + APT_PUBLIC std::string Join(std::vector<std::string> list, const std::string &sep); // Returns string display length honoring multi-byte characters - size_t DisplayLength(StringView str); - + APT_PUBLIC size_t DisplayLength(StringView str); } } -bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest); -char *_strstrip(char *String); -char *_strrstrip(char *String); // right strip only -char *_strtabexpand(char *String,size_t Len); -bool ParseQuoteWord(const char *&String,std::string &Res); -bool ParseCWord(const char *&String,std::string &Res); -std::string QuoteString(const std::string &Str,const char *Bad); -std::string DeQuoteString(const std::string &Str); -std::string DeQuoteString(std::string::const_iterator const &begin, std::string::const_iterator const &end); +APT_PUBLIC bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest); +APT_PUBLIC char *_strstrip(char *String); +APT_PUBLIC char *_strrstrip(char *String); // right strip only +APT_PUBLIC char *_strtabexpand(char *String,size_t Len); +APT_PUBLIC bool ParseQuoteWord(const char *&String,std::string &Res); +APT_PUBLIC bool ParseCWord(const char *&String,std::string &Res); +APT_PUBLIC std::string QuoteString(const std::string &Str,const char *Bad); +APT_PUBLIC std::string DeQuoteString(const std::string &Str); +APT_PUBLIC std::string DeQuoteString(std::string::const_iterator const &begin, std::string::const_iterator const &end); // unescape (\0XX and \xXX) from a string -std::string DeEscapeString(const std::string &input); +APT_PUBLIC std::string DeEscapeString(const std::string &input); -std::string SizeToStr(double Bytes); -std::string TimeToStr(unsigned long Sec); -std::string Base64Encode(const std::string &Str); -std::string OutputInDepth(const unsigned long Depth, const char* Separator=" "); -std::string URItoFileName(const std::string &URI); +APT_PUBLIC std::string SizeToStr(double Bytes); +APT_PUBLIC std::string TimeToStr(unsigned long Sec); +APT_PUBLIC std::string Base64Encode(const std::string &Str); +APT_PUBLIC std::string OutputInDepth(const unsigned long Depth, const char* Separator=" "); +APT_PUBLIC std::string URItoFileName(const std::string &URI); /** returns a datetime string as needed by HTTP/1.1 and Debian files. * * Note: The date will always be represented in a UTC timezone @@ -67,7 +66,7 @@ std::string URItoFileName(const std::string &URI); * of GMT as timezone instead. \b true means that the timezone should be denoted * as "+0000" while \b false uses "GMT". */ -std::string TimeRFC1123(time_t Date, bool const NumericTimezone); +APT_PUBLIC std::string TimeRFC1123(time_t Date, bool const NumericTimezone); /** parses time as needed by HTTP/1.1 and Debian files. * * HTTP/1.1 prefers dates in RFC1123 format (but the other two obsolete date formats @@ -83,22 +82,22 @@ std::string TimeRFC1123(time_t Date, bool const NumericTimezone); * parsing is successful, undefined otherwise. * @return \b true if parsing was successful, otherwise \b false. */ -bool RFC1123StrToTime(const std::string &str,time_t &time) APT_MUSTCHECK; -bool FTPMDTMStrToTime(const char* const str,time_t &time) APT_MUSTCHECK; -std::string LookupTag(const std::string &Message,const char *Tag,const char *Default = 0); -int StringToBool(const std::string &Text,int Default = -1); -bool ReadMessages(int Fd, std::vector<std::string> &List); -bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0); -bool StrToNum(const char *Str,unsigned long long &Res,unsigned Len,unsigned Base = 0); -bool Base256ToNum(const char *Str,unsigned long &Res,unsigned int Len); -bool Base256ToNum(const char *Str,unsigned long long &Res,unsigned int Len); -bool Hex2Num(const APT::StringView Str,unsigned char *Num,unsigned int Length); +APT_PUBLIC bool RFC1123StrToTime(const std::string &str,time_t &time) APT_MUSTCHECK; +APT_PUBLIC bool FTPMDTMStrToTime(const char* const str,time_t &time) APT_MUSTCHECK; +APT_PUBLIC std::string LookupTag(const std::string &Message,const char *Tag,const char *Default = 0); +APT_PUBLIC int StringToBool(const std::string &Text,int Default = -1); +APT_PUBLIC bool ReadMessages(int Fd, std::vector<std::string> &List); +APT_PUBLIC bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0); +APT_PUBLIC bool StrToNum(const char *Str,unsigned long long &Res,unsigned Len,unsigned Base = 0); +APT_PUBLIC bool Base256ToNum(const char *Str,unsigned long &Res,unsigned int Len); +APT_PUBLIC bool Base256ToNum(const char *Str,unsigned long long &Res,unsigned int Len); +APT_PUBLIC bool Hex2Num(const APT::StringView Str,unsigned char *Num,unsigned int Length); // input changing string split -bool TokSplitString(char Tok,char *Input,char **List, +APT_PUBLIC bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); // split a given string by a char -std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) APT_PURE; +APT_PUBLIC std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) APT_PURE; /* \brief Return a vector of strings from string "input" where "sep" * is used as the delimiter string. @@ -114,14 +113,14 @@ std::vector<std::string> VectorizeString(std::string const &haystack, char const * if used the string is only split on maxsplit places and the last * item in the vector contains the remainder string. */ -std::vector<std::string> StringSplit(std::string const &input, +APT_PUBLIC std::vector<std::string> StringSplit(std::string const &input, std::string const &sep, unsigned int maxsplit=std::numeric_limits<unsigned int>::max()) APT_PURE; -void ioprintf(std::ostream &out,const char *format,...) APT_PRINTF(2); -void strprintf(std::string &out,const char *format,...) APT_PRINTF(2); -char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_PRINTF(3); -bool CheckDomainList(const std::string &Host, const std::string &List); +APT_PUBLIC void ioprintf(std::ostream &out,const char *format,...) APT_PRINTF(2); +APT_PUBLIC void strprintf(std::string &out,const char *format,...) APT_PRINTF(2); +APT_PUBLIC char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_PRINTF(3); +APT_PUBLIC bool CheckDomainList(const std::string &Host, const std::string &List); /* Do some compat mumbo jumbo */ #define tolower_ascii tolower_ascii_inline @@ -144,7 +143,7 @@ static inline int isspace_ascii_inline(int const c) return (c >= 9 && c <= 13) || c == ' '; } -std::string StripEpoch(const std::string &VerStr); +APT_PUBLIC std::string StripEpoch(const std::string &VerStr); #define APT_MKSTRCMP(name,func) \ inline APT_PURE int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));} \ @@ -159,20 +158,20 @@ inline APT_PURE int name(const std::string& A,const char *B) {return func(A.begi inline APT_PURE int name(const std::string& A,const std::string& B) {return func(A.begin(),A.end(),B.begin(),B.end());} \ inline APT_PURE int name(const std::string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);} -int APT_PURE stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd); -int APT_PURE stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd); +APT_PUBLIC int APT_PURE stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd); +APT_PUBLIC int APT_PURE stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd); /* We assume that GCC 3 indicates that libstdc++3 is in use too. In that case the definition of string::const_iterator is not the same as const char * and we need these extra functions */ #if __GNUC__ >= 3 -int APT_PURE stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd, +APT_PUBLIC int APT_PURE stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd, const char *B,const char *BEnd); -int APT_PURE stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd, +APT_PUBLIC int APT_PURE stringcmp(std::string::const_iterator A,std::string::const_iterator AEnd, std::string::const_iterator B,std::string::const_iterator BEnd); -int APT_PURE stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd, +APT_PUBLIC int APT_PURE stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd, const char *B,const char *BEnd); -int APT_PURE stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd, +APT_PUBLIC int APT_PURE stringcasecmp(std::string::const_iterator A,std::string::const_iterator AEnd, std::string::const_iterator B,std::string::const_iterator BEnd); inline APT_PURE int stringcmp(std::string::const_iterator A,std::string::const_iterator Aend,const char *B) {return stringcmp(A,Aend,B,B+strlen(B));} @@ -183,12 +182,12 @@ APT_MKSTRCMP2(stringcmp,stringcmp) APT_MKSTRCMP2(stringcasecmp,stringcasecmp) // Return the length of a NULL-terminated string array -size_t APT_PURE strv_length(const char **str_array); +APT_PUBLIC size_t APT_PURE strv_length(const char **str_array); inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);} -class URI +class APT_PUBLIC URI { void CopyFrom(const std::string &From); @@ -217,8 +216,8 @@ struct SubstVar const char *Subst; const std::string *Contents; }; -std::string SubstVar(std::string Str,const struct SubstVar *Vars); -std::string SubstVar(const std::string &Str,const std::string &Subst,const std::string &Contents); +APT_PUBLIC std::string SubstVar(std::string Str,const struct SubstVar *Vars); +APT_PUBLIC std::string SubstVar(const std::string &Str,const std::string &Subst,const std::string &Contents); struct RxChoiceList { @@ -226,7 +225,7 @@ struct RxChoiceList const char *Str; bool Hit; }; -unsigned long RegexChoice(RxChoiceList *Rxs,const char **ListBegin, +APT_PUBLIC unsigned long RegexChoice(RxChoiceList *Rxs,const char **ListBegin, const char **ListEnd); #endif |