Changeset 25dd31a for message.c

Timestamp:

Oct 26, 2003, 2:43:40 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

70b53ec

Parents:

eec69e1

Message:

Added a timestamp to the default style.

File:

• message.c (modified) (6 diffs)

message.c

@@ -15 +15 @@
 void owl_message_init(owl_message *m)
 {
-  time_t t;
-
   m->id=owl_global_get_nextmsgid(&g);
   m->type=OWL_MESSAGE_TYPE_GENERIC;
@@ -28 +26 @@
   
   /* save the time */
-  t=time(NULL);
-  m->time=owl_strdup(ctime(&t));
-  m->time[strlen(m->time)-1]='\0';
+  m->time=time(NULL);
+  m->timestr=owl_strdup(ctime(&(m->time)));
+  m->timestr[strlen(m->timestr)-1]='\0';
+
+  /* initialize the fmtext */
   owl_fmtext_init_null(&(m->fmtext));
 }
@@ -305 +305 @@
 char *owl_message_get_timestr(owl_message *m)
 {
-  return(m->time);
+  if (m->timestr) return(m->timestr);
+  return("");
+}
+
+/* caller must free the return */
+char *owl_message_get_shorttimestr(owl_message *m)
+{
+  struct tm *tmstruct;
+  char *out;
+
+  tmstruct=localtime(&(m->time));
+  out=owl_sprintf("%2.2i:%2.2i", tmstruct->tm_hour, tmstruct->tm_min);
+  if (out) return(out);
+  return("??:??");
 }
 
@@ -705 +718 @@
   memcpy(&(m->notice), n, sizeof(ZNotice_t));
 
-  /* a little gross, we'll reaplace \r's with ' ' for now */
+  /* a little gross, we'll replace \r's with ' ' for now */
   owl_zephyr_hackaway_cr(&(m->notice));
   
   m->delete=0;
+
+  /* save the time, we need to nuke the string saved by message_init */
+  if (m->timestr) {
+    owl_free(m->timestr);
+  }
+  m->time=n->z_time.tv_sec;
+  m->timestr=owl_strdup(ctime(&(m->time)));
+  m->timestr[strlen(m->timestr)-1]='\0';
 
   /* set other info */
@@ -782 +803 @@
     strcpy(m->hostname, inet_ntoa(n->z_sender_addr));
   }
-
-  /* save the time */
-  m->time=owl_strdup(ctime((time_t *) &n->z_time.tv_sec));
-  m->time[strlen(m->time)-1]='\0';
 }
 #else
@@ -847 +864 @@
   }
 #endif
-  if (m->time) owl_free(m->time);
+  if (m->timestr) owl_free(m->timestr);
   if (m->zwriteline) owl_free(m->zwriteline);