the “I found my first real bug” commit.

[apps/madmutt.git] / curs_lib.c

diff --git a/curs_lib.c b/curs_lib.c
index 6482b62..e5f9480 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -16,6 +16,7 @@
 #endif
 
 #include "mutt.h"
+#include "enter.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "pager.h"
@@ -113,7 +114,7 @@ event_t mutt_getch (void)
   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;
@@ -155,19 +156,6 @@ void mutt_clear_error (void)
     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];
@@ -176,7 +164,6 @@ void mutt_edit_file (const char *editor, const char *data)
   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);
 }
@@ -213,12 +200,12 @@ int mutt_yesorno (const char *msg, int def)
    * ensure there is enough room for the answer and truncate the question
    * to fit.
    */
-  answer_string = safe_malloc (COLS + 1);
+  answer_string = mem_malloc (COLS + 1);
   snprintf (answer_string, COLS + 1, " ([%s]/%s): ", def == M_YES ? yes : no,
             def == M_YES ? no : yes);
   answer_string_len = str_len (answer_string);
   printw ("%.*s%s", COLS - answer_string_len, msg, answer_string);
-  FREE (&answer_string);
+  mem_free (&answer_string);
 
   FOREVER {
     mutt_refresh ();
@@ -275,7 +262,7 @@ void mutt_query_exit (void)
   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 ();
@@ -309,6 +296,36 @@ void mutt_curses_error (const char *fmt, ...)
   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];
@@ -446,7 +463,7 @@ int _mutt_enter_fname (const char *prompt, char *buf, size_t blen,
     *redraw = REDRAW_FULL;
   }
   else {
-    char *pc = safe_malloc (str_len (prompt) + 3);
+    char *pc = mem_malloc (str_len (prompt) + 3);
 
     sprintf (pc, "%s: ", prompt);       /* __SPRINTF_CHECKED__ */
     mutt_ungetch (ch.op ? 0 : ch.ch, ch.op ? ch.op : 0);
@@ -456,7 +473,7 @@ int _mutt_enter_fname (const char *prompt, char *buf, size_t blen,
         != 0)
       buf[0] = 0;
     MAYBE_REDRAW (*redraw);
-    FREE (&pc);
+    mem_free (&pc);
   }
 
   return 0;
@@ -470,7 +487,7 @@ void mutt_ungetch (int ch, int op)
   tmp.op = op;
 
   if (UngetCount >= UngetBufLen)
-    safe_realloc (&KeyEvent, (UngetBufLen += 128) * sizeof (event_t));
+    mem_realloc (&KeyEvent, (UngetBufLen += 128) * sizeof (event_t));
 
   KeyEvent[UngetCount++] = tmp;
 }