give a descriptive error for pipe tries with 'false'

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

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 84fc14bb10bd8aa58b651bf06475558bdcdafc2c..7b6bb28541bb17a986e855ecec20916e7f29cbea 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -749,6 +749,10 @@ int StringToBool(const string &Text,int Default)
 /* This converts a time_t into a string time representation that is
    year 2000 complient and timezone neutral */
 string TimeRFC1123(time_t Date)
 /* This converts a time_t into a string time representation that is
    year 2000 complient and timezone neutral */
 string TimeRFC1123(time_t Date)

+{
+   return TimeRFC1123(Date, false);
+}
+string TimeRFC1123(time_t Date, bool const NumericTimezone)

 {
    struct tm Conv;
    if (gmtime_r(&Date, &Conv) == NULL)
 {
    struct tm Conv;
    if (gmtime_r(&Date, &Conv) == NULL)


@@ -757,7 +761,14 @@ string TimeRFC1123(time_t Date)
    auto const posix = std::locale("C.UTF-8");
    std::ostringstream datestr;
    datestr.imbue(posix);
    auto const posix = std::locale("C.UTF-8");
    std::ostringstream datestr;
    datestr.imbue(posix);

-   datestr << std::put_time(&Conv, "%a, %d %b %Y %H:%M:%S GMT");
+   APT::StringView const fmt("%a, %d %b %Y %H:%M:%S");
+   std::use_facet<std::time_put<char>>(posix).put(
+                    std::ostreambuf_iterator<char>(datestr),
+                    datestr, ' ', &Conv, fmt.data(), fmt.data() + fmt.size());
+   if (NumericTimezone)
+      datestr << " +0000";
+   else
+      datestr << " GMT";

    return datestr.str();
 }
                                                                        /*}}}*/
    return datestr.str();
 }
                                                                        /*}}}*/


@@ -934,6 +945,8 @@ bool RFC1123StrToTime(const char* const str,time_t &time)
    signed int year = 0; // yes, Y23K problem – we gonna worry then…
    std::string weekday, month, datespec, timespec, zone;
    std::istringstream ss(str);
    signed int year = 0; // yes, Y23K problem – we gonna worry then…
    std::string weekday, month, datespec, timespec, zone;
    std::istringstream ss(str);

+   auto const &posix = std::locale("C.UTF-8");
+   ss.imbue(posix);

    ss >> weekday;
    // we only superficially check weekday, mostly to avoid accepting localized
    // weekdays here and take only its length to decide which datetime format we
    ss >> weekday;
    // we only superficially check weekday, mostly to avoid accepting localized
    // weekdays here and take only its length to decide which datetime format we