X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=sbr%2Ffolder_read.c;h=f642ed39b02f24213088964ec64ee776022e9b91;hb=e87123959d15f3b190494dffdd8bce335c137874;hp=8e3a3ffa7e6648cbc3c917a2fc5aef867e675214;hpb=81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2;p=mmh

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index 8e3a3ff..f642ed3 100644
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -2,8 +2,6 @@
 /*
  * folder_read.c -- initialize folder structure and read folder
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -59,7 +57,7 @@ folder_read (char *name)
 
     if (access (name, W_OK) == -1)
 	set_readonly (mp);
-    prefix_len = strlen(BACKUP_PREFIX);
+    prefix_len = strlen(backup_prefix);
 
     /*
      * Allocate a temporary place to record the
@@ -76,10 +74,7 @@ folder_read (char *name)
 	     */
 	    if (mp->nummsg >= len) {
 		len += NUMMSGS;
-		if (!(mi = (int *) realloc (mi,
-			(size_t) (len * sizeof(*mi))))) {
-		    adios (NULL, "unable to allocate storage");
-		}
+		mi = (int *) mh_xrealloc (mi, (size_t) (len * sizeof(*mi)));
 	    }
 
 	    /* Check if this is the first message we've seen */
@@ -111,11 +106,11 @@ folder_read (char *name)
 
 		default: 
 		    /* skip any files beginning with backup prefix */
-		    if (!strncmp (dp->d_name, BACKUP_PREFIX, prefix_len))
+		    if (!strncmp (dp->d_name, backup_prefix, prefix_len))
 			continue;
 
-		    /* skip the LINK file */
-		    if (!strcmp (dp->d_name, LINK))
+		    /* skip the altmsg link file */
+		    if (!strcmp (dp->d_name, altmsglink))
 			continue;
 
 		    /* indicate that there are other files in folder */