Changeset 481 for trunk/src/sh_mail.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (6 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/sh_mail.c (modified) (7 diffs)

trunk/src/sh_mail.c

@@ -69 +69 @@
 #undef  BAD
 
-static int failedMail = SL_FALSE;
+static int failedMail = S_FALSE;
 
 static dnsrep * return_mx (char *domain);
@@ -337 +337 @@
   SL_ENTER(_("sh_mail_pushstack"));
 
-  if (msg == NULL || failedMail == SL_TRUE /* || sh.srvmail.name[0] == '\0' */) 
+  if (msg == NULL || failedMail == S_TRUE /* || sh.srvmail.name[0] == '\0' */) 
     SL_RETURN((0), (_("sh_mail_pushstack")));
 
@@ -550 +550 @@
      * Return if we cannot mail.
      */
-    if (failedMail == SL_TRUE) 
+    if (failedMail == S_TRUE) 
       SL_RETURN((-1), _("sh_mail_msg"));
 
@@ -564 +564 @@
         sh_mail_emptystack();
         sh.mailNum.alarm_last = 0;
-        failedMail = SL_TRUE;
+        failedMail = S_TRUE;
         SL_RETURN((-1), _("sh_mail_msg"));
       }
@@ -1259 +1259 @@
   my_time = time(NULL);
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_LOCALTIME_R)
-  my_tm   = localtime_r(&my_time, &time_tm);
+  my_tm = localtime_r(&my_time, &time_tm);
 #else
-  my_tm   = localtime(&my_time);
-#endif
-
+  my_tm = localtime(&my_time);
+#endif
+  
+  if (!my_tm) 
+    {
+      sl_strlcpy(my_tbuf, _("Thu, 01 Jan 1970 00:00:00 +00:00"), sizeof(my_tbuf));
+    }
+  else
+    {
 #if defined(HAVE_STRFTIME_Z)
-  (void)    strftime(my_tbuf, 127, _("%a, %d %b %Y %H:%M:%S %z"), my_tm);
+      (void) strftime(my_tbuf, 127, _("%a, %d %b %Y %H:%M:%S %z"), my_tm);
 #else
-  (void)    strftime(my_tbuf, 127, _("%a, %d %b %Y %H:%M:%S %Z"), my_tm);
-#endif
+      (void) strftime(my_tbuf, 127, _("%a, %d %b %Y %H:%M:%S %Z"), my_tm);
+#endif
+    }
 
   TPT(( 0, FIL__, __LINE__,  _("msg=<From: <%s>%c%cTo: <%s>%c%cDate: %s>%c%c"),
@@ -1339 +1346 @@
   char * tmp;
 
-  if (flag_err_debug == SL_TRUE)
+  if (flag_err_debug == S_TRUE)
     {
       tmp = sh_util_safe_name_keepspace(reply);
@@ -1382 +1389 @@
   reply[0] = '\0';
 
-  while (sl_read_timeout_fd (ma_socket, &c, 1, time_wait, SL_FALSE) > 0) {
+  while (sl_read_timeout_fd (ma_socket, &c, 1, time_wait, S_FALSE) > 0) {
 
     if (ireply < (sizeof(reply) - 1))