* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
+#include <lib-lib/lib-lib.h>
+
+#include <termios.h>
+#ifdef HAVE_LANGINFO_YESEXPR
+#include <langinfo.h>
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-sys/unix.h>
+#include <lib-sys/mutt_signal.h>
#include "curses.h"
#include "menu.h"
#include "mutt.h"
#include "pager.h"
-#include "mbyte.h"
-
-#include "lib/debug.h"
-
-#include <wchar.h>
-#include <termios.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-
-#ifdef HAVE_LANGINFO_YESEXPR
-#include <langinfo.h>
-#endif
+#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.
*/
-size_t UngetCount = 0;
-static size_t UngetBufLen = 0;
+ssize_t UngetCount = 0;
+static ssize_t UngetBufLen = 0;
static event_t *KeyEvent;
void mutt_refresh (void)
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, ssize_t buflen,
int complete, int multiple, char ***files, int *numfiles)
{
int 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, ssize_t buflen, int flags)
{
int rc;
char cmd[LONG_STRING];
mutt_endwin (NULL);
- mutt_expand_file_fmt (cmd, sizeof (cmd), editor, data);
+ m_quotefile_fmt(cmd, sizeof (cmd), editor, data);
if (mutt_system (cmd) == -1)
mutt_error (_("Error running \"%s\"!"), cmd);
keypad (stdscr, TRUE);
char *yes = _("yes");
char *no = _("no");
char *answer_string;
- size_t answer_string_len;
+ ssize_t answer_string_len;
#ifdef HAVE_LANGINFO_YESEXPR
char *expr;
#ifdef HAVE_LANGINFO_YESEXPR
answer[0] = ch.ch;
- if (reyes_ok ? (regexec (&reyes, answer, 0, 0, 0) == 0) :
+ if (reyes_ok ? (regexec (&reyes, answer, 0, 0, 0) == 0) : tolower (ch.ch) == *yes)
#else
- if (
+ if (tolower (ch.ch) == *yes)
#endif
- (tolower (ch.ch) == *yes)) {
+ {
def = M_YES;
break;
}
(tolower (ch.ch) == *no)) {
def = M_NO;
break;
- }
- else {
+ } else {
BEEP ();
}
}
vsnprintf (Errorbuf, sizeof (Errorbuf), fmt, ap);
va_end (ap);
- debug_print (1, ("%s\n", Errorbuf));
mutt_format_string (TmpErrorbuf, sizeof (TmpErrorbuf),
0, COLS - 2, 0, 0, Errorbuf, sizeof (Errorbuf), 0);
snprintf (Errorbuf, sizeof (Errorbuf), "%s", TmpErrorbuf); /* overkill */
void _mutt_perror (const char *s, const char* filename, int line)
{
char *p = strerror (errno);
-
- debug_print (1, ("%s: %s (errno = %d)\n", s, p ? p : "unknown error", errno));
mutt_error ("%s: %s (errno = %d) from %s:%i", s, p ? p : _("unknown error"), errno, filename, line);
}
char cmd[STRING];
mutt_endwin (NULL);
- mutt_expand_file_fmt (cmd, sizeof (cmd), Pager, tempfile);
+ m_quotefile_fmt(cmd, sizeof (cmd), Pager, tempfile);
if (mutt_system (cmd) == -1) {
mutt_error (_("Error running \"%s\"!"), cmd);
rc = -1;
return rc;
}
-int _mutt_enter_fname (const char *prompt, char *buf, size_t blen,
+int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen,
int *redraw, int buffy, int multiple, char ***files,
int *numfiles)
{
{
char buf[MB_LEN_MAX * 2];
mbstate_t mbstate;
- size_t n1, n2;
+ ssize_t n1, n2;
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);
}
+ssize_t mutt_pretty_size(char *s, ssize_t len, ssize_t n)
+{
+ if (n == 0)
+ return m_strcpy(s, len, "0K");
+
+ if (n < 10189) /* 0.1K - 9.9K */
+ return snprintf(s, len, "%3.1fK", (n < 103) ? 0.1 : n / 1024.0);
+
+ if (n < 1023949) /* 10K - 999K */
+ /* 51 is magic which causes 10189/10240 to be rounded up to 10 */
+ return snprintf(s, len, "%ldK", (n + 51) / 1024);
+
+ if (n < 10433332) /* 1.0M - 9.9M */
+ return snprintf(s, len, "%3.1fM", n / 1048576.0);
+
+ /* (10433332 + 52428) / 1048576 = 10 */
+ return snprintf (s, len, "%ldM", (n + 52428) / 1048576);
+}
/*
* This formats a string, a bit like
for (; n && (k = mbrtowc (&wc, s, n, &mbstate1)); s += k, n -= k) {
if (k == -1 || k == -2) {
k = (k == -1) ? 1 : n;
- wc = replacement_char ();
+ wc = CharsetReplacement;
}
if (arboreal && wc < M_TREE_MAX)
w = 1; /* hack */
else {
- if (!IsWPrint (wc))
+ if (!iswprint(wc))
wc = '?';
w = wcwidth (wc);
}
* 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;
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);
}
-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);
}
{
wchar_t wc;
int w;
- size_t k;
- size_t len = m_strlen(s);
+ ssize_t k;
+ ssize_t len = m_strlen(s);
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;
- wc = replacement_char ();
+ if (k == -1 || k == -2) {
+ k = (k == -1) ? 1 : len;
+ wc = CharsetReplacement;
}
- if (!IsWPrint (wc))
+ if (!iswprint(wc))
wc = '?';
w = wcwidth (wc);
if (w >= 0) {
{
wchar_t wc;
int w;
- size_t k, n;
+ ssize_t k, n;
mbstate_t mbstate;
if (!s)
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;
- wc = replacement_char ();
+ if (k == -1 || k == -2) {
+ k = (k == -1) ? 1 : n;
+ wc = CharsetReplacement;
}
- if (!IsWPrint (wc))
+ if (!iswprint(wc))
wc = '?';
w += wcwidth (wc);
}
projects / apps / madmutt.git / blobdiff