Dates as well as times in output timestamps

diff --git a/src/ChangeLog b/src/ChangeLog
index e0583343d464bef9d43053d3360366620ecc5180..06d4103e372b3d8c1710e707ba164388f3863d97 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-02  Micah Cowan  <micah@cowan.name>
+
+       * ftp.c (getftp, ftp_loop_internal), http.c (http_loop), main
+       (main): Use datetime_str instead of time_str, for those who have
+       potentially long-running sessions.
+
 2007-09-24  Gisle Vanem  <giva@bgnett.no>
 
        * connect.c, init.c, main.c, openssl.c, options.h, sysdep.h,

diff --git a/src/ftp.c b/src/ftp.c
index 2f5ecd157d88fd449bbab1d3eff848541562a8a0..d8a184457c39204fbcc35de8cc1cbce4e1217498 100644 (file)
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -968,7 +968,7 @@ Error in server response, closing control connection.\n"));
                       expected_bytes ? expected_bytes - restval : 0,
                       restval, &rd_size, len, &con->dltime, flags);
 
-  tms = time_str (time (NULL));
+  tms = datetime_str (time (NULL));
   tmrate = retr_rate (rd_size, con->dltime);
   total_download_time += con->dltime;
 
@@ -1150,7 +1150,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
         restval = 0;
 
       /* Get the current time string.  */
-      tms = time_str (time (NULL));
+      tms = datetime_str (time (NULL));
       /* Print fetch message, if opt.verbose.  */
       if (opt.verbose)
         {
@@ -1214,7 +1214,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
           /* Not as great.  */
           abort ();
         }
-      tms = time_str (time (NULL));
+      tms = datetime_str (time (NULL));
       if (!opt.spider)
         tmrate = retr_rate (len - restval, con->dltime);
 

diff --git a/src/http.c b/src/http.c
index 5b9e8bbfc617ee23cddd676e16beb5c067f7443e..e2cee5894db141ef34ce18ddd9985bee6a2331a1 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -2373,7 +2373,7 @@ http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
       sleep_between_retrievals (count);
       
       /* Get the current time string.  */
-      tms = time_str (time (NULL));
+      tms = datetime_str (time (NULL));
       
       if (opt.spider && !got_head)
         logprintf (LOG_VERBOSE, _("\
@@ -2442,7 +2442,7 @@ Spider mode enabled. Check if remote file exists.\n"));
       err = gethttp (u, &hstat, dt, proxy);
 
       /* Time?  */
-      tms = time_str (time (NULL));
+      tms = datetime_str (time (NULL));
       
       /* Get the new location (with or without the redirection).  */
       if (hstat.newloc)

diff --git a/src/main.c b/src/main.c
index 7443588857a361e1db474389df579a3394145a5d..43cb344d43e203390d0480bffa8b0a7a7ed41d17 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1036,7 +1036,7 @@ Can't timestamp and not clobber old files at the same time.\n"));
     {
       logprintf (LOG_NOTQUIET,
                  _("FINISHED --%s--\nDownloaded: %d files, %s in %s (%s)\n"),
-                 time_str (time (NULL)),
+                 datetime_str (time (NULL)),
                  opt.numurls,
                  human_readable (total_downloaded_bytes),
                  secs_to_human_time (total_download_time),