X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;h=d2ffaed84436582ffd5d9afecfaecfae086ab855;hb=b425dda0a48b4a3e24a9f22d25e864d42679feee;hp=8885e5d812360db07701ea09186de91735f830e5;hpb=8b8941a7c48dfcbec1f356150990da20093d6a16;p=citadel.git

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 8885e5d81..d2ffaed84 100644
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -454,7 +454,7 @@ void network_deliver_digest(struct SpoolControl *sc) {
 	snprintf(buf, sizeof buf, "[%s]", CC->room.QRname);
 	msg->cm_fields['U'] = strdup(buf);
 	sprintf(buf, "room_%s@%s", CC->room.QRname, config.c_fqdn);
-	for (i=0; i<strlen(buf); ++i) {
+	for (i=0; !IsEmptyStr(&buf[i]); ++i) {
 		if (isspace(buf[i])) buf[i]='_';
 		buf[i] = tolower(buf[i]);
 	}
@@ -612,7 +612,7 @@ void network_spool_msg(long msgnum, void *userdata) {
 			snprintf(msg->cm_fields['R'], 256,
 				"room_%s@%s", CC->room.QRname,
 				config.c_fqdn);
-			for (i=0; i<strlen(msg->cm_fields['R']); ++i) {
+			for (i=0; !IsEmptyStr(&msg->cm_fields['R'][i]); ++i) {
 				if (isspace(msg->cm_fields['R'][i])) {
 					msg->cm_fields['R'][i] = '_';
 				}
@@ -702,7 +702,7 @@ void network_spool_msg(long msgnum, void *userdata) {
 				snprintf(msg->cm_fields['F'], SIZ,
 					"room_%s@%s", CC->room.QRname,
 					config.c_fqdn);
-				for (i=0; i<strlen(msg->cm_fields['F']); ++i) {
+				for (i=0; !IsEmptyStr(&msg->cm_fields['F'][i]); ++i) {
 					if (isspace(msg->cm_fields['F'][i])) {
 						msg->cm_fields['F'][i] = '_';
 					}
@@ -973,7 +973,7 @@ void network_spoolout_room(char *room_to_spool) {
 	/* If we wrote a digest, deliver it and then close it */
 	snprintf(buf, sizeof buf, "room_%s@%s",
 		CC->room.QRname, config.c_fqdn);
-	for (i=0; i<strlen(buf); ++i) {
+	for (i=0; !IsEmptyStr(&buf[i]); ++i) {
 		buf[i] = tolower(buf[i]);
 		if (isspace(buf[i])) buf[i] = '_';
 	}