projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mutt_FormatString -> m_strformat (will soon end up into the str lib \o/)
[apps/madmutt.git]
/
lib-ui
/
status.c
diff --git
a/lib-ui/status.c
b/lib-ui/status.c
index
1f756a5
..
3da31d9
100644
(file)
--- a/
lib-ui/status.c
+++ b/
lib-ui/status.c
@@
-7,28
+7,16
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# 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 <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "sort.h"
#include "mutt.h"
#include "sort.h"
-#include "mx.h"
#include "buffy.h"
#include "buffy.h"
-
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
static char *get_sort_str (char *buf, ssize_t buflen, int method)
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
static char *get_sort_str (char *buf, ssize_t buflen, int method)
@@
-64,7
+52,7
@@
static const char *status_format_str (char *buf, ssize_t buflen, char op,
const char *elsestring,
unsigned long data, format_flag flags)
{
const char *elsestring,
unsigned long data, format_flag flags)
{
- char fmt[S
HORT_STRING], tmp[SHORT_
STRING];
+ char fmt[S
TRING], tmp[
STRING];
const char *cp, *p;
int count, optional = (flags & M_FORMAT_OPTIONAL);
MUTTMENU *menu = (MUTTMENU *) data;
const char *cp, *p;
int count, optional = (flags & M_FORMAT_OPTIONAL);
MUTTMENU *menu = (MUTTMENU *) data;
@@
-82,7
+70,7
@@
static const char *status_format_str (char *buf, ssize_t buflen, char op,
case 'B':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
case 'B':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- if (Context && Context->c
ompress
info && Context->realpath) {
+ if (Context && Context->cinfo && Context->realpath) {
if ((p = strrchr (Context->realpath, '/')))
m_strcpy(tmp, sizeof(tmp), p + 1);
else
if ((p = strrchr (Context->realpath, '/')))
m_strcpy(tmp, sizeof(tmp), p + 1);
else
@@
-116,17
+104,16
@@
static const char *status_format_str (char *buf, ssize_t buflen, char op,
case 'f':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
case 'f':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- if (Context && Context->c
ompress
info && Context->realpath) {
+ if (Context && Context->cinfo && Context->realpath) {
m_strcpy(tmp, sizeof(tmp), Context->realpath);
mutt_pretty_mailbox (tmp);
m_strcpy(tmp, sizeof(tmp), Context->realpath);
mutt_pretty_mailbox (tmp);
- }
- else
+ } else
if (Context && Context->path) {
m_strcpy(tmp, sizeof(tmp), Context->path);
mutt_pretty_mailbox (tmp);
if (Context && Context->path) {
m_strcpy(tmp, sizeof(tmp), Context->path);
mutt_pretty_mailbox (tmp);
- }
- else
+ } else {
m_strcpy(tmp, sizeof(tmp), _("(no mailbox)"));
m_strcpy(tmp, sizeof(tmp), _("(no mailbox)"));
+ }
snprintf (buf, buflen, fmt, tmp);
break;
snprintf (buf, buflen, fmt, tmp);
break;
@@
-306,7
+293,7
@@
void menu_status_line (char* buf, ssize_t len, MUTTMENU* menu, const char* p) {
* only to not wrap past end of screen
*/
int width = COLS - SW;
* only to not wrap past end of screen
*/
int width = COLS - SW;
- m
utt_FormatString
(buf, (width >= len ? len : (width + 1)),
+ m
_strformat
(buf, (width >= len ? len : (width + 1)),
p, status_format_str,
(unsigned long) menu, 0);
}
p, status_format_str,
(unsigned long) menu, 0);
}