#include <lib-lib/lib-lib.h>
#include <termios.h>
-#ifdef HAVE_LANGINFO_YESEXPR
#include <langinfo.h>
-#endif
+#include <lib-lua/lib-lua.h>
#include <lib-sys/unix.h>
#include <lib-sys/mutt_signal.h>
addstr (field);
mutt_refresh ();
getyx (stdscr, y, x);
- ret =
- _mutt_enter_string (buf, buflen, y, x, complete, multiple, files,
- numfiles, es);
- }
- while (ret == 1);
+ ret = _mutt_enter_string(buf, buflen, y, x, complete, multiple, files,
+ numfiles, es);
+ } while (ret == 1);
CLEARLINE (LINES - 1);
mutt_free_enter_state (&es);
CLEARLINE (LINES - 1);
}
-void mutt_edit_file (const char *editor, const char *data)
+void mutt_edit_file(const char *data)
{
char cmd[LONG_STRING];
mutt_endwin (NULL);
- mutt_expand_file_fmt (cmd, sizeof (cmd), editor, data);
+ m_quotefile_fmt(cmd, sizeof (cmd), MCore.editor, data);
if (mutt_system (cmd) == -1)
mutt_error (_("Error running \"%s\"!"), cmd);
keypad (stdscr, TRUE);
int mutt_yesorno (const char *msg, int def)
{
event_t ch;
- char *yes = _("yes");
- char *no = _("no");
+ const char *yes = _("yes");
+ const char *no = _("no");
char *answer_string;
ssize_t answer_string_len;
-
-#ifdef HAVE_LANGINFO_YESEXPR
char *expr;
regex_t reyes;
regex_t reno;
!regcomp (&reyes, expr, REG_NOSUB | REG_EXTENDED);
reno_ok = (expr = nl_langinfo (NOEXPR)) && expr[0] == '^' &&
!regcomp (&reno, expr, REG_NOSUB | REG_EXTENDED);
-#endif
CLEARLINE (LINES - 1);
break;
}
-#ifdef HAVE_LANGINFO_YESEXPR
answer[0] = ch.ch;
if (reyes_ok ? (regexec (&reyes, answer, 0, 0, 0) == 0) : tolower (ch.ch) == *yes)
-#else
- if (tolower (ch.ch) == *yes)
-#endif
{
def = M_YES;
break;
}
else if (
-#ifdef HAVE_LANGINFO_YESEXPR
reno_ok ? (regexec (&reno, answer, 0, 0, 0) == 0) :
-#endif
(tolower (ch.ch) == *no)) {
def = M_NO;
break;
}
}
-#ifdef HAVE_LANGINFO_YESEXPR
if (reyes_ok)
regfree (&reyes);
if (reno_ok)
regfree (&reno);
-#endif
if (def != -1) {
addstr ((char *) (def == M_YES ? yes : no));
}
void mutt_progress_bar (progress_t* progress, long pos) {
- char posstr[SHORT_STRING];
+ char posstr[STRING];
if (!pos) {
if (!NetInc)
return (ch);
}
-int mutt_do_pager (const char *banner,
- const char *tempfile, int do_color, pager_t * info)
-{
- int rc;
-
- if (!Pager || m_strcmp(Pager, "builtin") == 0)
- rc = mutt_pager (banner, tempfile, do_color, info);
- else {
- char cmd[STRING];
-
- mutt_endwin (NULL);
- mutt_expand_file_fmt (cmd, sizeof (cmd), Pager, tempfile);
- if (mutt_system (cmd) == -1) {
- mutt_error (_("Error running \"%s\"!"), cmd);
- rc = -1;
- }
- else
- rc = 0;
- mutt_unlink (tempfile);
- }
-
- return rc;
-}
-
int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen,
int *redraw, int buffy, int multiple, char ***files,
int *numfiles)
else {
char *pc = p_new(char, m_strlen(prompt) + 3);
- sprintf (pc, "%s: ", prompt); /* __SPRINTF_CHECKED__ */
+ sprintf(pc, "%s: ", prompt);
mutt_ungetch (ch.op ? 0 : ch.ch, ch.op ? ch.op : 0);
if (_mutt_get_field
(pc, buf, blen, (buffy ? M_EFILE : M_FILE) | M_CLEAR, multiple, files,
}
#endif
-int mutt_multi_choice (char *prompt, char *letters)
+int mutt_multi_choice (const char *prompt, const char *letters)
{
event_t ch;
int choice;
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
break;
min_width -= w;
max_width -= w;
- strncpy (p, scratch, k2);
+ m_strncpy(p, destlen, scratch, k2);
p += k2;
destlen -= k2;
}
addch (' ');
}
-/*
- * mutt_strwidth is like m_strlenexcept that it returns the width
- * refering to the number of characters cells.
- */
-
-int mutt_strwidth (const char *s)
-{
- wchar_t wc;
- int w;
- ssize_t k, n;
- mbstate_t mbstate;
-
- if (!s)
- return 0;
-
- n = m_strlen(s);
-
- p_clear(&mbstate, 1);
- 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 = CharsetReplacement;
- }
- if (!iswprint(wc))
- wc = '?';
- w += wcwidth (wc);
- }
- return w;
-}