Changeset 557:2c8523f9a1c8 for browser.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:

• browser.c (modified) (7 diffs)

browser.c

@@ -86 +86 @@
   struct folder_file *pb = (struct folder_file *) b;
 
-  int r = strcmp (pa->name, pb->name);
+  int r = mutt_strcmp (pa->name, pb->name);
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
@@ -359 +359 @@
   while ((de = readdir (dp)) != NULL)
   {
-    if (strcmp (de->d_name, ".") == 0)
+    if (mutt_strcmp (de->d_name, ".") == 0)
       continue;    /* we don't need . */
     
-    if (prefix && *prefix && strncmp (prefix, de->d_name, strlen (prefix)) != 0)
+    if (prefix && *prefix && mutt_strncmp (prefix, de->d_name, mutt_strlen (prefix)) != 0)
       continue;
     if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
@@ -376 +376 @@
     
     tmp = Incoming;
-    while (tmp && strcmp (buffer, NONULL(tmp->path)))
+    while (tmp && mutt_strcmp (buffer, tmp->path))
       tmp = tmp->next;
     add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0);
@@ -473 +473 @@
   {
     mutt_expand_path (f, flen);
-    for (i = strlen (f) - 1; i > 0 && f[i] != '/' ; i--);
+    for (i = mutt_strlen (f) - 1; i > 0 && f[i] != '/' ; i--);
     if (i > 0)
     {
@@ -560 +560 @@
             strfcpy (OldLastDir, LastDir, sizeof (OldLastDir));
 
-            if (strcmp (state.entry[menu->current].name, "..") == 0)
+            if (mutt_strcmp (state.entry[menu->current].name, "..") == 0)
             {
-              if (strcmp ("..", LastDir + strlen (LastDir) - 2) == 0)
+              if (mutt_strcmp ("..", LastDir + mutt_strlen (LastDir) - 2) == 0)
                 strcat (LastDir, "/..");
               else
@@ -585 +585 @@
             }
             else
-              sprintf (LastDir + strlen (LastDir), "/%s",
+              sprintf (LastDir + mutt_strlen (LastDir), "/%s",
                        state.entry[menu->current].name);
 
@@ -637 +637 @@
         strfcpy (buf, LastDir, sizeof (buf));
         {/* add '/' at the end of the directory name */
-        int len=strlen(LastDir);
+        int len=mutt_strlen(LastDir);
         if (sizeof (buf) > len)
           buf[len]='/';