BSD 4_4 release

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

diff --git a/usr/src/old/dbx/makedefs.c b/usr/src/old/dbx/makedefs.c
index 198f4a0..2aaab29 100644 (file)
--- a/usr/src/old/dbx/makedefs.c
+++ b/usr/src/old/dbx/makedefs.c
@@ -1,20 +1,45 @@
 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1983 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+"@(#) Copyright (c) 1983 The Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)makedefs.c 5.3 (Berkeley) %G%";
-#endif not lint
-
-static char rcsid[] = "$Header: makedefs.c,v 1.2 87/03/26 19:14:02 donn Exp $";
+static char sccsid[] = "@(#)makedefs.c 5.6 (Berkeley) 6/1/90";
+#endif /* not lint */

 
 /*
  * Create a definitions file (e.g. .h) from an implementation file (e.g. .c).
 
 /*
  * Create a definitions file (e.g. .h) from an implementation file (e.g. .c).


@@ -35,6 +60,7 @@ static char rcsid[] = "$Header: makedefs.c,v 1.2 87/03/26 19:14:02 donn Exp $";
 
 #include "defs.h"
 #include <signal.h>
 
 #include "defs.h"
 #include <signal.h>

+#include "pathnames.h"

 
 #define procedure void
 
 
 #define procedure void
 


@@ -77,7 +103,7 @@ String argv[];
        if (force) {
            tmpname = argv[index + 1];
        } else {
        if (force) {
            tmpname = argv[index + 1];
        } else {

-           tmpname = mktemp("/tmp/makedefsXXXXXX");
+           tmpname = mktemp(_PATH_TMP);

        }
        tmp = freopen(tmpname, "w", stdout);
        if (tmp == nil) {
        }
        tmp = freopen(tmpname, "w", stdout);
        if (tmp == nil) {