Changeset 4ebbfbc

Timestamp:

Jul 23, 2011, 8:26:03 PM (14 years ago)

Author:

Jason Gross <jgross@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

e5baf0a, c36f4d0

Parents:

a7fac14

git-author:

Jason Gross <jgross@mit.edu> (07/22/11 10:43:43)

git-committer:

Jason Gross <jgross@mit.edu> (07/23/11 20:26:03)

Message:

Show the time zone in :info; replace ctime with strftime

This fixes trac-#146.

The new function owl_util_time_to_timestr takes a const struct tm *
instead of a const time_t because, although we pass around time_t for
just about everything else, this lets the caller decide whether to use
localtime or gmtime (UTC).

Note: I'm not sure that "%c" (which is locale-dependent) will always
include the time zone.  If not, or if we want a bit more consistency, we
can switch to something like "%a %b %d %H:%M:%S %Y %Z" (like "Fri Jul 22
15:39:45 2011 EDT") or "%a %b %d, %Y %h:%M:%S %p %Z" (like "Fri Jul 22,
2011 03:39:45 PM 2011 EDT") or something.  On linerva, "%c" seems to be
equivalent to "%a %d %b %Y %h:%M:%S %p %Z" (like "Fri 22 Jul 2011
03:39:45 PM EDT").

Files:

• functions.c (modified) (5 diffs)
• message.c (modified) (2 diffs)
• perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm (modified) (2 diffs)
• util.c (modified) (1 diff)

functions.c

@@ -1223 +1223 @@
 void G_GNUC_PRINTF(1, 2) owl_function_debugmsg(const char *fmt, ...)
 {
+  char *tmpbuff;
   FILE *file;
   time_t now;
@@ -1237 +1238 @@
   now = time(NULL);
 
-  fprintf(file, "[%d -  %.24s - %lds]: ",
-          (int) getpid(), ctime(&now), now - owl_global_get_starttime(&g));
+  tmpbuff = owl_util_time_to_timestr(localtime(&now));
+  fprintf(file, "[%d -  %s - %lds]: ",
+          (int) getpid(), tmpbuff, now - owl_global_get_starttime(&g));
+  g_free(tmpbuff);
   vfprintf(file, fmt, ap);
   putc('\n', file);
@@ -1761 +1764 @@
 void owl_function_status(void)
 {
+  char *tmpbuff;
   char buff[MAXPATHLEN+1];
   time_t start;
@@ -1788 +1792 @@
   owl_fmtext_append_normal(&fm, "\n");
 
-  owl_fmtext_appendf_normal(&fm, "  Startup Time: %s", ctime(&start));
+  tmpbuff = owl_util_time_to_timestr(localtime(&start));
+  owl_fmtext_appendf_normal(&fm, "  Startup Time: %s\n", tmpbuff);
+  g_free(tmpbuff);
 
   up=owl_global_get_runtime(&g);
@@ -3409 +3415 @@
   char *buff;
 
-  now=time(NULL);
-  date=g_strdup(ctime(&now));
-  date[strlen(date)-1]='\0';
+  now = time(NULL);
+  date = owl_util_time_to_timestr(localtime(&now));
 
   buff = g_strdup_printf("%s %s", date, string);

message.c

@@ -46 +46 @@
   
   /* save the time */
-  m->time=time(NULL);
-  m->timestr=g_strdup(ctime(&(m->time)));
-  m->timestr[strlen(m->timestr)-1]='\0';
+  m->time = time(NULL);
+  m->timestr = owl_util_time_to_timestr(localtime(&m->time));
 
   m->fmtext = NULL;
@@ -796 +795 @@
   /* save the time, we need to nuke the string saved by message_init */
   if (m->timestr) g_free(m->timestr);
-  m->time=n->z_time.tv_sec;
-  m->timestr=g_strdup(ctime(&(m->time)));
-  m->timestr[strlen(m->timestr)-1]='\0';
+  m->time = n->z_time.tv_sec;
+  m->timestr = owl_util_time_to_timestr(localtime(&m->time));
 
   /* set other info */

perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm

@@ -29 +29 @@
 use BarnOwl;
 use BarnOwl::Message::Twitter;
-use POSIX qw(asctime);
+use POSIX qw(strftime);
 
 use LWP::UserAgent;
@@ -247 +247 @@
                        ($self->{cfg}->{account_nickname} ?
                         "[$self->{cfg}->{account_nickname}]" : "") .
-                        ": ratelimited until " . asctime(localtime($timeout)));
+                        ": ratelimited until " . strftime('%c', localtime($timeout)));
     } elsif(exists($ratelimit->{error})) {
         $self->sleep(60*20);

util.c

@@ -296 +296 @@
 }
 
+CALLER_OWN char *owl_util_time_to_timestr(const struct tm *time)
+{
+  /* 32 chosen for first attempt because timestr will end up being
+   * something like "Www Mmm dd hh:mm:ss AM yyyy UTC\0" */ 
+  size_t timestr_size = 16;
+  char *timestr = NULL;
+  do {
+    timestr_size *= 2;
+    timestr = g_renew(char, timestr, timestr_size);
+  } while (strftime(timestr, timestr_size, "%c", time) == 0);
+  return timestr;
+}
+
 /* These are in order of their value in owl.h */
 static const struct {