Revert previous change.

[bpt/emacs.git] / lib-src / b2m.c

diff --git a/lib-src/b2m.c b/lib-src/b2m.c
index 6aea227..05caa14 100644 (file)
--- a/lib-src/b2m.c
+++ b/lib-src/b2m.c
@@ -1,12 +1,13 @@
 /*
  * b2m - a filter for Babyl -> Unix mail files
+ * The copyright on this file has been disclaimed.
  *
  * usage:      b2m < babyl > mailbox
  *
  * I find this useful whenever I have to use a
  * system which - shock horror! - doesn't run
- * Gnu emacs. At least now I can read all my
- * Gnumacs Babyl format mail files!
+ * GNU Emacs. At least now I can read all my
+ * GNU Emacs Babyl format mail files!
  *
  * it's not much but it's free!
  *
@@ -18,6 +19,13 @@
 /* Made conformant to the GNU coding standards January, 1995
    by Francesco Potorti` <pot@cnuce.cnr.it>. */
 
+#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
+
 #include <stdio.h>
 #include <time.h>
 #include <sys/types.h>
@@ -26,13 +34,6 @@
 #include <fcntl.h>
 #endif
 
-#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
@@ -88,6 +89,7 @@ struct option longopts[] =
 
 extern int optind;
 
+int
 main (argc, argv)
      int argc;
      char **argv;
@@ -166,7 +168,7 @@ main (argc, argv)
              p = strtok (data.buffer, " ,\r\n\t");
              labels = "X-Babyl-Labels: ";
 
-             while (p = strtok (NULL, " ,\r\n\t"))
+             while ((p = strtok (NULL, " ,\r\n\t")))
                labels = concat (labels, p, ", ");
 
              p = &labels[strlen (labels) - 2];
@@ -188,6 +190,8 @@ main (argc, argv)
       if (printing)
        puts (data.buffer);
     }
+
+  return 0;
 }
 
 
@@ -291,6 +295,7 @@ xrealloc (ptr, size)
 
 void
 fatal (message)
+     char *message;
 {
   fprintf (stderr, "%s: %s\n", progname, message);
   exit (BAD);