(concat, xmalloc, xrealloc, readline, xnew): Four new

functions and a macro that allow the program to work on input
lines of whatever length.  Copied from etags.c.
(fatal): Print a fatal error message and exit.
(main): Use the new functions.  Fixed a bug that made a \037 char
appear at the end of the output.

1 files changed, 194 insertions, 59 deletions

diff --git a/lib-src/b2m.c b/lib-src/b2m.c
index ededf304f00..416db6385ff 100644
--- a/lib-src/b2m.c
+++ b/lib-src/b2m.c
@@ -15,6 +15,9 @@
  *   Mon Nov 7 15:54:06 PDT 1988
  */
 
+/* Made conformant to the GNU coding standards January, 1995
+   by Francesco Potorti` <pot@cnuce.cnr.it>. */
+
 #include <stdio.h>
 #include <time.h>
 #include <sys/types.h>
@@ -22,101 +25,233 @@
 #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
 
-/* BSD's strings.h does not declare the type of strtok.  */
-extern char *strtok ();
+#undef TRUE
+#define TRUE    1
+#undef FALSE
+#define FALSE   0
 
-#ifndef TRUE
-#define TRUE  (1)
-#endif
-#ifndef 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 MAX_DATA_LEN 256   /* size for from[], labels[], and data[] arrays */
+#define streq(s,t)      (strcmp (s, t) == 0)
+#define strneq(s,t,n)   (strncmp (s, t, n) == 0)
+
+typedef int logical;
+
+/*
+ * 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();
 
-int header = FALSE, printing;
-time_t ltoday;
-char from[MAX_DATA_LEN], labels[MAX_DATA_LEN], data[MAX_DATA_LEN], *p, *today;
+char *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)))
+
+
+
+char *progname;
 
-int
 main (argc, argv)
      int argc;
      char **argv;
 {
+  logical labels_saved, printing, header;
+  time_t ltoday;
+  char *labels, *p, *today;
+  struct linebuffer data;
+
 #ifdef MSDOS
   _fmode = O_BINARY;            /* all of files are treated as binary files */
   (stdout)->_flag &= ~_IOTEXT;
   (stdin)->_flag &= ~_IOTEXT;
 #endif
-  if (argc >= 2 && strcmp (argv[1], "--help") == 0)
+  if (argc != 1)
     {
-      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;
+  progname = argv[0];
   ltoday = time (0);
   today = ctime (&ltoday);
+  data.size = 200;
+  data.buffer = xnew (200, char);
 
-  if (fgets (data, MAX_DATA_LEN, stdin))
-    {
-      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);
+  if (readline (&data, stdin) == 0
+      || !strneq (data.buffer, "BABYL OPTIONS:", 14))
+    fatal ("standard input is not a Babyl mailfile.");
 
-  while (fgets (data, MAX_DATA_LEN, stdin))
+  while (readline (&data, stdin) > 0)
     {
-
-#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 */
-          fgets (data, MAX_DATA_LEN, stdin);
-          p = strtok (data, " ,\r\n\t");
-          strcpy (labels, "X-Babyl-Labels: ");
-
-          while (p = strtok (NULL, " ,\r\n\t"))
+          if (data.buffer[1] == '\0')
+            continue;
+          else if (data.buffer[1] == '\f')
             {
-              strcat (labels, p);
-              strcat (labels, ", ");
-            }
+              /* Save labels. */
+              readline (&data, stdin);
+              p = strtok (data.buffer, " ,\r\n\t");
+              labels = "X-Babyl-Labels: ";
 
-          labels[strlen (labels) - 2] = '\0';
-          printing = header = FALSE;
-          continue;
+              while (p = strtok (NULL, " ,\r\n\t"))
+                labels = concat (labels, p, ", ");
+
+              labels[strlen (labels) - 2] = '\0';
+              printing = header = FALSE;
+              labels_saved = TRUE;
+              continue;
+            }
         }
 
-      if (!strlen (data) && header)
+      if ((data.buffer[0] == '\0') && header)
         {
           header = FALSE;
-          if (strcmp (labels, "X-Babyl-Labels"))
+          if (labels_saved)
             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 0;
+
+  return (p - buffer + chars_deleted);
 }
+
+/*
+ * Like malloc but get fatal error if memory is exhausted.
+ */
+char *
+xmalloc (size)
+     unsigned int size;
+{
+  char *result = (char *) malloc (size);
+  if (result == NULL)
+    fatal ("virtual memory exhausted");
+  return result;
+}
+
+char *
+xrealloc (ptr, size)
+     char *ptr;
+     unsigned int size;
+{
+  char *result = (char *) realloc (ptr, size);
+  if (result == NULL)
+    fatal ("virtual memory exhausted");
+  return result;
+}
+
+void
+fatal (message)
+{
+  fprintf (stderr, "%s: %s\n", progname, message);
+  exit (BAD);
+}
+