projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reorganize code a lot: create a lib-crypt with everything smime or gpg
[apps/madmutt.git]
/
curs_lib.c
diff --git
a/curs_lib.c
b/curs_lib.c
index
be5583f
..
451a6b1
100644
(file)
--- a/
curs_lib.c
+++ b/
curs_lib.c
@@
-18,6
+18,7
@@
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "enter.h"
#include "mutt.h"
#include "enter.h"
@@
-209,7
+210,7
@@
int mutt_yesorno (const char *msg, int def)
printw ("%.*s%s", COLS - answer_string_len, msg, answer_string);
p_delete(&answer_string);
printw ("%.*s%s", COLS - answer_string_len, msg, answer_string);
p_delete(&answer_string);
-
FOREVER
{
+
for (;;)
{
mutt_refresh ();
ch = mutt_getch ();
if (CI_is_return (ch.ch))
mutt_refresh ();
ch = mutt_getch ();
if (CI_is_return (ch.ch))
@@
-298,7
+299,6
@@
void mutt_curses_error (const char *fmt, ...)
set_option (OPTMSGERR);
}
set_option (OPTMSGERR);
}
-#ifdef USE_SOCKET
void mutt_progress_bar (progress_t* progress, long pos) {
char posstr[SHORT_STRING];
void mutt_progress_bar (progress_t* progress, long pos) {
char posstr[SHORT_STRING];
@@
-326,7
+326,6
@@
void mutt_progress_bar (progress_t* progress, long pos) {
mutt_message ("%s %s", progress->msg, posstr);
}
}
mutt_message ("%s %s", progress->msg, posstr);
}
}
-#endif
void mutt_curses_message (const char *fmt, ...)
{
void mutt_curses_message (const char *fmt, ...)
{
@@
-420,7
+419,7
@@
int mutt_do_pager (const char *banner,
{
int rc;
{
int rc;
- if (!Pager ||
str_cmp
(Pager, "builtin") == 0)
+ if (!Pager ||
m_strcmp
(Pager, "builtin") == 0)
rc = mutt_pager (banner, tempfile, do_color, info);
else {
char cmd[STRING];
rc = mutt_pager (banner, tempfile, do_color, info);
else {
char cmd[STRING];
@@
-530,7
+529,7
@@
int mutt_multi_choice (char *prompt, char *letters)
mvaddstr (LINES - 1, 0, prompt);
clrtoeol ();
mvaddstr (LINES - 1, 0, prompt);
clrtoeol ();
-
FOREVER
{
+
for (;;)
{
mutt_refresh ();
ch = mutt_getch ();
if (ch.ch == -1 || CI_is_return (ch.ch)) {
mutt_refresh ();
ch = mutt_getch ();
if (ch.ch == -1 || CI_is_return (ch.ch)) {
@@
-583,7
+582,7
@@
int mutt_addwch (wchar_t wc)
*/
void mutt_format_string (char *dest, size_t destlen,
*/
void mutt_format_string (char *dest, size_t destlen,
- int min_width, int max_width,
+
unsigned
int min_width, int max_width,
int right_justify, char m_pad_char,
const char *s, size_t n, int arboreal)
{
int right_justify, char m_pad_char,
const char *s, size_t n, int arboreal)
{
@@
-620,7
+619,7
@@
void mutt_format_string (char *dest, size_t destlen,
destlen -= k2;
}
}
destlen -= k2;
}
}
- w =
(int)
destlen < min_width ? destlen : min_width;
+ w = destlen < min_width ? destlen : min_width;
if (w <= 0)
*p = '\0';
else if (right_justify) {
if (w <= 0)
*p = '\0';
else if (right_justify) {