diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-10-30 13:48:05 -0500 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-10-30 13:48:05 -0500 |
| commit | 89d88ac3ef3f82fdfeac6d8d231deddeeb0f02e9 (patch) | |
| tree | 258687a5f0984f0b4edd24b52d778cf4d21c7059 /apt-pkg/contrib/strutl.cc | |
| parent | cd5e84440a9bb75a9cc2c142ac8bc214ba57685a (diff) | |
| parent | 0a64ecd792b4caca519d597a69b8baeda6a1bf77 (diff) | |
merge with my debian-sid branch
Diffstat (limited to 'apt-pkg/contrib/strutl.cc')
| -rw-r--r-- | apt-pkg/contrib/strutl.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index aaf44b7ff..861cdcbeb 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -179,14 +179,14 @@ bool ParseQuoteWord(const char *&String,string &Res) { if (*C == '"') { - for (C++; *C != 0 && *C != '"'; C++); - if (*C == 0) + C = strchr(C + 1, '"'); + if (C == NULL) return false; } if (*C == '[') { - for (C++; *C != 0 && *C != ']'; C++); - if (*C == 0) + C = strchr(C + 1, ']'); + if (C == NULL) return false; } } @@ -904,11 +904,10 @@ bool StrToTime(const string &Val,time_t &Result) { struct tm Tm; char Month[10]; - const char *I = Val.c_str(); - + // Skip the day of the week - for (;*I != 0 && *I != ' '; I++); - + const char *I = strchr(Val.c_str(), ' '); + // Handle RFC 1123 time Month[0] = 0; if (sscanf(I," %d %3s %d %d:%d:%d GMT",&Tm.tm_mday,Month,&Tm.tm_year, |