Rocco Rutte:

[apps/madmutt.git] / browser.c

diff --git a/browser.c b/browser.c
index 1dbc644..f509f02 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -90,7 +90,7 @@ static int browser_compare_subject (const void *a, const void *b)
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 

-  int r = mutt_strcoll (pa->name, pb->name);
+  int r = safe_strcoll (pa->name, pb->name);

 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
 }
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
 }


@@ -484,7 +484,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
       if (!(data = (NNTP_DATA *) tmp->data))
         continue;
       if (prefix && *prefix && strncmp (prefix, data->group,
       if (!(data = (NNTP_DATA *) tmp->data))
         continue;
       if (prefix && *prefix && strncmp (prefix, data->group,

-                                        mutt_strlen (prefix)) != 0)
+                                        safe_strlen (prefix)) != 0)

         continue;
       if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
         continue;
         continue;
       if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
         continue;


@@ -529,11 +529,11 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
     init_state (state, menu);
 
     while ((de = readdir (dp)) != NULL) {
     init_state (state, menu);
 
     while ((de = readdir (dp)) != NULL) {

-      if (mutt_strcmp (de->d_name, ".") == 0)
+      if (safe_strcmp (de->d_name, ".") == 0)

         continue;               /* we don't need . */
 
       if (prefix && *prefix
         continue;               /* we don't need . */
 
       if (prefix && *prefix

-          && mutt_strncmp (prefix, de->d_name, mutt_strlen (prefix)) != 0)
+          && safe_strncmp (prefix, de->d_name, safe_strlen (prefix)) != 0)

         continue;
       if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
         continue;
         continue;
       if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
         continue;


@@ -773,7 +773,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
     }
     else {
 #endif
     }
     else {
 #endif

-      for (i = mutt_strlen (f) - 1; i > 0 && f[i] != '/'; i--);
+      for (i = safe_strlen (f) - 1; i > 0 && f[i] != '/'; i--);

       if (i > 0) {
         if (f[0] == '/') {
           if (i > sizeof (LastDir) - 1)
       if (i > 0) {
         if (f[0] == '/') {
           if (i > sizeof (LastDir) - 1)


@@ -889,8 +889,8 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
           /* save the old directory */
           strfcpy (OldLastDir, LastDir, sizeof (OldLastDir));
 
           /* save the old directory */
           strfcpy (OldLastDir, LastDir, sizeof (OldLastDir));
 

-          if (mutt_strcmp (state.entry[menu->current].name, "..") == 0) {
-            if (mutt_strcmp ("..", LastDir + mutt_strlen (LastDir) - 2) == 0)
+          if (safe_strcmp (state.entry[menu->current].name, "..") == 0) {
+            if (safe_strcmp ("..", LastDir + safe_strlen (LastDir) - 2) == 0)

               strcat (LastDir, "/..");  /* __STRCAT_CHECKED__ */
             else {
               char *p = strrchr (LastDir + 1, '/');
               strcat (LastDir, "/..");  /* __STRCAT_CHECKED__ */
             else {
               char *p = strrchr (LastDir + 1, '/');


@@ -918,7 +918,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
             strfcpy (LastDir, state.entry[menu->current].name,
                      sizeof (LastDir));
             /* tack on delimiter here */
             strfcpy (LastDir, state.entry[menu->current].name,
                      sizeof (LastDir));
             /* tack on delimiter here */

-            n = mutt_strlen (LastDir) + 1;
+            n = safe_strlen (LastDir) + 1;

 
             /* special case "" needs no delimiter */
             url_parse_ciss (&url, state.entry[menu->current].name);
 
             /* special case "" needs no delimiter */
             url_parse_ciss (&url, state.entry[menu->current].name);


@@ -1123,7 +1123,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
 #endif
       {
         /* add '/' at the end of the directory name if not already there */
 #endif
       {
         /* add '/' at the end of the directory name if not already there */

-        int len = mutt_strlen (LastDir);
+        int len = safe_strlen (LastDir);

 
         if (len && LastDir[len - 1] != '/' && sizeof (buf) > len)
           buf[len] = '/';
 
         if (len && LastDir[len - 1] != '/' && sizeof (buf) > len)
           buf[len] = '/';


@@ -1199,7 +1199,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
           mutt_error ("%s", buf);
         }
         else {
           mutt_error ("%s", buf);
         }
         else {

-          mutt_str_replace (&Mask.pattern, buf);
+          str_replace (&Mask.pattern, buf);

           regfree (Mask.rx);
           FREE (&Mask.rx);
           Mask.rx = rx;
           regfree (Mask.rx);
           FREE (&Mask.rx);
           Mask.rx = rx;