�

[pf3gnuchains/gcc-fork.git] / gcc / cppmain.c

diff --git a/gcc/cppmain.c b/gcc/cppmain.c
index 3213172..0a45e86 100644 (file)
--- a/gcc/cppmain.c
+++ b/gcc/cppmain.c
@@ -1,5 +1,5 @@
 /* CPP main program, using CPP Library.
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
    Written by Per Bothner, 1994-95.
 
 This program is free software; you can redistribute it and/or modify it
@@ -14,28 +14,46 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
  In other words, you are welcome to use, share and improve this program.
  You are forbidden to forbid anyone else to use, share and improve
  what you give them.   Help stamp out software-hoarding!  */
 
-#include "cpplib.h"
+#ifndef EMACS
+#include "config.h"
+#include "system.h"
+#include "gansidecl.h"
+#else
 #include <stdio.h>
 
 extern char *getenv ();
+#endif /* not EMACS */
+
+#include "cpplib.h"
+
+char *progname;
 
 cpp_reader parse_in;
 cpp_options options;
 
+#ifdef abort
 /* More 'friendly' abort that prints the line and file.
    config.h can #define abort fancy_abort if you like that sort of thing.  */
+void
+fatal (s)
+     char *s;
+{
+  fputs (s, stderr);
+  exit (FATAL_EXIT_CODE);
+}
 
 void
 fancy_abort ()
 {
   fatal ("Internal gcc abort.");
 }
+#endif
 
 \f
 int
@@ -44,27 +62,28 @@ main (argc, argv)
      char **argv;
 {
   char *p;
-  int i;
-  int argi = 1;  /* Next argument to handle. */
+  int argi = 1;  /* Next argument to handle.  */
   struct cpp_options *opts = &options;
 
   p = argv[0] + strlen (argv[0]);
   while (p != argv[0] && p[-1] != '/') --p;
   progname = p;
 
-  init_parse_file (&parse_in);
+  cpp_reader_init (&parse_in);
   parse_in.data = opts;
 
-  init_parse_options (opts);
+  cpp_options_init (opts);
   
   argi += cpp_handle_options (&parse_in, argc - argi , argv + argi);
-  if (argi < argc)
-    fatal ("Invalid option `%s'", argv[argi]);
+  if (argi < argc && ! CPP_FATAL_ERRORS (&parse_in))
+    cpp_fatal (&parse_in, "Invalid option `%s'", argv[argi]);
+  if (CPP_FATAL_ERRORS (&parse_in))
+    exit (FATAL_EXIT_CODE);
+      
   parse_in.show_column = 1;
 
-  i = push_parse_file (&parse_in, opts->in_fname);
-  if (i != SUCCESS_EXIT_CODE)
-    return i;
+  if (! cpp_start_read (&parse_in, opts->in_fname))
+    exit (FATAL_EXIT_CODE);
 
   /* Now that we know the input file is valid, open the output.  */
 
@@ -75,28 +94,20 @@ main (argc, argv)
 
   for (;;)
     {
-#if 0
-      int ch = PARSE_GETC (&parse_in);
-      if (ch < 0)
-       break;
-      if (! opts->no_output)
-       putchar (ch);
-#else
       enum cpp_token kind;
       if (! opts->no_output)
        {
          fwrite (parse_in.token_buffer, 1, CPP_WRITTEN (&parse_in), stdout);
        }
-      parse_in.limit = parse_in.token_buffer;
+      CPP_SET_WRITTEN (&parse_in, 0);
       kind = cpp_get_token (&parse_in);
       if (kind == CPP_EOF)
        break;
-#endif
     }
 
   cpp_finish (&parse_in);
 
   if (parse_in.errors)
-    exit (FAILURE_EXIT_CODE);
+    exit (FATAL_EXIT_CODE);
   exit (SUCCESS_EXIT_CODE);
 }