Merge branch 'fix_compilation_errors'

- Rename malloc_message() because it was causing a compilation error on
  FreeBSD.
- Use correct type as a return from gzdopen().
- Memory allocation, header file includes, etc.

src/info.c

@@ -30,7 +30,7 @@ void
 print_wrap (char *str, int len, int *n)
 {
   *n += len;
-  fprintf (stdout, str);
+  fprintf (stdout, "%s", str);
   if (*n >= 50)
     {
       fprintf (stdout, "\n");

src/maildir.c

@@ -122,7 +122,7 @@ maildir_read_message (maildir_t *mdp)
   static FILE *fp;
   static int s;
 
-  message = malloc_message ();
+  message = allocate_message ();
 
   for(;;)
     {

src/mbox.c

@@ -237,7 +237,7 @@ mbox_read_message (mbox_t * mp)
   char buffer[BUFSIZ];
   message_t *message;
 
-  message = malloc_message ();
+  message = allocate_message ();
 
   s = strlen (mp->postmark_cache);
   message->headers =

src/mh.c

@@ -87,7 +87,7 @@ message_t *mh_read_message (DIR *dp)
   char buffer[BUFSIZ], *filename;
   FILE *fp;
 
-  message = malloc_message ();
+  message = allocate_message ();
 
   filename = NULL;
 

src/misc.c

@@ -139,7 +139,7 @@ char * parse_return_path(char *rpath)
 }
 /* }}} */
 
-void * malloc_message (void)
+void * allocate_message (void)
 {
   message_t *message;
 

src/misc.h

@@ -29,7 +29,7 @@ format_t folder_format (const char *name);
 lockmethod_t lock_method (const char *name);
 /* time_t parse_date(char *datestr); */
 char * parse_return_path(char *rpath);
-void * malloc_message (void);
+void * allocate_message (void);
 void postmark_print (message_t *msg);
 void set_default_options (void);
 void get_runtime_options (int *argc, char **argv, struct option *long_options);

src/re.c

@@ -26,6 +26,7 @@
 #endif /* HAVE_LIBPCRE */
 #include "mboxgrep.h"
 #include "message.h"
+#include "wrap.h" /* xcalloc() et cetera */
 
 #ifdef HAVE_LIBPCRE
 void
@@ -82,6 +83,7 @@ regex_init (void)
   if (config.extended)
     flag2 = REG_EXTENDED;
 
+  config.posix_pattern = (regex_t *) xmalloc (sizeof (regex_t));
   errcode = regcomp ((regex_t *) config.posix_pattern, config.regex_s, 
 		     (flag1 | flag2 | REG_NEWLINE ));
   if (0 != errcode)

src/wrap.c

@@ -42,6 +42,9 @@
 #ifdef HAVE_LIBZ
 #include <zlib.h>
 #endif /* HAVE_LIBZ */
+#ifdef HAVE_LIBBZ2
+#include <bzlib.h>
+#endif /* HAVE_LIBBZ2 */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -108,9 +111,9 @@ FILE *m_fdopen (int fildes, const char *mode)
 
 #ifdef HAVE_LIBZ
 
-gzFile *m_gzdopen (int fildes, const char *mode)
+gzFile m_gzdopen (int fildes, const char *mode)
 {
-  gzFile *blah;
+  gzFile blah;
 
   blah = gzdopen (fildes, mode);
   if (blah == NULL)

src/wrap.h

@@ -56,7 +56,7 @@ int m_open (const char *pathname, int flags, mode_t mode);
 FILE *m_fopen (const char *path, const char *mode);
 FILE *m_fdopen (int fildes, const char *mode);
 #ifdef HAVE_LIBZ
-gzFile *m_gzdopen (int fildes, const char *mode);
+gzFile m_gzdopen (int fildes, const char *mode);
 void gzwrite_loop (void *fp, char *str);
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2