added BSD copyright notice.

Removed references to FAST_SKELETON_FILE.

diff --git a/main.c b/main.c
index ca1acb771fe8c9dfaeb37ff9c439a75ec4af6ebf..bd2a90a8862bcdf6862bf2da3a9122eae4436749 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,26 +1,45 @@
 /* flex - tool to generate fast lexical analyzers
  *
  *
- * Copyright (c) 1987, the University of California
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Vern Paxson.
  * 
  * The United States Government has rights in this work pursuant to
  * contract no. DE-AC03-76SF00098 between the United States Department of
  * Energy and the University of California.
- * 
- * This program may be redistributed.  Enhancements and derivative works
- * may be created provided the new works, if made available to the general
- * public, are made available for use by anyone.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  */
 
-#include "flexdef.h"
-
 #ifndef lint
+
+static char copyright[] =
+    "@(#) Copyright (c) 1989 The Regents of the University of California.\n\
+     All rights reserved.\n";
+
 static char rcsid[] =
     "@(#) $Header$ (LBL)";
+
 #endif
 
 
+#include "flexdef.h"
+
+
 /* these globals are all defined and commented in flexdef.h */
 int printstats, syntaxerror, eofseen, ddebug, trace, spprdflt;
 int interactive, caseins, useecs, fulltbl, usemecs;
@@ -429,11 +448,7 @@ get_next_arg: /* used by -c and -S flags in lieu of a "continue 2" control */
        static char skeleton_name_storage[400];
 
        skelname = skeleton_name_storage;
-
-       if ( fullspd || fulltbl )
-           (void) strcpy( skelname, FAST_SKELETON_FILE );
-       else
-           (void) strcpy( skelname, DEFAULT_SKELETON_FILE );
+       (void) strcpy( skelname, DEFAULT_SKELETON_FILE );
        }
 
     if ( ! use_stdout )