* strlen holy war: loops. in loops it's very evil. the easy ones go away now.

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 90a7f4f969005530ed4dcb2a323fc4251f45de30..6032caeaadcc712e13f83e0a8803120d1341af67 100644 (file)
--- 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;
@@ -403,7 +406,7 @@ void cmd_iden(char *argbuf)
        safestrncpy(CC->cs_clientname, desc, sizeof CC->cs_clientname);
        CC->cs_clientname[31] = 0;
 
-       if (strlen(from_host) > 0) {
+       if (!IsEmptyStr(from_host)) {
                if (CC->is_local_socket) do_lookup = 1;
                else if (is_public_client()) do_lookup = 1;
        }
@@ -474,12 +477,12 @@ void cmd_mesg(char *mname)
        /* Otherwise, look for the requested file by name. */
        else {
                mesg_locate(targ, sizeof targ, buf2, 2, (const char **)dirs);
-               if (strlen(targ) == 0) {
+               if (IsEmptyStr(targ)) {
                        snprintf(buf2, sizeof buf2, "%s.%d",
                                                        buf, CC->cs_clientdev);
                        mesg_locate(targ, sizeof targ, buf2, 2,
                                                        (const char **)dirs);
-                       if (strlen(targ) == 0) {
+                       if (IsEmptyStr(targ)) {
                                mesg_locate(targ, sizeof targ, buf, 2,
                                                        (const char **)dirs);
                        }       
@@ -489,7 +492,7 @@ void cmd_mesg(char *mname)
        free(dirs[0]);
        free(dirs[1]);
 
-       if (strlen(targ)==0) {
+       if (IsEmptyStr(targ)) {
                cprintf("%d '%s' not found.  (Searching in %s and %s)\n",
                        ERROR + FILE_NOT_FOUND,
                        mname,
@@ -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] = '.';
        }
 
@@ -545,7 +548,7 @@ void cmd_emsg(char *mname)
        free(dirs[0]);
        free(dirs[1]);
 
-       if (strlen(targ)==0) {
+       if (IsEmptyStr(targ)) {
                snprintf(targ, sizeof targ, 
                                 "%s/%s",
                                 ctdl_hlp_dir, buf);