# include "config.h"
#endif
+#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_menu.h"
#include "mutt_curses.h"
#include "pager.h"
#include "mbyte.h"
+#include "lib/debug.h"
+
+#include <wchar.h>
#include <termios.h>
#include <sys/types.h>
#include <fcntl.h>
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, size_t buflen,
int complete, int multiple, char ***files, int *numfiles)
{
int ret;
return (ret);
}
-int mutt_get_password (char *msg, char *buf, size_t buflen)
+int mutt_get_field_unbuffered (char *msg, char *buf, size_t buflen, int flags)
{
int rc;
- CLEARLINE (LINES - 1);
- addstr (msg);
set_option (OPTUNBUFFEREDINPUT);
- rc = mutt_enter_string (buf, buflen, LINES - 1, mutt_strlen (msg), M_PASS);
+ rc = mutt_get_field (msg, buf, buflen, flags);
unset_option (OPTUNBUFFEREDINPUT);
- CLEARLINE (LINES - 1);
+
return (rc);
}
CLEARLINE (LINES - 1);
}
-static void fix_end_of_file (const char *data)
-{
- FILE *fp;
- int c;
-
- if ((fp = safe_fopen (data, "a+")) == NULL)
- return;
- fseek (fp, -1, SEEK_END);
- if ((c = fgetc (fp)) != '\n')
- fputc ('\n', fp);
- safe_fclose (&fp);
-}
-
void mutt_edit_file (const char *editor, const char *data)
{
char cmd[LONG_STRING];
mutt_expand_file_fmt (cmd, sizeof (cmd), editor, data);
if (mutt_system (cmd) == -1)
mutt_error (_("Error running \"%s\"!"), cmd);
- fix_end_of_file (data);
keypad (stdscr, TRUE);
clearok (stdscr, TRUE);
}
* ensure there is enough room for the answer and truncate the question
* to fit.
*/
- answer_string = safe_malloc (COLS + 1);
+ answer_string = p_new(char, 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 = m_strlen(answer_string);
printw ("%.*s%s", COLS - answer_string_len, msg, answer_string);
- FREE (&answer_string);
+ p_delete(&answer_string);
- FOREVER {
+ for (;;) {
mutt_refresh ();
ch = mutt_getch ();
if (CI_is_return (ch.ch))
#else
if (
#endif
- (tolower (ch.ch) == 'y')) {
+ (tolower (ch.ch) == *yes)) {
def = M_YES;
break;
}
#ifdef HAVE_LANGINFO_YESEXPR
reno_ok ? (regexec (&reno, answer, 0, 0, 0) == 0) :
#endif
- (tolower (ch.ch) == 'n')) {
+ (tolower (ch.ch) == *no)) {
def = M_NO;
break;
}
if (Timeout)
timeout (-1); /* restore blocking operation */
if (mutt_yesorno (_("Exit Mutt-ng?"), M_YES) == M_YES) {
- endwin ();
+ mutt_endwin (NULL);
exit (1);
}
mutt_clear_error ();
vsnprintf (Errorbuf, sizeof (Errorbuf), fmt, ap);
va_end (ap);
- dprint (1, (debugfile, "%s\n", Errorbuf));
+ 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 */
set_option (OPTMSGERR);
}
+#ifdef USE_SOCKET
+void mutt_progress_bar (progress_t* progress, long pos) {
+ char posstr[SHORT_STRING];
+
+ if (!pos) {
+ if (!NetInc)
+ mutt_message (progress->msg);
+ else {
+ if (progress->size)
+ mutt_pretty_size (progress->sizestr, sizeof (progress->sizestr),
+ progress->size);
+ progress->pos = 0;
+ }
+ }
+
+ if (!NetInc)
+ return;
+
+ if (pos >= progress->pos + (NetInc << 10)) {
+ progress->pos = pos;
+ pos = pos / (NetInc << 10) * (NetInc << 10);
+ mutt_pretty_size (posstr, sizeof (posstr), pos);
+ if (progress->size)
+ mutt_message ("%s %s/%s", progress->msg, posstr, progress->sizestr);
+ else
+ mutt_message ("%s %s", progress->msg, posstr);
+ }
+}
+#endif
+
void mutt_curses_message (const char *fmt, ...)
{
char TmpErrorbuf[STRING];
}
}
-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));
- mutt_error ("%s: %s (errno = %d)", s, p ? p : _("unknown error"), 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);
}
int mutt_any_key_to_continue (const char *s)
{
int rc;
- if (!Pager || mutt_strcmp (Pager, "builtin") == 0)
+ if (!Pager || m_strcmp(Pager, "builtin") == 0)
rc = mutt_pager (banner, tempfile, do_color, info);
else {
char cmd[STRING];
*redraw = REDRAW_FULL;
}
else {
- char *pc = safe_malloc (mutt_strlen (prompt) + 3);
+ char *pc = p_new(char, m_strlen(prompt) + 3);
sprintf (pc, "%s: ", prompt); /* __SPRINTF_CHECKED__ */
mutt_ungetch (ch.op ? 0 : ch.ch, ch.op ? ch.op : 0);
!= 0)
buf[0] = 0;
MAYBE_REDRAW (*redraw);
- FREE (&pc);
+ p_delete(&pc);
}
return 0;
tmp.op = op;
if (UngetCount >= UngetBufLen)
- safe_realloc (&KeyEvent, (UngetBufLen += 128) * sizeof (event_t));
+ p_realloc(&KeyEvent, UngetBufLen += 128);
KeyEvent[UngetCount++] = tmp;
}
mvaddstr (LINES - 1, 0, prompt);
clrtoeol ();
- FOREVER {
+ for (;;) {
mutt_refresh ();
ch = mutt_getch ();
if (ch.ch == -1 || CI_is_return (ch.ch)) {
}
else if (ch.ch <= '9' && ch.ch > '0') {
choice = ch.ch - '0';
- if (choice <= mutt_strlen (letters))
+ if (choice <= m_strlen(letters))
break;
}
}
mbstate_t mbstate;
size_t n1, n2;
- memset (&mbstate, 0, sizeof (mbstate));
+ p_clear(&mbstate, 1);
if ((n1 = wcrtomb (buf, wc, &mbstate)) == (size_t) (-1) ||
(n2 = wcrtomb (buf + n1, 0, &mbstate)) == (size_t) (-1))
return -1; /* ERR */
*/
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)
{
char scratch[MB_LEN_MAX];
mbstate_t mbstate1, mbstate2;
- memset (&mbstate1, 0, sizeof (mbstate1));
- memset (&mbstate2, 0, sizeof (mbstate2));
+ p_clear(&mbstate1, 1);
+ p_clear(&mbstate2, 1);
--destlen;
p = dest;
for (; n && (k = mbrtowc (&wc, s, n, &mbstate1)); s += k, n -= k) {
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) {
}
mutt_format_string (dest, destlen, min_width, max_width,
- right_justify, ' ', s, mutt_strlen (s), arboreal);
+ right_justify, ' ', s, m_strlen(s), arboreal);
}
void mutt_format_s (char *dest,
wchar_t wc;
int w;
size_t k;
- size_t len = mutt_strlen (s);
+ size_t len = m_strlen(s);
mbstate_t mbstate;
- memset (&mbstate, 0, sizeof (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;
}
/*
- * mutt_strwidth is like mutt_strlen except that it returns the width
+ * mutt_strwidth is like m_strlenexcept that it returns the width
* refering to the number of characters cells.
*/
if (!s)
return 0;
- n = mutt_strlen (s);
+ n = m_strlen(s);
- memset (&mbstate, 0, sizeof (mbstate));
+ 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;
projects / apps / madmutt.git / blobdiff