X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=4af5dcad56b15c114d4f0454c7dc5be4718072f0;hp=8ff73d8804e5eaefb81e43b10c15cad609af9776;hb=27c3007f2cfb52db5a357eaa2a8313a5ab03c93d;hpb=284454918cc95058b026d057195eaa5279135c36 diff --git a/browser.c b/browser.c index 8ff73d8..4af5dca 100644 --- a/browser.c +++ b/browser.c @@ -17,18 +17,17 @@ #include #include #include +#include #include "mutt.h" -#include "mx.h" #include "buffy.h" #include "sort.h" #include "browser.h" #include "attach.h" #include -#include #ifdef USE_NNTP -#include "nntp.h" +#include #endif static struct mapping_t FolderHelp[] = { @@ -152,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; @@ -302,9 +301,9 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op, } if (optional) - mutt_FormatString (dest, destlen, ifstring, folder_format_str, data, 0); + m_strformat (dest, destlen, ifstring, folder_format_str, data, 0); else if (flags & M_FORMAT_OPTIONAL) - mutt_FormatString (dest, destlen, elsestring, folder_format_str, data, 0); + m_strformat (dest, destlen, elsestring, folder_format_str, data, 0); return (src); } @@ -317,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) { @@ -351,10 +350,10 @@ static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op, case 's': if (flags & M_FORMAT_OPTIONAL) { if (folder->ff->nd->unread != 0) - mutt_FormatString (dest, destlen, ifstring, newsgroup_format_str, + m_strformat (dest, destlen, ifstring, newsgroup_format_str, data, flags); else - mutt_FormatString (dest, destlen, elsestring, newsgroup_format_str, + m_strformat (dest, destlen, elsestring, newsgroup_format_str, data, flags); } else if (Context && Context->data == folder->ff->nd) { @@ -463,8 +462,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, if (!(data = (NNTP_DATA *) tmp->data)) continue; nntp_sync_sidebar (data); - if (prefix && *prefix && strncmp (prefix, data->group, - m_strlen(prefix)) != 0) + if (m_strncmp (prefix, data->group, m_strlen(prefix)) != 0) continue; if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not)) continue; @@ -482,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) { @@ -517,8 +515,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, if (m_strcmp(de->d_name, ".") == 0) continue; /* we don't need . */ - if (prefix && *prefix - && m_strncmp(prefix, de->d_name, m_strlen(prefix)) != 0) + if (m_strncmp(prefix, de->d_name, m_strlen(prefix)) != 0) continue; if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not)) continue; @@ -648,12 +645,14 @@ static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num) #ifdef USE_NNTP if (option (OPTNEWS)) - mutt_FormatString (s, slen, NONULL (GroupFormat), newsgroup_format_str, - (unsigned long) &folder, M_FORMAT_ARROWCURSOR); + m_strformat(s, slen, NONULL (GroupFormat), newsgroup_format_str, + (unsigned long)&folder, + option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0); else #endif - mutt_FormatString (s, slen, NONULL (FolderFormat), folder_format_str, - (unsigned long) &folder, M_FORMAT_ARROWCURSOR); + m_strformat(s, slen, NONULL (FolderFormat), folder_format_str, + (unsigned long)&folder, + option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0); } static void init_menu (struct browser_state *state, MUTTMENU * menu, @@ -720,7 +719,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; @@ -781,7 +780,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)); } @@ -872,7 +871,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, '/'); @@ -882,7 +881,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), "/.."); } } } @@ -1057,7 +1056,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;