we're grownups now. don't care about stupid OS'es that don't know what an

[apps/madmutt.git] / edit.c

diff --git a/edit.c b/edit.c
index c11cad8..966d1be 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -14,6 +14,8 @@
 #endif
 
 #include "mutt.h"
+#include "ascii.h"
+#include "enter.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 
@@ -54,7 +56,7 @@ static char *EditorHelp = N_("\
 .              on a line by itself ends input\n");
 
 static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
-                             int offset, int bytes, int prefix)
+                             off_t offset, int bytes, int prefix)
 {
   char tmp[HUGE_STRING];
   char *p = tmp;
@@ -68,17 +70,17 @@ static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
     tmplen = sizeof (tmp) - tmplen;
   }
 
-  fseek (f, offset, 0);
+  fseeko (f, offset, 0);
   while (bytes > 0) {
     if (fgets (p, tmplen - 1, f) == NULL)
       break;
     bytes -= str_len (p);
     if (*bufmax == *buflen)
-      safe_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+      mem_realloc (&buf, sizeof (char *) * (*bufmax += 25));
     buf[(*buflen)++] = str_dup (tmp);
   }
   if (buf && *bufmax == *buflen) {      /* Do not smash memory past buf */
-    safe_realloc (&buf, sizeof (char *) * (++*bufmax));
+    mem_realloc (&buf, sizeof (char *) * (++*bufmax));
   }
   if (buf)
     buf[*buflen] = NULL;
@@ -130,9 +132,9 @@ static int be_barf_file (const char *path, char **buf, int buflen)
 static void be_free_memory (char **buf, int buflen)
 {
   while (buflen-- > 0)
-    FREE (&buf[buflen]);
+    mem_free (&buf[buflen]);
   if (buf)
-    FREE (&buf);
+    mem_free (&buf);
 }
 
 static char **be_include_messages (char *msg, char **buf, int *bufmax,
@@ -154,7 +156,7 @@ static char **be_include_messages (char *msg, char **buf, int *bufmax,
       }
 
       if (*bufmax == *buflen)
-        safe_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+        mem_realloc (&buf, sizeof (char *) * (*bufmax += 25));
       buf[(*buflen)++] = str_dup (tmp);
 
       bytes = Context->hdrs[n]->content->length;
@@ -168,7 +170,7 @@ static char **be_include_messages (char *msg, char **buf, int *bufmax,
                            pfx);
 
       if (*bufmax == *buflen)
-        safe_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+        mem_realloc (&buf, sizeof (char *) * (*bufmax += 25));
       buf[(*buflen)++] = str_dup ("\n");
     }
     else
@@ -390,7 +392,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
           buflen--;
           strfcpy (tmp, buf[buflen], sizeof (tmp));
           tmp[str_len (tmp) - 1] = 0;
-          FREE (&buf[buflen]);
+          mem_free (&buf[buflen]);
           buf[buflen] = NULL;
           continue;
         }
@@ -438,7 +440,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
     else {
       str_cat (tmp, sizeof (tmp), "\n");
       if (buflen == bufmax)
-        safe_realloc (&buf, sizeof (char *) * (bufmax += 25));
+        mem_realloc (&buf, sizeof (char *) * (bufmax += 25));
       buf[buflen++] = str_dup (tmp[1] == '~' ? tmp + 1 : tmp);
     }