X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_lib.c;h=9f77340eca6f3f1cd59963019fa16b04810393c2;hp=b779a923afb376bb3ee240ef58f0ef4541e0e510;hb=3ea753c6005292b3e3153ac7e1f7b7d2363955c9;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/curs_lib.c b/curs_lib.c
index b779a92..9f77340 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -3,6 +3,9 @@
  * Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 2004 g10 Code GmbH
  *
+ * Parts were written/modified by:
+ * Nico Golde <nico@ngolde.de>
+ *
  * This file is part of mutt-ng, see http://www.muttng.org/.
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
@@ -18,6 +21,11 @@
 #include "pager.h"
 #include "mbyte.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/debug.h"
+
 #include <termios.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -210,7 +218,7 @@ int mutt_yesorno (const char *msg, int def)
   answer_string = safe_malloc (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 = mutt_strlen (answer_string);
   printw ("%.*s%s", COLS - answer_string_len, msg, answer_string);
   FREE (&answer_string);
 
@@ -230,7 +238,7 @@ int mutt_yesorno (const char *msg, int def)
 #else
     if (
 #endif
-         (tolower (ch.ch) == 'y')) {
+         (tolower (ch.ch) == *yes)) {
       def = M_YES;
       break;
     }
@@ -238,7 +246,7 @@ int mutt_yesorno (const char *msg, int def)
 #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;
     }
@@ -286,7 +294,7 @@ void mutt_curses_error (const char *fmt, ...)
   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 */
@@ -354,13 +362,12 @@ void mutt_endwin (const char *msg)
   }
 }
 
-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)