X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=6032caeaadcc712e13f83e0a8803120d1341af67;hb=b425dda0a48b4a3e24a9f22d25e864d42679feee;hp=c221d6aafbf6949fd9bfa939f283999bcdee13ff;hpb=8b8941a7c48dfcbec1f356150990da20093d6a16;p=citadel.git

diff --git a/citadel/citserver.c b/citadel/citserver.c
index c221d6aaf..6032caeaa 100644
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -334,8 +334,11 @@ int is_public_client(void)
 
 		fp = fopen(public_clients_file, "r");
 		if (fp != NULL) while (fgets(buf, sizeof buf, fp)!=NULL) {
-			for (i=0; i<strlen(buf); ++i) {
+			char *ptr;
+			ptr = buf;
+			while (!IsEmptyStr(*ptr)) {
 				if (buf[i] == '#') buf[i] = 0;
+				else ptr++;
 			}
 			while (isspace((buf[strlen(buf)-1]))) {
 				buf[strlen(buf)-1] = 0;
@@ -534,7 +537,7 @@ void cmd_emsg(char *mname)
 	if (CtdlAccessCheck(ac_aide)) return;
 
 	extract_token(buf, mname, 0, '|', sizeof buf);
-	for (a=0; a<strlen(buf); ++a) {		/* security measure */
+	for (a=0; !IsEmptyStr(&buf[a]); ++a) {		/* security measure */
 		if (buf[a] == '/') buf[a] = '.';
 	}