projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
and less size_t's
[apps/madmutt.git]
/
lib-ui
/
curs_lib.c
diff --git
a/lib-ui/curs_lib.c
b/lib-ui/curs_lib.c
index
318ee85
..
1cc7aa6
100644
(file)
--- a/
lib-ui/curs_lib.c
+++ b/
lib-ui/curs_lib.c
@@
-16,6
+16,7
@@
#endif
#include <wchar.h>
#endif
#include <wchar.h>
+#include <wctype.h>
#include <termios.h>
#include <sys/types.h>
#include <fcntl.h>
#include <termios.h>
#include <sys/types.h>
#include <fcntl.h>
@@
-35,20
+36,23
@@
#include <lib-lib/file.h>
#include <lib-lib/debug.h>
#include <lib-lib/file.h>
#include <lib-lib/debug.h>
+#include <lib-sys/unix.h>
+#include <lib-sys/mutt_signal.h>
+
#include "curses.h"
#include "menu.h"
#include "enter.h"
#include "mutt.h"
#include "pager.h"
#include "curses.h"
#include "menu.h"
#include "enter.h"
#include "mutt.h"
#include "pager.h"
-#include "
mbyte
.h"
+#include "
charset
.h"
/* not possible to unget more than one char under some curses libs, and it
* is impossible to unget function keys in SLang, so roll our own input
* buffering routines.
*/
/* not possible to unget more than one char under some curses libs, and it
* is impossible to unget function keys in SLang, so roll our own input
* buffering routines.
*/
-size_t UngetCount = 0;
-static size_t UngetBufLen = 0;
+s
s
ize_t UngetCount = 0;
+static s
s
ize_t UngetBufLen = 0;
static event_t *KeyEvent;
void mutt_refresh (void)
static event_t *KeyEvent;
void mutt_refresh (void)
@@
-112,7
+116,7
@@
event_t mutt_getch (void)
return (ch == ctrl ('G') ? err : ret);
}
return (ch == ctrl ('G') ? err : ret);
}
-int _mutt_get_field ( const char *field, char *buf, size_t buflen,
+int _mutt_get_field ( const char *field, char *buf, s
s
ize_t buflen,
int complete, int multiple, char ***files, int *numfiles)
{
int ret;
int complete, int multiple, char ***files, int *numfiles)
{
int ret;
@@
-136,7
+140,7
@@
int _mutt_get_field ( const char *field, char *buf, size_t buflen,
return (ret);
}
return (ret);
}
-int mutt_get_field_unbuffered (char *msg, char *buf, size_t buflen, int flags)
+int mutt_get_field_unbuffered (char *msg, char *buf, s
s
ize_t buflen, int flags)
{
int rc;
{
int rc;
@@
-172,7
+176,7
@@
int mutt_yesorno (const char *msg, int def)
char *yes = _("yes");
char *no = _("no");
char *answer_string;
char *yes = _("yes");
char *no = _("no");
char *answer_string;
- size_t answer_string_len;
+ s
s
ize_t answer_string_len;
#ifdef HAVE_LANGINFO_YESEXPR
char *expr;
#ifdef HAVE_LANGINFO_YESEXPR
char *expr;
@@
-433,7
+437,7
@@
int mutt_do_pager (const char *banner,
return rc;
}
return rc;
}
-int _mutt_enter_fname (const char *prompt, char *buf, size_t blen,
+int _mutt_enter_fname (const char *prompt, char *buf, s
s
ize_t blen,
int *redraw, int buffy, int multiple, char ***files,
int *numfiles)
{
int *redraw, int buffy, int multiple, char ***files,
int *numfiles)
{
@@
-558,11
+562,11
@@
int mutt_addwch (wchar_t wc)
{
char buf[MB_LEN_MAX * 2];
mbstate_t mbstate;
{
char buf[MB_LEN_MAX * 2];
mbstate_t mbstate;
- size_t n1, n2;
+ s
s
ize_t n1, n2;
p_clear(&mbstate, 1);
p_clear(&mbstate, 1);
- if ((n1 = wcrtomb
(buf, wc, &mbstate)) == (size_t) (-1)
||
- (n2 = wcrtomb
(buf + n1, 0, &mbstate)) == (size_t) (-1)
)
+ if ((n1 = wcrtomb
(buf, wc, &mbstate)) == -1
||
+ (n2 = wcrtomb
(buf + n1, 0, &mbstate)) == -1
)
return -1; /* ERR */
else
return addstr (buf);
return -1; /* ERR */
else
return addstr (buf);
@@
-639,8
+643,7
@@
void mutt_format_string (char *dest, ssize_t destlen,
* the number of character cells when printed.
*/
* the number of character cells when printed.
*/
-static void mutt_format_s_x (char *dest,
- size_t destlen,
+static void mutt_format_s_x (char *dest, ssize_t destlen,
const char *prefix, const char *s, int arboreal)
{
int right_justify = 1;
const char *prefix, const char *s, int arboreal)
{
int right_justify = 1;
@@
-662,14
+665,14
@@
static void mutt_format_s_x (char *dest,
right_justify, ' ', s, m_strlen(s), arboreal);
}
right_justify, ' ', s, m_strlen(s), arboreal);
}
-void mutt_format_s (char *dest,
-
size_t destlen,
const char *prefix, const char *s)
+void mutt_format_s (char *dest,
ssize_t destlen,
+ const char *prefix, const char *s)
{
mutt_format_s_x (dest, destlen, prefix, s, 0);
}
{
mutt_format_s_x (dest, destlen, prefix, s, 0);
}
-void mutt_format_s_tree (char *dest,
-
size_t destlen,
const char *prefix, const char *s)
+void mutt_format_s_tree (char *dest,
ssize_t destlen,
+ const char *prefix, const char *s)
{
mutt_format_s_x (dest, destlen, prefix, s, 1);
}
{
mutt_format_s_x (dest, destlen, prefix, s, 1);
}
@@
-683,14
+686,14
@@
void mutt_paddstr (int n, const char *s)
{
wchar_t wc;
int w;
{
wchar_t wc;
int w;
- size_t k;
- size_t len = m_strlen(s);
+ s
s
ize_t k;
+ s
s
ize_t len = m_strlen(s);
mbstate_t mbstate;
p_clear(&mbstate, 1);
for (; len && (k = mbrtowc (&wc, s, len, &mbstate)); s += k, len -= k) {
mbstate_t mbstate;
p_clear(&mbstate, 1);
for (; len && (k = mbrtowc (&wc, s, len, &mbstate)); s += k, len -= k) {
- if (k ==
(size_t) (-1) || k == (size_t) (-2)
) {
- k = (k ==
(size_t) (-1)
) ? 1 : len;
+ if (k ==
-1 || k == -2
) {
+ k = (k ==
-1
) ? 1 : len;
wc = replacement_char ();
}
if (!IsWPrint (wc))
wc = replacement_char ();
}
if (!IsWPrint (wc))
@@
-716,7
+719,7
@@
int mutt_strwidth (const char *s)
{
wchar_t wc;
int w;
{
wchar_t wc;
int w;
- size_t k, n;
+ s
s
ize_t k, n;
mbstate_t mbstate;
if (!s)
mbstate_t mbstate;
if (!s)
@@
-726,8
+729,8
@@
int mutt_strwidth (const char *s)
p_clear(&mbstate, 1);
for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) {
p_clear(&mbstate, 1);
for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) {
- if (k ==
(size_t) (-1) || k == (size_t) (-2)
) {
- k = (k ==
(size_t) (-1)
) ? 1 : n;
+ if (k ==
-1 || k == -2
) {
+ k = (k ==
-1
) ? 1 : n;
wc = replacement_char ();
}
if (!IsWPrint (wc))
wc = replacement_char ();
}
if (!IsWPrint (wc))