projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
always build POP support, we do a /mail/ client, right ?
[apps/madmutt.git]
/
status.c
diff --git
a/status.c
b/status.c
index
099157d
..
47abf57
100644
(file)
--- a/
status.c
+++ b/
status.c
@@
-11,17
+11,18
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
+
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "sort.h"
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "sort.h"
-#include "mapping.h"
#include "mx.h"
#include "buffy.h"
#include "mx.h"
#include "buffy.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <string.h>
#include <ctype.h>
#include <string.h>
#include <ctype.h>
@@
-62,7
+63,8
@@
static const char *status_format_str (char *buf, size_t buflen, char op,
const char *elsestring,
unsigned long data, format_flag flags)
{
const char *elsestring,
unsigned long data, format_flag flags)
{
- char fmt[SHORT_STRING], tmp[SHORT_STRING], *cp, *p;
+ char fmt[SHORT_STRING], tmp[SHORT_STRING];
+ const char *cp, *p;
int count, optional = (flags & M_FORMAT_OPTIONAL);
MUTTMENU *menu = (MUTTMENU *) data;
int count, optional = (flags & M_FORMAT_OPTIONAL);
MUTTMENU *menu = (MUTTMENU *) data;
@@
-79,23
+81,21
@@
static const char *status_format_str (char *buf, size_t buflen, char op,
case 'B':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
case 'B':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-#ifdef USE_COMPRESSED
if (Context && Context->compressinfo && Context->realpath) {
if ((p = strrchr (Context->realpath, '/')))
if (Context && Context->compressinfo && Context->realpath) {
if ((p = strrchr (Context->realpath, '/')))
-
strfcpy (tmp, p + 1, sizeof (tmp)
);
+
m_strcpy(tmp, sizeof(tmp), p + 1
);
else
else
-
strfcpy (tmp, Context->realpath, sizeof (tmp)
);
+
m_strcpy(tmp, sizeof(tmp), Context->realpath
);
}
else
}
else
-#endif
if (Context && Context->path) {
if ((p = strrchr (Context->path, '/')))
if (Context && Context->path) {
if ((p = strrchr (Context->path, '/')))
-
strfcpy (tmp, p + 1, sizeof (tmp)
);
+
m_strcpy(tmp, sizeof(tmp), p + 1
);
else
else
-
strfcpy (tmp, Context->path, sizeof (tmp)
);
+
m_strcpy(tmp, sizeof(tmp), Context->path
);
}
else
}
else
-
strfcpy (tmp, _("no mailbox"), sizeof (tmp
));
+
m_strcpy(tmp, sizeof(tmp), _("no mailbox"
));
snprintf (buf, buflen, fmt, tmp);
break;
snprintf (buf, buflen, fmt, tmp);
break;
@@
-115,19
+115,17
@@
static const char *status_format_str (char *buf, size_t buflen, char op,
case 'f':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
case 'f':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-#ifdef USE_COMPRESSED
if (Context && Context->compressinfo && Context->realpath) {
if (Context && Context->compressinfo && Context->realpath) {
-
strfcpy (tmp, Context->realpath, sizeof (tmp)
);
+
m_strcpy(tmp, sizeof(tmp), Context->realpath
);
mutt_pretty_mailbox (tmp);
}
else
mutt_pretty_mailbox (tmp);
}
else
-#endif
if (Context && Context->path) {
if (Context && Context->path) {
-
strfcpy (tmp, Context->path, sizeof (tmp)
);
+
m_strcpy(tmp, sizeof(tmp), Context->path
);
mutt_pretty_mailbox (tmp);
}
else
mutt_pretty_mailbox (tmp);
}
else
-
strfcpy (tmp, _("(no mailbox)"), sizeof (tmp
));
+
m_strcpy(tmp, sizeof(tmp), _("(no mailbox)"
));
snprintf (buf, buflen, fmt, tmp);
break;
snprintf (buf, buflen, fmt, tmp);
break;
@@
-243,7
+241,7
@@
static const char *status_format_str (char *buf, size_t buflen, char op,
if (!StChars)
buf[0] = 0;
if (!StChars)
buf[0] = 0;
- else if (i >=
str_len
(StChars))
+ else if (i >=
m_strlen
(StChars))
buf[0] = StChars[0];
else
buf[0] = StChars[i];
buf[0] = StChars[0];
else
buf[0] = StChars[i];
@@
-281,7
+279,7
@@
static const char *status_format_str (char *buf, size_t buflen, char op,
break;
case 'v':
break;
case 'v':
-
strncpy (buf, mutt_make_version (0), buflen
);
+
m_strcpy(buf, buflen, mutt_make_version(0)
);
break;
case 'V':
break;
case 'V':
@@
-316,6
+314,8
@@
void menu_status_line (char* buf, size_t len, MUTTMENU* menu, const char* p) {
* if we have enough space for buffer, format lines to $COLS-$SidebarWidth
* only to not wrap past end of screen
*/
* if we have enough space for buffer, format lines to $COLS-$SidebarWidth
* only to not wrap past end of screen
*/
- mutt_FormatString (buf, (COLS-SW)>len?len:(COLS-SW), p, status_format_str,
+ int width = COLS - SW;
+ mutt_FormatString (buf, (width >= len ? len : (width + 1)),
+ p, status_format_str,
(unsigned long) menu, 0);
}
(unsigned long) menu, 0);
}