Changeset 557:2c8523f9a1c8 for alias.c

Timestamp:

1998-11-10 14:14:00 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Introduce or rewrite mutt_{str*cmp,strlen} and use them all over the
place. If there are still segmentation faults due to missing
NONULLs over, they are gone now.

Files:

• alias.c (modified) (8 diffs)

alias.c

@@ -30 +30 @@
 
   for (; t; t = t->next)
-    if (!strcasecmp (s, t->name))
+    if (!mutt_strcasecmp (s, t->name))
       return (t->addr);
   return (NULL);   /* no such alias */
@@ -53 +53 @@
         for (u = *expn; u; u = u->next)
         {
-          if (strcmp (a->mailbox, u->data) == 0) /* alias already found */
+          if (mutt_strcmp (a->mailbox, u->data) == 0) /* alias already found */
           {
             dprint (1, (debugfile, "mutt_expand_aliases_r(): loop in alias found for '%s'\n", a->mailbox));
@@ -288 +288 @@
     {
       if (!ap->group && ap->mailbox &&
-          strcasecmp (ap->mailbox, a->mailbox) == 0)
+          mutt_strcasecmp (ap->mailbox, a->mailbox) == 0)
         return ap;
     }
@@ -316 +316 @@
     {
       if (!bestname[0]) /* init */
-        strfcpy (bestname, a->name, min (strlen (a->name) + 1, sizeof (bestname)));
+        strfcpy (bestname, a->name, min (mutt_strlen (a->name) + 1, sizeof (bestname)));
       else
       {
@@ -335 +335 @@
   else
   {
-    if (strcmp (bestname, s) == 0) /* add anything to the completion? */
+    if (mutt_strcmp (bestname, s) == 0) /* add anything to the completion? */
     {
       /* build alias list and show it */
@@ -370 +370 @@
     }
     else /* we are adding something to the completion */
-      strfcpy (s, bestname, strlen (bestname) + 1);
+      strfcpy (s, bestname, mutt_strlen (bestname) + 1);
   }
 
@@ -381 +381 @@
   
   snprintf(buf, sizeof(buf), "%s@%s", NONULL(u), NONULL(d));
-  if (strcasecmp(str, buf) == 0)
+  if (mutt_strcasecmp(str, buf) == 0)
     return 1;
   
@@ -396 +396 @@
     return 0;
 
-  if (strcasecmp (addr->mailbox, NONULL(Username)) == 0)
+  if (mutt_strcasecmp (addr->mailbox, Username) == 0)
     return 1;
   if(string_is_address(addr->mailbox, Username, Hostname))