X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=28f88ace63b39b0e3597dfb581b24a41aa07acf6;hp=f4718fe1b5be797e8d9c938837634784b92db5eb;hb=c8ceef3ed6424dcb5a6ec835e7d8d9cc00595372;hpb=96d53ff49c308769efbf708e1e65819077cb7af6

diff --git a/buffy.c b/buffy.c
index f4718fe..28f88ac 100644
--- a/buffy.c
+++ b/buffy.c
@@ -16,6 +16,7 @@
 
 #include "mutt.h"
 #include "buffy.h"
+#include "buffer.h"
 #include "mx.h"
 #include "mh.h"
 #include "sidebar.h"
@@ -51,16 +52,16 @@ static short BuffyNotify = 0;   /* # of unnotified new boxes */
 /* Find the last message in the file. 
  * upon success return 0. If no message found - return -1 */
 
-static int fseek_last_message (FILE * f)
+static int fseeko_last_message (FILE * f)
 {
-  long int pos;
+  LOFF_T pos;
   char buffer[BUFSIZ + 9];      /* 7 for "\n\nFrom " */
   int bytes_read;
   int i;                        /* Index into `buffer' for scanning.  */
 
   memset (buffer, 0, sizeof (buffer));
-  fseek (f, 0, SEEK_END);
-  pos = ftell (f);
+  fseeko (f, 0, SEEK_END);
+  pos = ftello (f);
 
   /* Set `bytes_read' to the size of the last, probably partial, buffer; 0 <
    * `bytes_read' <= `BUFSIZ'.  */
@@ -71,22 +72,22 @@ static int fseek_last_message (FILE * f)
    * reads will be on block boundaries, which might increase efficiency.  */
   while ((pos -= bytes_read) >= 0) {
     /* we save in the buffer at the end the first 7 chars from the last read */
-    strncpy (buffer + BUFSIZ, buffer, 5 + 2);   /* 2 == 2 * mutt_strlen(CRLF) */
-    fseek (f, pos, SEEK_SET);
+    strncpy (buffer + BUFSIZ, buffer, 5 + 2);   /* 2 == 2 * str_len(CRLF) */
+    fseeko (f, pos, SEEK_SET);
     bytes_read = fread (buffer, sizeof (char), bytes_read, f);
     if (bytes_read == -1)
       return -1;
     for (i = bytes_read; --i >= 0;)
-      if (!safe_strncmp (buffer + i, "\n\nFrom ", mutt_strlen ("\n\nFrom "))) { /* found it - go to the beginning of the From */
-        fseek (f, pos + i + 2, SEEK_SET);
+      if (!str_ncmp (buffer + i, "\n\nFrom ", str_len ("\n\nFrom "))) { /* found it - go to the beginning of the From */
+        fseeko (f, pos + i + 2, SEEK_SET);
         return 0;
       }
     bytes_read = BUFSIZ;
   }
 
   /* here we are at the beginning of the file */
-  if (!safe_strncmp ("From ", buffer, 5)) {
-    fseek (f, 0, 0);
+  if (!str_ncmp ("From ", buffer, 5)) {
+    fseeko (f, 0, 0);
     return (0);
   }
 
@@ -100,7 +101,7 @@ static int test_last_status_new (FILE * f)
   ENVELOPE *tmp_envelope;
   int result = 0;
 
-  if (fseek_last_message (f) == -1)
+  if (fseeko_last_message (f) == -1)
     return (0);
 
   hdr = mutt_new_header ();
@@ -168,9 +169,9 @@ void buffy_update_mailbox (BUFFY * b)
 #endif
 
 /* func to free buffy for list_del() */
-static void buffy_free (void** p) {
-  FREE(&(*((BUFFY**) p))->path);
-  FREE(p);
+static void buffy_free (BUFFY** p) {
+  mem_free(&(*p)->path);
+  mem_free(p);
 }
 
 int buffy_lookup (const char* path) {
@@ -198,8 +199,8 @@ int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
     mutt_extract_token (path, s, 0);
     strfcpy (buf, path->data, sizeof (buf));
 
-    if (data == M_UNMAILBOXES && str_eq (buf, "*") == 0) {
-      list_del (&Incoming, buffy_free);
+    if (data == M_UNMAILBOXES && str_eq (buf, "*")) {
+      list_del (&Incoming, (list_del_t*) buffy_free);
       return 0;
     }
 
@@ -219,8 +220,8 @@ int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
     }
 
     if (i < 0) {
-      tmp = safe_calloc (1, sizeof (BUFFY));
-      tmp->path = safe_strdup (buf);
+      tmp = mem_calloc (1, sizeof (BUFFY));
+      tmp->path = str_dup (buf);
       tmp->magic = 0;
       list_push_back (&Incoming, tmp);
       i = Incoming->length-1;
@@ -505,13 +506,10 @@ int buffy_list (void)
   int have_unnotified = BuffyNotify;
   int i = 0;
 
-  if (option (OPTFORCEBUFFYCHECK))
-    buffy_check (1);
-
   pos = 0;
   first = 1;
   buffylist[0] = 0;
-  pos += mutt_strlen (strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
+  pos += str_len (strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */
   if (Incoming) {
     for (i = 0; i < Incoming->length; i++) {
       tmp = (BUFFY*) Incoming->data[i];
@@ -522,19 +520,19 @@ int buffy_list (void)
       strfcpy (path, tmp->path, sizeof (path));
       mutt_pretty_mailbox (path);
 
-      if (!first && pos + mutt_strlen (path) >= COLS - 7)
+      if (!first && pos + str_len (path) >= COLS - 7)
         break;
 
       if (!first)
-        pos += mutt_strlen (strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos));    /* __STRNCAT_CHECKED__ */
+        pos += str_len (strncat (buffylist + pos, ", ", sizeof (buffylist) - 1 - pos));    /* __STRNCAT_CHECKED__ */
 
       /* Prepend an asterisk to mailboxes not already notified */
       if (!tmp->notified) {
-        /* pos += mutt_strlen (strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos));  __STRNCAT_CHECKED__ */
+        /* pos += str_len (strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos));  __STRNCAT_CHECKED__ */
         tmp->notified = 1;
         BuffyNotify--;
       }
-      pos += mutt_strlen (strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos));      /* __STRNCAT_CHECKED__ */
+      pos += str_len (strncat (buffylist + pos, path, sizeof (buffylist) - 1 - pos));      /* __STRNCAT_CHECKED__ */
       first = 0;
     }
   }