BSD 4_4 release

[unix-history] / usr / src / old / dbx / ops.tahoe.c

diff --git a/usr/src/old/dbx/ops.tahoe.c b/usr/src/old/dbx/ops.tahoe.c
index f4b4c06..d1a7d74 100644 (file)
--- a/usr/src/old/dbx/ops.tahoe.c
+++ b/usr/src/old/dbx/ops.tahoe.c
@@ -2,21 +2,37 @@
  * Copyright (c) 1985 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1985 The Regents of the University of California.
  * All rights reserved.
  *

- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ops.tahoe.c        5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)ops.tahoe.c        5.9 (Berkeley) 11/14/91";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -25,6 +41,7 @@ static char sccsid[] = "@(#)ops.tahoe.c       5.6 (Berkeley) %G%";
 
 #include "defs.h"
 #include "ops.h"
 
 #include "defs.h"
 #include "ops.h"

+#include "pathnames.h"

 
 #ifndef public
 typedef unsigned char Opcode;
 
 #ifndef public
 typedef unsigned char Opcode;


@@ -126,13 +143,9 @@ typedef struct {
 #define        SYSSIZE 151             /* # of system calls */
 #endif
 
 #define        SYSSIZE 151             /* # of system calls */
 #endif
 

-#ifndef ADBINSTRS
-#define ADBINSTRS "../../bin/adb/adb.tahoe/instrs.adb"
-#endif
-

 public Optab optab[] = {
 #define OP(a,b,c,d,e,f,g,h,i) {a,b,c,d,e,f,g,h,i}
 public Optab optab[] = {
 #define OP(a,b,c,d,e,f,g,h,i) {a,b,c,d,e,f,g,h,i}

-#include ADBINSTRS
+#include "instrs.adb"

 0};
 
 /*
 0};
 
 /*