X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=c99a635734a1e47c94ff2e26ef05bcd3b189cff3;hp=de14e59c034e59bb27c57d933102b83d2bf22632;hb=418e55040ec4a95698a8f1f128f3afbfd6aba48b;hpb=230399f9632c37b66c1c117a17e8327eae6b3235

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index de14e59..c99a635 100644
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -11,27 +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/lib-lib.h>
-
 #include <lib-sys/unix.h>
 #include <lib-sys/mutt_signal.h>
 
@@ -125,11 +111,9 @@ int _mutt_get_field ( const char *field, char *buf, ssize_t buflen,
     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);
 
@@ -159,7 +143,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);
@@ -293,7 +277,7 @@ void mutt_curses_error (const char *fmt, ...)
 }
 
 void mutt_progress_bar (progress_t* progress, long pos) {
-  char posstr[SHORT_STRING];
+  char posstr[STRING];
 
   if (!pos) {
     if (!NetInc)
@@ -416,7 +400,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;
@@ -457,7 +441,7 @@ int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen,
   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,
@@ -564,6 +548,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
@@ -605,7 +607,7 @@ void mutt_format_string (char *dest, ssize_t destlen,
         break;
       min_width -= w;
       max_width -= w;
-      strncpy (p, scratch, k2);
+      m_strncpy(p, destlen, scratch, k2);
       p += k2;
       destlen -= k2;
     }
@@ -702,32 +704,3 @@ void mutt_paddstr (int n, const char *s)
     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;
-}