X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=edit.c;h=f5f93ac62a98634cccff996f585321ce9ecc9b0f;hp=88eeca369f6f1eac85fa3a8f73cbb2a8af449fc3;hb=1dc7032b59cc5b91d70076ed228bda8caf65a7f3;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258

diff --git a/edit.c b/edit.c
index 88eeca3..f5f93ac 100644
--- a/edit.c
+++ b/edit.c
@@ -13,12 +13,15 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
+#include "ascii.h"
+#include "enter.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #include <stdio.h>
@@ -33,7 +36,7 @@
  * SLcurses_waddnstr() can't take a "const char *", so this is only
  * declared "static" (sigh)
  */
-static char *EditorHelp = N_("\
+static const char *EditorHelp = N_("\
 ~~		insert a line begining with a single ~\n\
 ~b users	add users to the Bcc: field\n\
 ~c users	add users to the Cc: field\n\
@@ -54,7 +57,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 +71,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)
-      mem_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+      p_realloc(&buf, *bufmax += 25);
     buf[(*buflen)++] = str_dup (tmp);
   }
   if (buf && *bufmax == *buflen) {      /* Do not smash memory past buf */
-    mem_realloc (&buf, sizeof (char *) * (++*bufmax));
+    p_realloc(&buf, ++*bufmax);
   }
   if (buf)
     buf[*buflen] = NULL;
@@ -130,9 +133,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)
-    mem_free (&buf[buflen]);
+    p_delete(&buf[buflen]);
   if (buf)
-    mem_free (&buf);
+    p_delete(&buf);
 }
 
 static char **be_include_messages (char *msg, char **buf, int *bufmax,
@@ -154,7 +157,7 @@ static char **be_include_messages (char *msg, char **buf, int *bufmax,
       }
 
       if (*bufmax == *buflen)
-        mem_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+        p_realloc(&buf, *bufmax += 25);
       buf[(*buflen)++] = str_dup (tmp);
 
       bytes = Context->hdrs[n]->content->length;
@@ -168,7 +171,7 @@ static char **be_include_messages (char *msg, char **buf, int *bufmax,
                            pfx);
 
       if (*bufmax == *buflen)
-        mem_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+        p_realloc(&buf, *bufmax += 25);
       buf[(*buflen)++] = str_dup ("\n");
     }
     else
@@ -390,7 +393,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;
-          mem_free (&buf[buflen]);
+          p_delete(&buf[buflen]);
           buf[buflen] = NULL;
           continue;
         }
@@ -401,7 +404,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
       case 'e':
       case 'v':
         if (be_barf_file (path, buf, buflen) == 0) {
-          char *tag, *err;
+          const char *tag, *err;
 
           be_free_memory (buf, buflen);
           buf = NULL;
@@ -438,7 +441,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
     else {
       str_cat (tmp, sizeof (tmp), "\n");
       if (buflen == bufmax)
-        mem_realloc (&buf, sizeof (char *) * (bufmax += 25));
+        p_realloc(&buf, bufmax += 25);
       buf[buflen++] = str_dup (tmp[1] == '~' ? tmp + 1 : tmp);
     }