Changeset 131 for trunk/src/sh_mail.c

Timestamp:

Oct 22, 2007, 11:19:15 PM (17 years ago)

Author:

rainer

Message:

Use thread-safe libc functions.

File:

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

trunk/src/sh_mail.c

@@ -654 +654 @@
 /* The mailer.
  */
-static int sh_mail_end_conn (FILE * connfile);
-static FILE * sh_mail_start_conn (int aFlag);
+static int sh_mail_end_conn (FILE * connfile, int fd);
+static FILE * sh_mail_start_conn (int aFlag, int * fd);
 
 static
@@ -797 +797 @@
 
     static  int ma_block = 0;
+
+    int       ma_socket = -1;
 
     SH_FIFO * fifo_temp = NULL;
@@ -1065 +1067 @@
         while (address_list[i] != NULL && i < address_num)
           {
-            connfile = sh_mail_start_conn (i);
+            connfile = sh_mail_start_conn (i, &ma_socket);
             
             if (NULL != connfile)
@@ -1073 +1075 @@
                 wrlen -= sl_strlen(mailMsg);
                 if (wrlen == 0) 
-                  status = sh_mail_end_conn (connfile);
+                  status = sh_mail_end_conn (connfile, ma_socket);
                 else
                   status = -1;
@@ -1101 +1103 @@
     else
       {
-        connfile = sh_mail_start_conn ( -9 );
+        connfile = sh_mail_start_conn ( -9 , &ma_socket);
         
         if (NULL != connfile)
@@ -1108 +1110 @@
             wrlen -= sl_strlen(mailMsg);
             if (wrlen == 0)
-              status = sh_mail_end_conn (connfile);
+              status = sh_mail_end_conn (connfile, ma_socket);
             else
               status = -1;
@@ -1287 +1289 @@
 static time_t time_wait = 300;
 
-static FILE * sh_mail_start_conn (int aFlag)
+static FILE * sh_mail_start_conn (int aFlag, int * ma_socket)
 {
   char       * address;
@@ -1302 +1304 @@
   FILE       * connFile = NULL;
   struct tm  * my_tm;
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_LOCALTIME_R)
+  struct tm    time_tm;
+#endif
   time_t       my_time;
   char         my_tbuf[128];
@@ -1312 +1317 @@
   SL_ENTER(_("sh_mail_start_conn"));
 
-  time_wait = 300;
+  *ma_socket = -1;
+  time_wait  = 300;
 
   if (aFlag >= 0)
@@ -1416 +1422 @@
   /* say HELO to the other socket
    */
-  if (0 == sh_mail_wait (220, connFile)) 
+  if (0 == sh_mail_wait (220, fd)) 
     {
       sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_NET, 
@@ -1446 +1452 @@
   (void) fflush(connFile);
 
-  if (0 == sh_mail_wait(250, connFile)) 
+  if (0 == sh_mail_wait(250, fd)) 
     {
       sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_NET, 
@@ -1479 +1485 @@
   (void) fflush(connFile);
 
-  if (0 == sh_mail_wait(250, connFile)) 
+  if (0 == sh_mail_wait(250, fd)) 
     {
       sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_NET, 
@@ -1500 +1506 @@
       (void) fflush(connFile);
 
-      if (0 == sh_mail_wait(250, connFile)) 
+      if (0 == sh_mail_wait(250, fd)) 
         {
           sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_NET, 
@@ -1524 +1530 @@
           (void) fflush(connFile);
           
-          if (0 == sh_mail_wait(250, connFile)) 
+          if (0 == sh_mail_wait(250, fd)) 
             {
               sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_NET, 
@@ -1549 +1555 @@
   (void) fflush(connFile);
 
-  if (0 == sh_mail_wait(354, connFile)) 
+  if (0 == sh_mail_wait(354, fd)) 
     {
       sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_NET, 
@@ -1561 +1567 @@
 
   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);
+#else
   my_tm   = localtime(&my_time);
+#endif
   (void)    strftime(my_tbuf, 127, _("%a, %d %b %Y %H:%M:%S %Z"), my_tm);
 
@@ -1576 +1586 @@
           my_tbuf, 13, 10);
 
+  *ma_socket = fd;
   SL_RETURN( connFile, _("sh_mail_start_conn"));
 }
@@ -1585 +1596 @@
  */
 
-static int sh_mail_end_conn (FILE * connFile)
+static int sh_mail_end_conn (FILE * connFile, int fd)
 {
   SL_ENTER(_("sh_mail_end_conn"));
@@ -1597 +1608 @@
   TPT(( 0, FIL__, __LINE__, _("msg=<message end written>\n")));
 
-  if (0 != sh_mail_wait(250, connFile))
+  if (0 != sh_mail_wait(250, fd))
     {  
       (void) fflush(connFile);
@@ -1625 +1636 @@
  */
 
-static jmp_buf wait_timeout;
-
-static void sh_mail_alarmhandle (int mysignal)
-{
-  /*@-noeffect@*/
-  (void) mysignal; /* avoid compiler warning */
-  /*@+noeffect@*/
-
-  longjmp(wait_timeout, 1);
-}
-
-static int sh_mail_wait(int code, FILE * ma_socket)
+static int sh_mail_wait(int code, int ma_socket)
 {
   int rcode, g;
+
+  char c;
 
   char errmsg[128];
@@ -1651 +1653 @@
   time_t waited_time;
 
-  struct   sigaction          old_act;
-  volatile unsigned int       old_alarm = 0;
-
-  struct  sigaction  new_act;
-  sigset_t           unblock;
-
-  (void) sigemptyset(&unblock);
-  (void) sigaddset  (&unblock, SIGALRM);
-
-  new_act.sa_handler = sh_mail_alarmhandle;
-  (void) sigemptyset( &new_act.sa_mask );       /* set an empty mask       */
-  new_act.sa_flags = 0;                         /* init sa_flags           */
-
   SL_ENTER(_("mail_wait"));
   
-  /* alarm was triggered
-   */
-  if (setjmp(wait_timeout) != 0)
-    {
-      (void) alarm(0);
-      (void) sigaction (SIGALRM, &old_act, NULL);
-      (void) alarm(old_alarm);
-      (void) sigprocmask(SIG_UNBLOCK, &unblock, NULL);
-      TPT((0, FIL__, __LINE__, _("msg=<mail_wait: timeout>\n"))); 
-      SL_RETURN( 0, _("mail_wait"));
-    }
-
   waited_time = time(NULL);
 
   /* timeout after 5 minutes
    */
-  old_alarm = alarm(0);
-  (void) sigaction (SIGALRM, &new_act, &old_act);
-  (void) alarm((unsigned int) time_wait);
 
   rcode = 0;
   state = WAIT_CODE_START;
 
-  while (0 == feof(ma_socket) && 0 == ferror(ma_socket)) {
+  while (sl_read_timeout_fd (ma_socket, &c, 1, time_wait, SL_FALSE) > 0) {
+
+    g = (int) c;
 
     if ( (g=fgetc(ma_socket)) == EOF)
       {
-        (void) alarm(0);
-        (void) sigaction (SIGALRM, &old_act, NULL); 
-        (void) alarm(old_alarm);
-        (void) sigprocmask(SIG_UNBLOCK, &unblock, NULL);
         TPT((0, FIL__, __LINE__, _("msg=<mail_wait: EOF>\n"))); 
         SL_RETURN( 0, _("mail_wait")); 
@@ -1733 +1705 @@
         break;
       /*@-charintliteral@*/
-      (void) alarm(0);
-      (void) sigaction (SIGALRM, &old_act, NULL); 
-      (void) alarm(old_alarm);
-      (void) sigprocmask(SIG_UNBLOCK, &unblock, NULL);
 
       TPT((0, FIL__, __LINE__, 
@@ -1769 +1737 @@
       
     default:
-      (void) alarm(0);
-      (void) sigaction (SIGALRM, &old_act, NULL); 
-      (void) alarm(old_alarm);
-      (void) sigprocmask(SIG_UNBLOCK, &unblock, NULL);
 
       TPT((0, FIL__, __LINE__, _("msg=<mail_wait: bad>\n"))); 
@@ -1779 +1743 @@
     }
   }
-
-  (void) alarm(0);                            /* Disable alarm       */
-  (void) sigaction (SIGALRM, &old_act, NULL); 
-  (void) alarm(old_alarm);
-  (void) sigprocmask(SIG_UNBLOCK, &unblock, NULL);
 
   TPT((0, FIL__, __LINE__, _("msg=<mail_wait: failed>\n")));