Changeset 481 for trunk/src/sh_mail.c
- Timestamp:
- Jul 18, 2015, 5:06:52 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/sh_mail.c
r383 r481 69 69 #undef BAD 70 70 71 static int failedMail = S L_FALSE;71 static int failedMail = S_FALSE; 72 72 73 73 static dnsrep * return_mx (char *domain); … … 337 337 SL_ENTER(_("sh_mail_pushstack")); 338 338 339 if (msg == NULL || failedMail == S L_TRUE /* || sh.srvmail.name[0] == '\0' */)339 if (msg == NULL || failedMail == S_TRUE /* || sh.srvmail.name[0] == '\0' */) 340 340 SL_RETURN((0), (_("sh_mail_pushstack"))); 341 341 … … 550 550 * Return if we cannot mail. 551 551 */ 552 if (failedMail == S L_TRUE)552 if (failedMail == S_TRUE) 553 553 SL_RETURN((-1), _("sh_mail_msg")); 554 554 … … 564 564 sh_mail_emptystack(); 565 565 sh.mailNum.alarm_last = 0; 566 failedMail = S L_TRUE;566 failedMail = S_TRUE; 567 567 SL_RETURN((-1), _("sh_mail_msg")); 568 568 } … … 1259 1259 my_time = time(NULL); 1260 1260 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_LOCALTIME_R) 1261 my_tm 1261 my_tm = localtime_r(&my_time, &time_tm); 1262 1262 #else 1263 my_tm = localtime(&my_time); 1264 #endif 1265 1263 my_tm = localtime(&my_time); 1264 #endif 1265 1266 if (!my_tm) 1267 { 1268 sl_strlcpy(my_tbuf, _("Thu, 01 Jan 1970 00:00:00 +00:00"), sizeof(my_tbuf)); 1269 } 1270 else 1271 { 1266 1272 #if defined(HAVE_STRFTIME_Z) 1267 (void)strftime(my_tbuf, 127, _("%a, %d %b %Y %H:%M:%S %z"), my_tm);1273 (void) strftime(my_tbuf, 127, _("%a, %d %b %Y %H:%M:%S %z"), my_tm); 1268 1274 #else 1269 (void) strftime(my_tbuf, 127, _("%a, %d %b %Y %H:%M:%S %Z"), my_tm); 1270 #endif 1275 (void) strftime(my_tbuf, 127, _("%a, %d %b %Y %H:%M:%S %Z"), my_tm); 1276 #endif 1277 } 1271 1278 1272 1279 TPT(( 0, FIL__, __LINE__, _("msg=<From: <%s>%c%cTo: <%s>%c%cDate: %s>%c%c"), … … 1339 1346 char * tmp; 1340 1347 1341 if (flag_err_debug == S L_TRUE)1348 if (flag_err_debug == S_TRUE) 1342 1349 { 1343 1350 tmp = sh_util_safe_name_keepspace(reply); … … 1382 1389 reply[0] = '\0'; 1383 1390 1384 while (sl_read_timeout_fd (ma_socket, &c, 1, time_wait, S L_FALSE) > 0) {1391 while (sl_read_timeout_fd (ma_socket, &c, 1, time_wait, S_FALSE) > 0) { 1385 1392 1386 1393 if (ireply < (sizeof(reply) - 1))
Note:
See TracChangeset
for help on using the changeset viewer.