From 8f24a49223e0974e35fcde68d4e1f64e691587c8 Mon Sep 17 00:00:00 2001
From: gdr <gdr>
Date: Sun, 21 Sep 1997 06:05:01 +0000
Subject: [PATCH] Move #pragmas out of the source files when possible.  Depend
 on occ command line flags.

---
 lib/libc/gen/basename.c | 6 +-----
 lib/libc/gen/bmem.c     | 6 +-----
 lib/libc/gen/compat.c   | 7 +------
 lib/libc/gen/crypt.c    | 6 +-----
 lib/libc/gen/dirent.c   | 6 +-----
 lib/libc/gen/err.c      | 9 +++------
 lib/libc/gen/fnmatch.c  | 6 +-----
 lib/libc/gen/fts.c      | 4 ----
 lib/libc/gen/getcwd.c   | 6 +-----
 lib/libc/gen/getgrent.c | 6 +-----
 lib/libc/gen/getpass.c  | 6 +-----
 lib/libc/gen/getpwent.c | 6 +-----
 lib/libc/gen/hostname.c | 7 +------
 lib/libc/gen/oldlog.c   | 6 +-----
 lib/libc/gen/psignal.c  | 6 +-----
 lib/libc/gen/pwcache.c  | 4 ----
 lib/libc/gen/scandir.c  | 6 +-----
 lib/libc/gen/siglist.c  | 6 +-----
 lib/libc/gen/sleep.c    | 6 +-----
 lib/libc/gen/tty.c      | 7 +------
 lib/libc/gen/utime.c    | 6 +-----
 21 files changed, 21 insertions(+), 107 deletions(-)

diff --git a/lib/libc/gen/basename.c b/lib/libc/gen/basename.c
index fc6061f..725002f 100644
--- a/lib/libc/gen/basename.c
+++ b/lib/libc/gen/basename.c
@@ -1,7 +1,7 @@
 /*
  * These routines were written by Devin Reade for GNO v2.0.4.
  *
- * $Id: basename.c,v 1.2 1997/09/05 06:09:50 gdr Exp $
+ * $Id: basename.c,v 1.3 1997/09/21 06:04:59 gdr Exp $
  *
  * This file is formatted for tabs every 8 columns.
  */
@@ -10,10 +10,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #include <sys/syslimits.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/lib/libc/gen/bmem.c b/lib/libc/gen/bmem.c
index d9e165f..c169656 100644
--- a/lib/libc/gen/bmem.c
+++ b/lib/libc/gen/bmem.c
@@ -1,5 +1,5 @@
 /*
- * $Id: bmem.c,v 1.1 1997/02/28 05:12:43 gdr Exp $
+ * $Id: bmem.c,v 1.2 1997/09/21 06:04:59 gdr Exp $
  *
  * This file is formatted with tabs every 8 columns.
  */
@@ -8,10 +8,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #include <string.h>
 
 void
diff --git a/lib/libc/gen/compat.c b/lib/libc/gen/compat.c
index cb12112..cda01ec 100644
--- a/lib/libc/gen/compat.c
+++ b/lib/libc/gen/compat.c
@@ -2,7 +2,7 @@
  * These functions really belong in a separate library, libcompat, if
  * we're trying to be BSD-ish.  They are all obsolete functions.
  *
- * $Id: compat.c,v 1.1 1997/02/28 05:12:43 gdr Exp $
+ * $Id: compat.c,v 1.2 1997/09/21 06:04:59 gdr Exp $
  *
  * This file is formatted with tabs every 8 characters.
  */
@@ -11,10 +11,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #include <sgtty.h>
 
 int
@@ -26,4 +22,3 @@ int
 stty (int filedes, struct sgttyb *argp) {
 	return ioctl(filedes,TIOCSETP,argp);
 }
-
diff --git a/lib/libc/gen/crypt.c b/lib/libc/gen/crypt.c
index 5f90e55..d554ff3 100644
--- a/lib/libc/gen/crypt.c
+++ b/lib/libc/gen/crypt.c
@@ -5,7 +5,7 @@
  * January 19-22, 1992 by Jawaid Bazyar
  * Copyright 1992-1997, Procyon Inc.
  *
- * $Id: crypt.c,v 1.1 1997/02/28 05:12:43 gdr Exp $
+ * $Id: crypt.c,v 1.2 1997/09/21 06:04:59 gdr Exp $
  *
  * This file is formatted with tab stops every 8 columns.
  */
@@ -14,10 +14,6 @@
 /* segment "libc_gen__"; *//* don't segment this until crypt.asm is done */
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/lib/libc/gen/dirent.c b/lib/libc/gen/dirent.c
index b973cd9..9a43fe1 100644
--- a/lib/libc/gen/dirent.c
+++ b/lib/libc/gen/dirent.c
@@ -3,7 +3,7 @@
  * were by Derek Taubert and Jawaid Bazyar.  Reimplemented from scratch
  * by Devin Reade.
  *
- * $Id: dirent.c,v 1.1 1997/02/28 05:12:43 gdr Exp $
+ * $Id: dirent.c,v 1.2 1997/09/21 06:04:59 gdr Exp $
  *
  * This file is formatted with tab stops every 8 characters.
  */
@@ -12,10 +12,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #define __LIBC_DIRENT	/* needed for decls in <dirent.h> */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index 6df2d57..a0ae366 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -1,7 +1,7 @@
 /*
  * This file is formatted with tab stops every 8 columns.
  *
- * $Id: err.c,v 1.1 1997/02/28 05:12:43 gdr Exp $
+ * $Id: err.c,v 1.2 1997/09/21 06:04:59 gdr Exp $
  */
 /*-
  * Copyright (c) 1993
@@ -40,11 +40,8 @@
 segment "libc_gen__";
 #endif
 
-#pragma memorymodel 0
-
-/* need bit 3 for variadic function definitions */
-#pragma optimize 8
-#pragma debug 0
+/* need bit 3 and 6 (minimum) for variadic function definitions */
+#pragma optimize 78
 
 #include <err.h>
 #include <errno.h>
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
index a639735..7dc7cc2 100644
--- a/lib/libc/gen/fnmatch.c
+++ b/lib/libc/gen/fnmatch.c
@@ -38,7 +38,7 @@
  * This implementation uses recursion.  It should be rewritten to avoid
  * it due to stack limitations on the IIgs.
  *
- * $Id: fnmatch.c,v 1.1 1997/02/28 05:12:44 gdr Exp $
+ * $Id: fnmatch.c,v 1.2 1997/09/21 06:05:00 gdr Exp $
  *
  * This file is formatted for tab stops every 8 characters.
  */
@@ -47,10 +47,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
 #endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 7ca9d2e..3537326 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -35,10 +35,6 @@
 segment "libc_gen_2";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)fts.c       8.4 (Berkeley) 4/16/94";
 #endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
index 1adb0a5..bc2124c 100644
--- a/lib/libc/gen/getcwd.c
+++ b/lib/libc/gen/getcwd.c
@@ -3,15 +3,11 @@
  * Modified for BSD 4.4 compatibility and dynamically allocated structs
  * by Devin Reade.
  *
- * $Id: getcwd.c,v 1.2 1997/02/28 05:43:29 gdr Exp $
+ * $Id: getcwd.c,v 1.3 1997/09/21 06:05:00 gdr Exp $
  *
  * This file is formatted for tabs every 8 columns.
  */
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #ifdef __ORCAC__
 segment "libc_gen__";
 #endif
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index b979868..d3cf5d3 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -34,17 +34,13 @@
 /*
  * This file is formatted with tab stops every 8 columns.
  *
- * $Id: getgrent.c,v 1.1 1997/02/28 05:12:44 gdr Exp $
+ * $Id: getgrent.c,v 1.2 1997/09/21 06:05:00 gdr Exp $
  */
  
 #ifdef __ORCAC__
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getgrent.c	8.2 (Berkeley) 3/21/94";
 #endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/gen/getpass.c b/lib/libc/gen/getpass.c
index 8e40ce2..16ede4b 100644
--- a/lib/libc/gen/getpass.c
+++ b/lib/libc/gen/getpass.c
@@ -34,7 +34,7 @@
 /*
  * GDR:  This file could probably be cleaned up a bit ...
  *
- * $Id: getpass.c,v 1.1 1997/02/28 05:12:44 gdr Exp $
+ * $Id: getpass.c,v 1.2 1997/09/21 06:05:00 gdr Exp $
  *
  * This file is formatted for tab stops every 8 characters.
  */
@@ -43,10 +43,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getpass.c	5.9 (Berkeley) 5/6/91";
 #endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index 737afa2..c8d0ef0 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -35,7 +35,7 @@
  * This is an old implementation and needs to be replaced; just not quite
  * yet -- gdr
  *
- * $Id: getpwent.c,v 1.1 1997/02/28 05:12:44 gdr Exp $
+ * $Id: getpwent.c,v 1.2 1997/09/21 06:05:00 gdr Exp $
  *
  * This file is formatted with tab stops every 8 characters.
  */
@@ -44,10 +44,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
- 
 #define _PATH_PASSWD "/etc/passwd"
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/gen/hostname.c b/lib/libc/gen/hostname.c
index 4707521..7489982 100644
--- a/lib/libc/gen/hostname.c
+++ b/lib/libc/gen/hostname.c
@@ -1,15 +1,11 @@
 /*
- * $Id: hostname.c,v 1.1 1997/02/28 05:12:44 gdr Exp $
+ * $Id: hostname.c,v 1.2 1997/09/21 06:05:00 gdr Exp $
  */
 
 #ifdef __ORCAC__
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
- 
 #include <sys/param.h>
 #include <unistd.h>
 #include <errno.h>
@@ -80,4 +76,3 @@ gethostname(char *name, int namelen) {
 	DisposeHandle(message);
 	return 0;
 }
-
diff --git a/lib/libc/gen/oldlog.c b/lib/libc/gen/oldlog.c
index dfe095f..f12bd98 100644
--- a/lib/libc/gen/oldlog.c
+++ b/lib/libc/gen/oldlog.c
@@ -10,7 +10,7 @@
  *
  * Phillip Vandry, August 1993.
  *
- * $Id: oldlog.c,v 1.1 1997/02/28 05:12:44 gdr Exp $
+ * $Id: oldlog.c,v 1.2 1997/09/21 06:05:00 gdr Exp $
  *
  * This file is formatted with tab stops every 8 columns.
  */
@@ -19,10 +19,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #include <stdio.h>
 #include <fcntl.h>
 #include <memory.h>
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
index f665526..5439716 100644
--- a/lib/libc/gen/psignal.c
+++ b/lib/libc/gen/psignal.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: psignal.c,v 1.2 1997/09/05 06:09:50 gdr Exp $
+ * $Id: psignal.c,v 1.3 1997/09/21 06:05:01 gdr Exp $
  *
  * This file is formatted for tab stops every 8 columns.
  */
@@ -39,10 +39,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)psignal.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c
index b768d2d..16ee495 100644
--- a/lib/libc/gen/pwcache.c
+++ b/lib/libc/gen/pwcache.c
@@ -35,10 +35,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)pwcache.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
index 31df20d..3f60b16 100644
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -34,17 +34,13 @@
 /*
  * This file is formatted for tab stops set every 8 columns.
  *
- * $Id: scandir.c,v 1.1 1997/02/28 05:12:45 gdr Exp $
+ * $Id: scandir.c,v 1.2 1997/09/21 06:05:01 gdr Exp $
  */
  
 #ifdef __ORCAC__
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)scandir.c	8.3 (Berkeley) 1/2/94";
 #endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c
index 3e734c6..5d94cb9 100644
--- a/lib/libc/gen/siglist.c
+++ b/lib/libc/gen/siglist.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: siglist.c,v 1.1 1997/07/28 03:12:37 gdr Exp $
+ * $Id: siglist.c,v 1.2 1997/09/21 06:05:01 gdr Exp $
  *
  * This file is formatted for tab stops every 8 columns.
  */
@@ -39,10 +39,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)siglist.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
index 139584b..47a94ee 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -2,7 +2,7 @@
  * The sleep(3) code is from BSD 4.3-reno, heavily modified (shorted)
  * for use with GNO.
  *
- * $Id: sleep.c,v 1.1 1997/02/28 05:12:45 gdr Exp $
+ * $Id: sleep.c,v 1.2 1997/09/21 06:05:01 gdr Exp $
  *
  * This file has been formatted for tabs every 8 columns
  */
@@ -11,10 +11,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #include <signal.h>
 #include <unistd.h>
 
diff --git a/lib/libc/gen/tty.c b/lib/libc/gen/tty.c
index e35b055..8e86d4d 100644
--- a/lib/libc/gen/tty.c
+++ b/lib/libc/gen/tty.c
@@ -34,17 +34,13 @@
 /*
  * This file is formatted with tab stops every 8 columns.
  *
- * $Id: tty.c,v 1.1 1997/02/28 05:12:45 gdr Exp $
+ * $Id: tty.c,v 1.2 1997/09/21 06:05:01 gdr Exp $
  */
  
 #ifdef __ORCAC__
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)ttyslot.c	5.6 (Berkeley) 2/23/91";
 #endif /* LIBC_SCCS and not lint */
@@ -121,4 +117,3 @@ isatty(int filedes) {
 		return 0;
 	}
 }
-
diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c
index 7b0931b..2b3f29e 100644
--- a/lib/libc/gen/utime.c
+++ b/lib/libc/gen/utime.c
@@ -1,7 +1,7 @@
 /*
  * utime, utimes.  Implementation by Devin Reade.
  *
- * $Id: utime.c,v 1.1 1997/02/28 05:12:45 gdr Exp $
+ * $Id: utime.c,v 1.2 1997/09/21 06:05:01 gdr Exp $
  *
  * This file is formatted with tab stops every 8 columns.
  */
@@ -10,10 +10,6 @@
 segment "libc_gen__";
 #endif
 
-#pragma optimize 0
-#pragma debug 0
-#pragma memorymodel 0
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <utime.h>