X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=762cfbbd1d2f1a1ea17028f2a73698f99e3fc0e5;hp=0bbe168de2dbc87d0b58b039166626aae8169034;hb=70e9ad0d77eb1c2d7ef76afdba6825de75d5599f;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index 0bbe168..762cfbb 100644
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -11,30 +11,13 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <wchar.h>
-#include <wctype.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 <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>
 
@@ -162,7 +145,7 @@ void mutt_edit_file (const char *editor, 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), editor, data);
   if (mutt_system (cmd) == -1)
     mutt_error (_("Error running \"%s\"!"), cmd);
   keypad (stdscr, TRUE);
@@ -419,7 +402,7 @@ int mutt_do_pager (const char *banner,
     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;
@@ -567,6 +550,24 @@ int mutt_addwch (wchar_t wc)
     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
@@ -594,12 +595,12 @@ void mutt_format_string (char *dest, ssize_t destlen,
   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);
     }
@@ -689,9 +690,9 @@ void mutt_paddstr (int n, const char *s)
   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) {
@@ -726,9 +727,9 @@ int mutt_strwidth (const char *s)
   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);
   }