--- a/lib-src/b2m.c	Mon Aug 13 09:34:16 2007 +0200
+++ b/lib-src/b2m.c	Mon Aug 13 09:34:46 2007 +0200
@@ -13,14 +13,11 @@
  *   Ed Wilkinson
  *   E.Wilkinson@massey.ac.nz
  *   Mon Nov 7 15:54:06 PDT 1988
- *
  */
 
-/* Synched up with: FSF 19.28. */
+/* Made conformant to the GNU coding standards January, 1995
+   by Francesco Potorti` <pot@cnuce.cnr.it>. */
 
-/* Serious bug: This program uses `gets', which is intrinsically
-   unreliable--long lines will cause crashes.
-   Someone should fix this program not to use `gets'.  */
 #include <stdio.h>
 #include <time.h>
 #include <sys/types.h>
@@ -28,111 +25,243 @@
 #include <fcntl.h>
 #endif
 
-#include <../src/config.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+/* On some systems, Emacs defines static as nothing for the sake
+   of unexec.  We don't want that here since we don't use unexec. */
+#undef static
+#endif
+
+#undef TRUE
+#define TRUE	1
+#undef FALSE
+#define FALSE	0
+
+/* Exit codes for success and failure.  */
+#ifdef VMS
+#define	GOOD	1
+#define BAD	0
+#else
+#define	GOOD	0
+#define	BAD	1
+#endif
+
+#define streq(s,t)	(strcmp (s, t) == 0)
+#define strneq(s,t,n)	(strncmp (s, t, n) == 0)
 
-#if __STDC__ || defined(STDC_HEADERS)
-# include <stdlib.h>
-# include <string.h>
-#else /* ! (__STDC__ || defined(STDC_HEADERS)) */
-# ifdef USG
-#  include <string.h>
-# else
-#  include <strings.h>
-#  endif
+typedef int logical;
 
-/* BSD's strings.h does not declare the type of strtok.  */
-extern char *strtok ();
-#endif /* ! (__STDC__ || defined(STDC_HEADERS)) */
+/*
+ * A `struct linebuffer' is a structure which holds a line of text.
+ * `readline' reads a line from a stream into a linebuffer and works
+ * regardless of the length of the line.
+ */
+struct linebuffer
+{
+  long size;
+  char *buffer;
+};
+
+extern char *strtok();
+
+long *xmalloc (), *xrealloc ();
+char *concat ();
+long readline ();
+void fatal ();
+
+/*
+ * xnew -- allocate storage.  SYNOPSIS: Type *xnew (int n, Type);
+ */
+#define xnew(n, Type)	((Type *) xmalloc ((n) * sizeof (Type)))
 
 
-#ifndef TRUE
-#define TRUE  (1)
-#endif
-#ifndef FALSE
-#define FALSE (0)
-#endif
+
+char *progname;
 
-int header = FALSE, printing;
-time_t ltoday;
-char from[256], labels[256], data[256], *p, *today;
+main (argc, argv)
+     int argc;
+     char **argv;
+{
+  logical labels_saved, printing, header;
+  time_t ltoday;
+  char *labels, *p, *today;
+  struct linebuffer data;
 
-void
-main (int argc, char **argv)
-{
 #ifdef MSDOS
   _fmode = O_BINARY;		/* all of files are treated as binary files */
+#if __DJGPP__ > 1
+  if (!isatty (fileno (stdout)))
+    setmode (fileno (stdout), O_BINARY);
+  if (!isatty (fileno (stdin)))
+    setmode (fileno (stdin), O_BINARY);
+#else /* not __DJGPP__ > 1 */
   (stdout)->_flag &= ~_IOTEXT;
   (stdin)->_flag &= ~_IOTEXT;
+#endif /* not __DJGPP__ > 1 */
 #endif
-  if ((argc >= 2) && strcmp (argv[1], "--help") == 0)
+  progname = argv[0];
+
+  if (argc != 1)
     {
-      fprintf (stderr, "%s - a filter for Babyl -> Unix mail files\n", argv[0]);
-      fprintf (stderr, "Usage: %s < babylmailbox > unixmailbox\n", argv[0]);
-      exit (0);
+      fprintf (stderr, "Usage: %s <babylmailbox >unixmailbox\n", progname);
+      exit (GOOD);
     }
-
+  labels_saved = printing = header = FALSE;
   ltoday = time (0);
   today = ctime (&ltoday);
+  data.size = 200;
+  data.buffer = xnew (200, char);
 
-  /* BUG!  Must not use gets in a reliable program!  */
-  if (gets (data))
+  if (readline (&data, stdin) == 0
+      || !strneq (data.buffer, "BABYL OPTIONS:", 14))
+    fatal ("standard input is not a Babyl mailfile.");
+
+  while (readline (&data, stdin) > 0)
     {
-      if (strncmp (data, "BABYL OPTIONS:", 14))
-	{
-	  fprintf (stderr, "%s: not a Babyl mailfile!\n", argv[0]);
-	  exit (-1);
-	}
-      else
-	printing = FALSE;
-    }
-  else
-    exit (-1);
-  if (printing)
-    puts (data);
-
-  while (gets (data))
-    {
-
-#if 0
-      /* What was this for?  Does somebody have something against blank
-	 lines?  */
-      if (!strcmp (data, ""))
-	exit (0);
-#endif
-
-      if (!strcmp (data, "*** EOOH ***") && !printing)
+      if (streq (data.buffer, "*** EOOH ***") && !printing)
 	{
 	  printing = header = TRUE;
-	  printf ("From %s %s", argv[0], today);
+	  printf ("From \"Babyl to mail by %s\" %s", progname, today);
 	  continue;
 	}
 
-      if (!strcmp (data, "\037\f"))
+      if (data.buffer[0] == '\037')
 	{
-	  /* save labels */
-	  gets (data);
-	  p = strtok (data, " ,\r\n\t");
-	  strcpy (labels, "X-Babyl-Labels: ");
+	  if (data.buffer[1] == '\0')
+	    continue;
+	  else if (data.buffer[1] == '\f')
+	    {
+	      /* Save labels. */
+	      readline (&data, stdin);
+	      p = strtok (data.buffer, " ,\r\n\t");
+	      labels = "X-Babyl-Labels: ";
+
+	      while (p = strtok (NULL, " ,\r\n\t"))
+		labels = concat (labels, p, ", ");
 
-	  while ((p = strtok (NULL, " ,\r\n\t")))
-	    {
-	      strcat (labels, p);
-	      strcat (labels, ", ");
+	      p = &labels[strlen (labels) - 2];
+	      if (*p == ',')
+		*p = '\0';
+	      printing = header = FALSE;
+	      labels_saved = TRUE;
+	      continue;
 	    }
+	}
 
-	  labels[strlen (labels) - 2] = '\0';
-	  printing = header = FALSE;
-	  continue;
+      if ((data.buffer[0] == '\0') && header)
+	{
+	  header = FALSE;
+	  if (labels_saved)
+	    puts (labels);
 	}
 
-      if (!strlen (data) && header)
-	{
-	  header = FALSE;
-	  if (strcmp (labels, "X-Babyl-Labels"))
-	    puts (labels);
-	}
-    
       if (printing)
-	puts (data);
+	puts (data.buffer);
     }
 }
+
+
+
+/*
+ * Return a newly-allocated string whose contents
+ * concatenate those of s1, s2, s3.
+ */
+char *
+concat (s1, s2, s3)
+     char *s1, *s2, *s3;
+{
+  int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
+  char *result = xnew (len1 + len2 + len3 + 1, char);
+
+  strcpy (result, s1);
+  strcpy (result + len1, s2);
+  strcpy (result + len1 + len2, s3);
+  result[len1 + len2 + len3] = '\0';
+
+  return result;
+}
+
+/*
+ * Read a line of text from `stream' into `linebuffer'.
+ * Return the number of characters read from `stream',
+ * which is the length of the line including the newline, if any.
+ */
+long
+readline (linebuffer, stream)
+     struct linebuffer *linebuffer;
+     register FILE *stream;
+{
+  char *buffer = linebuffer->buffer;
+  register char *p = linebuffer->buffer;
+  register char *pend;
+  int chars_deleted;
+
+  pend = p + linebuffer->size;	/* Separate to avoid 386/IX compiler bug.  */
+
+  while (1)
+    {
+      register int c = getc (stream);
+      if (p == pend)
+	{
+	  linebuffer->size *= 2;
+	  buffer = (char *) xrealloc (buffer, linebuffer->size);
+	  p += buffer - linebuffer->buffer;
+	  pend = buffer + linebuffer->size;
+	  linebuffer->buffer = buffer;
+	}
+      if (c == EOF)
+	{
+	  chars_deleted = 0;
+	  break;
+	}
+      if (c == '\n')
+	{
+	  if (p[-1] == '\r' && p > buffer)
+	    {
+	      *--p = '\0';
+	      chars_deleted = 2;
+	    }
+	  else
+	    {
+	      *p = '\0';
+	      chars_deleted = 1;
+	    }
+	  break;
+	}
+      *p++ = c;
+    }
+
+  return (p - buffer + chars_deleted);
+}
+
+/*
+ * Like malloc but get fatal error if memory is exhausted.
+ */
+long *
+xmalloc (size)
+     unsigned int size;
+{
+  long *result = (long *) malloc (size);
+  if (result == NULL)
+    fatal ("virtual memory exhausted");
+  return result;
+}
+
+long *
+xrealloc (ptr, size)
+     char *ptr;
+     unsigned int size;
+{
+  long *result = (long *) realloc (ptr, size);
+  if (result == NULL)
+    fatal ("virtual memory exhausted");
+  return result;
+}
+
+void
+fatal (message)
+{
+  fprintf (stderr, "%s: %s\n", progname, message);
+  exit (BAD);
+}
+