X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=caa85388a5fe5b57c55a3b5aa60f1ad2672782c4;hp=694860790d3af05f15fb8843302fb4c8ea062c42;hb=40fc05e11b8f95a9661e6e410a9e7b7da7824891;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b diff --git a/sidebar.c b/sidebar.c index 6948607..caa8538 100644 --- a/sidebar.c +++ b/sidebar.c @@ -13,16 +13,17 @@ */ #include +#include #include +#include +#include + #include "mutt.h" -#include "mutt_menu.h" -#include "mutt_curses.h" #include "sidebar.h" #include "buffy.h" #include "keymap.h" -#include "lib/str.h" #include #include @@ -60,11 +61,11 @@ static char *shortened_hierarchy (char *box, int maxlen) { int dots = 0; char *last_dot = NULL; - int i, j, len = str_len (box); + int i, j, len = m_strlen(box); char *new_box; if (!SidebarBoundary || !*SidebarBoundary) - return (str_dup (box)); + return (m_strdup(box)); for (i = 0; i < len; ++i) { if (strchr (SidebarBoundary, box[i])) { @@ -81,7 +82,7 @@ static char *shortened_hierarchy (char *box, int maxlen) if (strchr (SidebarBoundary, box[i])) { new_box[j++] = box[i]; new_box[j] = 0; - if (&box[i + 1] != last_dot || j + str_len (last_dot) > maxlen) { + if (&box[i + 1] != last_dot || j + m_strlen(last_dot) > maxlen) { new_box[j++] = box[i + 1]; new_box[j] = 0; } else { @@ -92,17 +93,17 @@ static char *shortened_hierarchy (char *box, int maxlen) } return new_box; } - return str_dup (box); + return m_strdup(box); } -static const char* sidebar_number_format (char* dest, size_t destlen, char op, +static const char* sidebar_number_format (char* dest, ssize_t destlen, char op, const char* src, const char* fmt, const char* ifstr, const char* elstr, unsigned long data, format_flag flags) { char tmp[SHORT_STRING]; BUFFY* b = (BUFFY*) Incoming->data[data]; int opt = flags & M_FORMAT_OPTIONAL; - int c = Context && str_eq (Context->path, b->path); + int c = Context && !m_strcmp(Context->path, b->path); switch (op) { /* deleted */ @@ -186,20 +187,18 @@ int sidebar_need_count (void) { * 0 item was not printed ('cause of $sidebar_newmail_only) * 1 item was printed */ -int make_sidebar_entry (char* box, int idx, size_t len) +int make_sidebar_entry (char* box, int idx, ssize_t len) { int shortened = 0, lencnt = 0; char no[SHORT_STRING], entry[SHORT_STRING]; -#if USE_IMAP - int l = str_len (ImapHomeNamespace); -#endif - int l_m = str_len (Maildir); + int l = m_strlen(ImapHomeNamespace); + int l_m = m_strlen(Maildir); if (SidebarWidth > COLS) SidebarWidth = COLS; if (option (OPTSIDEBARNEWMAILONLY) && box && Context && Context->path && - !str_eq (Context->path, box) && ((BUFFY*) Incoming->data[idx])->new == 0) + m_strcmp(Context->path, box) && ((BUFFY*) Incoming->data[idx])->new == 0) /* if $sidebar_newmail_only is set, don't display the * box only if it's not the currently opened * (i.e. always display the currently opened) */ @@ -207,17 +206,15 @@ int make_sidebar_entry (char* box, int idx, size_t len) mutt_FormatString (no, len, NONULL (SidebarNumberFormat), sidebar_number_format, idx, M_FORMAT_OPTIONAL); - lencnt = str_len (no); - memset (&entry, ' ', sizeof (entry)); + lencnt = m_strlen(no); + memset(&entry, ' ', sizeof(entry)); -#if USE_IMAP - if (l > 0 && str_ncmp (box, ImapHomeNamespace, l) == 0 && - str_len (box) > l) + if (l > 0 && m_strncmp(box, ImapHomeNamespace, l) == 0 && + m_strlen(box) > l) box += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */ else -#endif - if (l_m > 0 && str_ncmp (box, Maildir, l_m) == 0 && - str_len (box) > l_m) { + if (l_m > 0 && m_strncmp(box, Maildir, l_m) == 0 && + m_strlen(box) > l_m) { box += l_m; if (Maildir[strlen(Maildir)-1]!='/') { box += 1; @@ -225,14 +222,14 @@ int make_sidebar_entry (char* box, int idx, size_t len) } else box = basename (box); - if (option (OPTSHORTENHIERARCHY) && str_len (box) > len-lencnt-1) { + if (option (OPTSHORTENHIERARCHY) && m_strlen(box) > len-lencnt-1) { box = shortened_hierarchy (box, len-lencnt-1); shortened = 1; } - snprintf (entry, len-lencnt, "%s", box); - entry[str_len (entry)] = ' '; - strncpy (entry + (len - lencnt), no, lencnt); + m_strcpy(entry, len - lencnt, box); + entry[m_strlen(entry)] = ' '; + memcpy(entry + (len - lencnt), no, lencnt); addnstr (entry, len); @@ -276,12 +273,12 @@ void sidebar_set_buffystats (CONTEXT* Context) { } void sidebar_draw_frames (void) { - size_t i,delim_len; + ssize_t i,delim_len; if (!option(OPTMBOXPANE) || SidebarWidth==0) return; - delim_len=str_len(NONULL(SidebarDelim)); + delim_len=m_strlen(NONULL(SidebarDelim)); /* draw vertical delimiter */ SETCOLOR (MT_COLOR_SIDEBAR); @@ -289,9 +286,9 @@ void sidebar_draw_frames (void) { move (i, SidebarWidth - delim_len); if (option (OPTASCIICHARS)) addstr (NONULL (SidebarDelim)); - else if (!option (OPTASCIICHARS) && !str_cmp (SidebarDelim, "|")) + else if (!option (OPTASCIICHARS) && !m_strcmp(SidebarDelim, "|")) addch (ACS_VLINE); - else if ((Charset_is_utf8) && !str_cmp (SidebarDelim, "|")) + else if ((Charset_is_utf8) && !m_strcmp(SidebarDelim, "|")) addstr ("\342\224\202"); else addstr (NONULL (SidebarDelim)); @@ -328,7 +325,7 @@ int sidebar_draw (int menu) { last_line = LINES - 2 + (option (OPTSTATUSONTOP) && !option (OPTHELP) ? 1 : 0), i = 0,line; BUFFY *tmp; - size_t delim_len = str_len (SidebarDelim); + ssize_t delim_len = m_strlen(SidebarDelim); char blank[SHORT_STRING]; known_lines=last_line-first_line; @@ -352,7 +349,7 @@ int sidebar_draw (int menu) { } if (SidebarWidth > 0 && option (OPTMBOXPANE) - && str_len (SidebarDelim) >= SidebarWidth) { + && m_strlen(SidebarDelim) >= SidebarWidth) { mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar.")); sleep (2); unset_option (OPTMBOXPANE); @@ -387,7 +384,7 @@ int sidebar_draw (int menu) { SETCOLOR (MT_COLOR_NORMAL); /* fill with blanks to bottom */ - memset (&blank, ' ', sizeof (blank)); + memset(&blank, ' ', sizeof(blank)); for (; line < last_line; line++) { move (line, 0); addnstr (blank, SidebarWidth-delim_len);