#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-lib/debug.h>
+#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
#include <lib-sys/mutt_signal.h>
#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);
}
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);
}
for (; len && (k = mbrtowc (&wc, s, len, &mbstate)); s += k, len -= k) {
if (k == -1 || k == -2) {
k = (k == -1) ? 1 : len;
- wc = replacement_char ();
+ wc = CharsetReplacement;
}
- if (!IsWPrint (wc))
+ if (!iswprint(wc))
wc = '?';
w = wcwidth (wc);
if (w >= 0) {
for (w = 0; n && (k = mbrtowc (&wc, s, n, &mbstate)); s += k, n -= k) {
if (k == -1 || k == -2) {
k = (k == -1) ? 1 : n;
- wc = replacement_char ();
+ wc = CharsetReplacement;
}
- if (!IsWPrint (wc))
+ if (!iswprint(wc))
wc = '?';
w += wcwidth (wc);
}