1 diff -u -r ../apt-1.1.3/apt-pkg/contrib/strutl.cc ./apt-pkg/contrib/strutl.cc
2 --- ../apt-1.1.3/apt-pkg/contrib/strutl.cc 2015-11-30 03:08:24.000000000 -0500
3 +++ ./apt-pkg/contrib/strutl.cc 2015-12-03 18:36:34.555425494 -0500
15 // UTF8ToCodeset - Convert some UTF-8 string for some codeset /*{{{*/
16 // ---------------------------------------------------------------------
17 /* This is handy to use before display some information for enduser */
19 bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest)
28 // strstrip - Remove white space from the front and back of a string /*{{{*/
29 // ---------------------------------------------------------------------
31 if (ASize < 100 && I != 0)
34 - strprintf(S, "%'.1f %c", ASize, Ext[I]);
35 + strprintf(S, "%.1f %c", ASize, Ext[I]);
42 - strprintf(S, "%'.0f %c", ASize, Ext[I]);
43 + strprintf(S, "%.0f %c", ASize, Ext[I]);
48 setlocale (LC_ALL,"C");
50 // Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123
51 - (strptime(str, "%a, %d %b %Y %H:%M:%S %Z", &Tm) == NULL &&
52 + (strptime(str, "%a, %d %b %Y %H:%M:%S", &Tm) == NULL &&
53 // Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036
54 - strptime(str, "%A, %d-%b-%y %H:%M:%S %Z", &Tm) == NULL &&
55 + strptime(str, "%A, %d-%b-%y %H:%M:%S", &Tm) == NULL &&
56 // Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format
57 strptime(str, "%a %b %d %H:%M:%S %Y", &Tm) == NULL);
58 setlocale (LC_ALL,"");
59 - if (invalid == true)
60 + if (invalid == true) {
61 + if (str != NULL && strlen(str) > 1) printf("Invalid time str '%s'\n", str);