X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=30f9a6888b9c084a681e257656731a7b6ef4bbc0;hb=1a0e6bea859c26612782daf164e4062ef58a0cf4;hp=bd58be4bde4a80e11317ba02f2b104ea15b14a83;hpb=5c39ca8a3c875df98163fed8923c258f21bb3f66;p=citadel.git

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index bd58be4bd..30f9a6888 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1,7 +1,7 @@
 /*
  * Implements the message store.
  *
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2018 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -1045,14 +1045,14 @@ void mime_download(char *name, char *filename, char *partnum, char *disp,
 	) {
 		CC->download_fp = tmpfile();
 		if (CC->download_fp == NULL) {
-			syslog(LOG_EMERG, "msgbase: mime_download() couldn't write: %s", strerror(errno));
+			syslog(LOG_EMERG, "msgbase: mime_download() couldn't write: %m");
 			cprintf("%d cannot open temporary file: %s\n", ERROR + INTERNAL_ERROR, strerror(errno));
 			return;
 		}
 	
 		rv = fwrite(content, length, 1, CC->download_fp);
 		if (rv <= 0) {
-			syslog(LOG_EMERG, "msgbase: mime_download() Couldn't write: %s", strerror(errno));
+			syslog(LOG_EMERG, "msgbase: mime_download() Couldn't write: %m");
 			cprintf("%d unable to write tempfile.\n", ERROR + TOO_BIG);
 			fclose(CC->download_fp);
 			CC->download_fp = NULL;
@@ -2093,7 +2093,6 @@ int CtdlOutputPreLoadedMsg(
 
 	if (!CM_IsValidMsg(TheMessage)) {
 		syslog(LOG_ERR, "msgbase: error; invalid preloaded message for output");
-		cit_backtrace ();
 	 	return(om_no_such_msg);
 	}
 
@@ -2639,9 +2638,7 @@ void CtdlSerializeMessage(struct ser_ret *ret,		/* return values */
 
 	ret->ser = malloc(ret->len);
 	if (ret->ser == NULL) {
-		syslog(LOG_ERR, "msgbase: CtdlSerializeMessage() malloc(%ld) failed: %s",
-			   (long)ret->len, strerror(errno)
-		);
+		syslog(LOG_ERR, "msgbase: CtdlSerializeMessage() malloc(%ld) failed: %m", (long)ret->len);
 		ret->len = 0;
 		ret->ser = NULL;
 		return;
@@ -2914,12 +2911,12 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 	/* Decide where bounces need to be delivered */
 	if ((recps != NULL) && (recps->bounce_to == NULL))
 	{
-		if (CC->logged_in) 
-			snprintf(bounce_to, sizeof bounce_to, "%s@%s",
-				 CC->user.fullname, CtdlGetConfigStr("c_nodename"));
-		else 
-			snprintf(bounce_to, sizeof bounce_to, "%s@%s",
-				 msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]);
+		if (CC->logged_in) {
+			snprintf(bounce_to, sizeof bounce_to, "%s@%s", CC->user.fullname, CtdlGetConfigStr("c_nodename"));
+		}
+		else {
+			snprintf(bounce_to, sizeof bounce_to, "%s@%s", msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]);
+		}
 		recps->bounce_to = bounce_to;
 	}
 		
@@ -3592,7 +3589,7 @@ void AdjRefCount(long msgnum, int incr)
 	new_arcq.arcq_delta = incr;
 	rv = fwrite(&new_arcq, sizeof(struct arcq), 1, arcfp);
 	if (rv == -1) {
-		syslog(LOG_EMERG, "%s: %s", file_arcq, strerror(errno));
+		syslog(LOG_EMERG, "%s: %m", file_arcq);
 	}
 	fflush(arcfp);
 
@@ -3605,8 +3602,6 @@ void AdjRefCountList(long *msgnum, long nmsg, int incr)
 	struct arcq *new_arcq;
 	int rv = 0;
 
-	syslog(LOG_DEBUG, "msgbase: AdjRefCountList() msg %ld ref count delta %+d", nmsg, incr);
-
 	begin_critical_section(S_SUPPMSGMAIN);
 	if (arcfp == NULL) {
 		arcfp = fopen(file_arcq, "ab+");
@@ -3627,6 +3622,7 @@ void AdjRefCountList(long *msgnum, long nmsg, int incr)
 	the_size = sizeof(struct arcq) * nmsg;
 	new_arcq = malloc(the_size);
 	for (i = 0; i < nmsg; i++) {
+		syslog(LOG_DEBUG, "msgbase: AdjRefCountList() msg %ld ref count delta %+d", msgnum[i], incr);
 		new_arcq[i].arcq_msgnum = msgnum[i];
 		new_arcq[i].arcq_delta = incr;
 	}
@@ -3636,7 +3632,7 @@ void AdjRefCountList(long *msgnum, long nmsg, int incr)
 	{
 		rv = fwrite(new_arcq + offset, 1, the_size - offset, arcfp);
 		if (rv == -1) {
-			syslog(LOG_EMERG, "%s: %s", file_arcq, strerror(errno));
+			syslog(LOG_ERR, "%s: %m", file_arcq);
 		}
 		else {
 			offset += rv;
@@ -3674,7 +3670,7 @@ int TDAP_ProcessAdjRefCountQueue(void)
 
 	r = link(file_arcq, file_arcq_temp);
 	if (r != 0) {
-		syslog(LOG_ERR, "%s: %s", file_arcq_temp, strerror(errno));
+		syslog(LOG_ERR, "%s: %m", file_arcq_temp);
 		end_critical_section(S_SUPPMSGMAIN);
 		return(num_records_processed);
 	}
@@ -3684,7 +3680,7 @@ int TDAP_ProcessAdjRefCountQueue(void)
 
 	fp = fopen(file_arcq_temp, "rb");
 	if (fp == NULL) {
-		syslog(LOG_ERR, "%s: %s", file_arcq_temp, strerror(errno));
+		syslog(LOG_ERR, "%s: %m", file_arcq_temp);
 		return(num_records_processed);
 	}
 
@@ -3696,7 +3692,7 @@ int TDAP_ProcessAdjRefCountQueue(void)
 	fclose(fp);
 	r = unlink(file_arcq_temp);
 	if (r != 0) {
-		syslog(LOG_ERR, "%s: %s", file_arcq_temp, strerror(errno));
+		syslog(LOG_ERR, "%s: %m", file_arcq_temp);
 	}
 
 	return(num_records_processed);