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

[citadel.git] / citadel / modules / smtp / serv_smtp.c

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 304344694bdc16b4e96604453f4993d12293f821..b7da263ec3c1d5992beabebe0cbdff2d2b85f6b7 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -958,7 +958,7 @@ void smtp_try(const char *key, const char *addr, int *status,
                if (!strncasecmp(buf, "From:", 5)) {
                        safestrncpy(mailfrom, &buf[5], sizeof mailfrom);
                        striplt(mailfrom);
-                       for (i=0; i<strlen(mailfrom); ++i) {
+                       for (i=0; !IsEmptyStr(&mailfrom[i]); ++i) {
                                if (!isprint(mailfrom[i])) {
                                        strcpy(&mailfrom[i], &mailfrom[i+1]);
                                        i=0;
@@ -968,7 +968,7 @@ void smtp_try(const char *key, const char *addr, int *status,
                        /* Strip out parenthesized names */
                        lp = (-1);
                        rp = (-1);
-                       for (i=0; i<strlen(mailfrom); ++i) {
+                       for (i=0; !IsEmptyStr(&mailfrom[i]); ++i) {
                                if (mailfrom[i] == '(') lp = i;
                                if (mailfrom[i] == ')') rp = i;
                        }
@@ -979,7 +979,7 @@ void smtp_try(const char *key, const char *addr, int *status,
                        /* Prefer brokketized names */
                        lp = (-1);
                        rp = (-1);
-                       for (i=0; i<strlen(mailfrom); ++i) {
+                       for (i=0; !IsEmptyStr(&mailfrom[i]); ++i) {
                                if (mailfrom[i] == '<') lp = i;
                                if (mailfrom[i] == '>') rp = i;
                        }