X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=fd927536c9b4a8729de835c379ced69ecfb73864;hp=52fbb06abd44a71f72a2c2ba193e74ada768dad7;hb=10ed4484b3d4bafd7a7aa287097fd612f7b9034a;hpb=81efbf8081bad2eed7ad07209b301ca35fe183e8

diff --git a/browser.c b/browser.c
index 52fbb06..fd92753 100644
--- a/browser.c
+++ b/browser.c
@@ -151,7 +151,7 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op,
                                       const char *elsestring,
                                       unsigned long data, format_flag flags)
 {
-  char fn[SHORT_STRING], tmp[SHORT_STRING], permission[11], date[16];
+  char fn[STRING], tmp[STRING], permission[11], date[16];
   const char *t_fmt;
   time_t tnow;
   FOLDER *folder = (FOLDER *) data;
@@ -316,7 +316,7 @@ static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
                                          unsigned long data,
                                          format_flag flags)
 {
-  char fn[SHORT_STRING], tmp[SHORT_STRING];
+  char fn[STRING], tmp[STRING];
   FOLDER *folder = (FOLDER *) data;
 
   switch (op) {
@@ -480,7 +480,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
     struct stat s;
     DIR *dp;
     struct dirent *de;
-    char buffer[_POSIX_PATH_MAX + SHORT_STRING];
+    char buffer[_POSIX_PATH_MAX + STRING];
     int i = -1;
 
     while (stat (d, &s) == -1) {
@@ -717,7 +717,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
 {
   char buf[_POSIX_PATH_MAX];
   char prefix[_POSIX_PATH_MAX] = "";
-  char helpstr[SHORT_STRING];
+  char helpstr[STRING];
   char title[STRING];
   struct browser_state state;
   MUTTMENU *menu;
@@ -778,7 +778,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
       }
       else {
         if (f[0] == '/')
-          strcpy (LastDir, "/");        /* __STRCPY_CHECKED__ */
+          m_strcpy(LastDir, sizeof(LastDir), "/");
         else
           getcwd (LastDir, sizeof (LastDir));
       }
@@ -869,7 +869,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
 
           if (m_strcmp(state.entry[menu->current].name, "..") == 0) {
             if (m_strcmp("..", LastDir + m_strlen(LastDir) - 2) == 0)
-              strcat (LastDir, "/..");  /* __STRCAT_CHECKED__ */
+              m_strcat(LastDir, sizeof(LastDir), "/..");
             else {
               char *p = strrchr (LastDir + 1, '/');
 
@@ -879,7 +879,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
                 if (LastDir[0] == '/')
                   LastDir[1] = 0;
                 else
-                  strcat (LastDir, "/..");      /* __STRCAT_CHECKED__ */
+                  m_strcat(LastDir, sizeof(LastDir), "/..");
               }
             }
           }
@@ -1054,7 +1054,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
       if (!state.entry[menu->current].imap)
         mutt_error (_("Delete is only supported for IMAP mailboxes"));
       else {
-        char msg[SHORT_STRING];
+        char msg[STRING];
         IMAP_MBOX mx;
         int nentry = menu->current;