projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
curs_lib.c
diff --git
a/curs_lib.c
b/curs_lib.c
index
01751f1
..
043db6e
100644
(file)
--- a/
curs_lib.c
+++ b/
curs_lib.c
@@
-21,6
+21,10
@@
#include "pager.h"
#include "mbyte.h"
#include "pager.h"
#include "mbyte.h"
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
#include <termios.h>
#include <sys/types.h>
#include <fcntl.h>
#include <termios.h>
#include <sys/types.h>
#include <fcntl.h>
@@
-139,7
+143,7
@@
int mutt_get_password (char *msg, char *buf, size_t buflen)
CLEARLINE (LINES - 1);
addstr (msg);
set_option (OPTUNBUFFEREDINPUT);
CLEARLINE (LINES - 1);
addstr (msg);
set_option (OPTUNBUFFEREDINPUT);
- rc = mutt_enter_string (buf, buflen, LINES - 1,
mutt
_strlen (msg), M_PASS);
+ rc = mutt_enter_string (buf, buflen, LINES - 1,
safe
_strlen (msg), M_PASS);
unset_option (OPTUNBUFFEREDINPUT);
CLEARLINE (LINES - 1);
return (rc);
unset_option (OPTUNBUFFEREDINPUT);
CLEARLINE (LINES - 1);
return (rc);
@@
-213,7
+217,7
@@
int mutt_yesorno (const char *msg, int def)
answer_string = safe_malloc (COLS + 1);
snprintf (answer_string, COLS + 1, " ([%s]/%s): ", def == M_YES ? yes : no,
def == M_YES ? no : yes);
answer_string = safe_malloc (COLS + 1);
snprintf (answer_string, COLS + 1, " ([%s]/%s): ", def == M_YES ? yes : no,
def == M_YES ? no : yes);
- answer_string_len = strlen (answer_string);
+ answer_string_len = s
afe_s
trlen (answer_string);
printw ("%.*s%s", COLS - answer_string_len, msg, answer_string);
FREE (&answer_string);
printw ("%.*s%s", COLS - answer_string_len, msg, answer_string);
FREE (&answer_string);
@@
-357,13
+361,13
@@
void mutt_endwin (const char *msg)
}
}
}
}
-void
mutt_perror (const char *s
)
+void
_mutt_perror (const char *s, const char* filename, int line
)
{
char *p = strerror (errno);
dprint (1, (debugfile, "%s: %s (errno = %d)\n", s,
p ? p : "unknown error", errno));
{
char *p = strerror (errno);
dprint (1, (debugfile, "%s: %s (errno = %d)\n", s,
p ? p : "unknown error", errno));
- mutt_error ("%s: %s (errno = %d)
", s, p ? p : _("unknown error"), errno
);
+ mutt_error ("%s: %s (errno = %d)
from %s:%i", s, p ? p : _("unknown error"), errno, filename, line
);
}
int mutt_any_key_to_continue (const char *s)
}
int mutt_any_key_to_continue (const char *s)
@@
-399,7
+403,7
@@
int mutt_do_pager (const char *banner,
{
int rc;
{
int rc;
- if (!Pager ||
mutt
_strcmp (Pager, "builtin") == 0)
+ if (!Pager ||
safe
_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];
@@
-444,7
+448,7
@@
int _mutt_enter_fname (const char *prompt, char *buf, size_t blen,
*redraw = REDRAW_FULL;
}
else {
*redraw = REDRAW_FULL;
}
else {
- char *pc = safe_malloc (
mutt
_strlen (prompt) + 3);
+ char *pc = safe_malloc (
safe
_strlen (prompt) + 3);
sprintf (pc, "%s: ", prompt); /* __SPRINTF_CHECKED__ */
mutt_ungetch (ch.op ? 0 : ch.ch, ch.op ? ch.op : 0);
sprintf (pc, "%s: ", prompt); /* __SPRINTF_CHECKED__ */
mutt_ungetch (ch.op ? 0 : ch.ch, ch.op ? ch.op : 0);
@@
-524,7
+528,7
@@
int mutt_multi_choice (char *prompt, char *letters)
}
else if (ch.ch <= '9' && ch.ch > '0') {
choice = ch.ch - '0';
}
else if (ch.ch <= '9' && ch.ch > '0') {
choice = ch.ch - '0';
- if (choice <=
mutt
_strlen (letters))
+ if (choice <=
safe
_strlen (letters))
break;
}
}
break;
}
}
@@
-644,7
+648,7
@@
static void mutt_format_s_x (char *dest,
}
mutt_format_string (dest, destlen, min_width, max_width,
}
mutt_format_string (dest, destlen, min_width, max_width,
- right_justify, ' ', s,
mutt
_strlen (s), arboreal);
+ right_justify, ' ', s,
safe
_strlen (s), arboreal);
}
void mutt_format_s (char *dest,
}
void mutt_format_s (char *dest,
@@
-669,7
+673,7
@@
void mutt_paddstr (int n, const char *s)
wchar_t wc;
int w;
size_t k;
wchar_t wc;
int w;
size_t k;
- size_t len =
mutt
_strlen (s);
+ size_t len =
safe
_strlen (s);
mbstate_t mbstate;
memset (&mbstate, 0, sizeof (mbstate));
mbstate_t mbstate;
memset (&mbstate, 0, sizeof (mbstate));
@@
-693,7
+697,7
@@
void mutt_paddstr (int n, const char *s)
}
/*
}
/*
- * mutt_strwidth is like
mutt
_strlen except that it returns the width
+ * mutt_strwidth is like
safe
_strlen except that it returns the width
* refering to the number of characters cells.
*/
* refering to the number of characters cells.
*/
@@
-707,7
+711,7
@@
int mutt_strwidth (const char *s)
if (!s)
return 0;
if (!s)
return 0;
- n =
mutt
_strlen (s);
+ n =
safe
_strlen (s);
memset (&mbstate, 0, sizeof (mbstate));
for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) {
memset (&mbstate, 0, sizeof (mbstate));
for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) {