Restructure err and warn functions.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1504 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/roken/Makefile.in

@@ -46,7 +46,7 @@ SOURCES = \
 
 OBJECTS = k_getpwuid.o k_getpwnam.o signal.o tm2time.o \
 	  verify.o inaddr2str.o mini_inetd.o get_window_size.o \
-	  @LIBOBJS@
+	  warnerr.o @LIBOBJS@
 
 all: $(LIB)
 

lib/roken/err.c

@@ -1,27 +1,32 @@
-/*-
+/*
- * Copyright (c) 1993
+ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan 
- *      The Regents of the University of California.  All rights reserved.
+ * (Royal Institute of Technology, Stockholm, Sweden).  
+ * 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
+ *      This product includes software developed by the Kungliga Tekniska
- *      California, Berkeley and its contributors.
+ *      H<EFBFBD>gskolan and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 
+ * 4. Neither the name of the Institute 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
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE 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)

lib/roken/err.h

@@ -11,6 +11,8 @@
 
 extern char *__progname;
 
+void warnerr(int doexit, int eval, int doerrno, const char *fmt, va_list ap);
+
 void verr(int eval, const char *fmt, va_list ap);
 void err(int eval, const char *fmt, ...);
 void verrx(int eval, const char *fmt, va_list ap);

lib/roken/err.hin

@@ -11,6 +11,8 @@
 
 extern char *__progname;
 
+void warnerr(int doexit, int eval, int doerrno, const char *fmt, va_list ap);
+
 void verr(int eval, const char *fmt, va_list ap);
 void err(int eval, const char *fmt, ...);
 void verrx(int eval, const char *fmt, va_list ap);

lib/roken/errx.c

@@ -1,27 +1,32 @@
-/*-
+/*
- * Copyright (c) 1993
+ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan 
- *      The Regents of the University of California.  All rights reserved.
+ * (Royal Institute of Technology, Stockholm, Sweden).  
+ * 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
+ *      This product includes software developed by the Kungliga Tekniska
- *      California, Berkeley and its contributors.
+ *      H<EFBFBD>gskolan and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 
+ * 4. Neither the name of the Institute 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
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE 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)

lib/roken/verr.c

@@ -1,27 +1,32 @@
-/*-
+/*
- * Copyright (c) 1993
+ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan 
- *      The Regents of the University of California.  All rights reserved.
+ * (Royal Institute of Technology, Stockholm, Sweden).  
+ * 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
+ *      This product includes software developed by the Kungliga Tekniska
- *      California, Berkeley and its contributors.
+ *      H<EFBFBD>gskolan and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 
+ * 4. Neither the name of the Institute 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
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE 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)
@@ -41,16 +46,5 @@ RCSID("$Id$");
 void
 verr(int eval, const char *fmt, va_list ap)
 {
-  int sverrno;
+    warnerr(1, eval, 1, fmt, ap);
-  
-  sverrno = errno;
-#if 0
-  fprintf(stderr, "%s: ", __progname);
-#endif
-  if (fmt != NULL) {
-    vfprintf(stderr, fmt, ap);
-    fprintf(stderr, ": ");
-  }
-  fprintf(stderr, "%s\n", strerror(sverrno));
-  exit(eval);
 }

lib/roken/verrx.c

@@ -1,27 +1,32 @@
-/*-
+/*
- * Copyright (c) 1993
+ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan 
- *      The Regents of the University of California.  All rights reserved.
+ * (Royal Institute of Technology, Stockholm, Sweden).  
+ * 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
+ *      This product includes software developed by the Kungliga Tekniska
- *      California, Berkeley and its contributors.
+ *      H<EFBFBD>gskolan and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 
+ * 4. Neither the name of the Institute 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
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE 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)
@@ -41,11 +46,5 @@ RCSID("$Id$");
 void
 verrx(int eval, const char *fmt, va_list ap)
 {
-#if 0
+    warnerr(1, eval, 0, fmt, ap);
-  fprintf(stderr, "%s: ", __progname);
-#endif
-  if (fmt != NULL)
-    vfprintf(stderr, fmt, ap);
-  fprintf(stderr, "\n");
-  exit(eval);
 }

lib/roken/vwarn.c

@@ -1,27 +1,32 @@
-/*-
+/*
- * Copyright (c) 1993
+ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan 
- *      The Regents of the University of California.  All rights reserved.
+ * (Royal Institute of Technology, Stockholm, Sweden).  
+ * 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
+ *      This product includes software developed by the Kungliga Tekniska
- *      California, Berkeley and its contributors.
+ *      H<EFBFBD>gskolan and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 
+ * 4. Neither the name of the Institute 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
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE 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)
@@ -41,15 +46,5 @@ RCSID("$Id$");
 void
 vwarn(const char *fmt, va_list ap)
 {
-  int sverrno;
+    warnerr(0, 0, 1, fmt, ap);
-  
-  sverrno = errno;
-#if 0
-  fprintf(stderr, "%s: ", __progname);
-#endif
-  if (fmt != NULL) {
-    vfprintf(stderr, fmt, ap);
-    fprintf(stderr, ": ");
-  }
-  fprintf(stderr, "%s\n", strerror(sverrno));
 }

lib/roken/vwarnx.c

@@ -1,27 +1,32 @@
-/*-
+/*
- * Copyright (c) 1993
+ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan 
- *      The Regents of the University of California.  All rights reserved.
+ * (Royal Institute of Technology, Stockholm, Sweden).  
+ * 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
+ *      This product includes software developed by the Kungliga Tekniska
- *      California, Berkeley and its contributors.
+ *      H<EFBFBD>gskolan and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 
+ * 4. Neither the name of the Institute 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
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE 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)
@@ -41,10 +46,6 @@ RCSID("$Id$");
 void
 vwarnx(const char *fmt, va_list ap)
 {
-#if 0
+    warnerr(0, 0, 0, fmt, ap);
-  fprintf(stderr, "%s: ", __progname);
-#endif
-  if (fmt != NULL)
-    vfprintf(stderr, fmt, ap);
-  fprintf(stderr, "\n");
 }
+

lib/roken/warn.c

@@ -1,27 +1,32 @@
-/*-
+/*
- * Copyright (c) 1993
+ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan 
- *      The Regents of the University of California.  All rights reserved.
+ * (Royal Institute of Technology, Stockholm, Sweden).  
+ * 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
+ *      This product includes software developed by the Kungliga Tekniska
- *      California, Berkeley and its contributors.
+ *      H<EFBFBD>gskolan and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 
+ * 4. Neither the name of the Institute 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
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE 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)

lib/roken/warnerr.c

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan 
+ * (Royal Institute of Technology, Stockholm, Sweden).  
+ * 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 Kungliga Tekniska
+ *      H<>gskolan and its contributors.
+ * 
+ * 4. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+RCSID("$Id$");
+#endif
+
+#include "err.h"
+
+void
+warnerr(int doexit, int eval, int doerrno, const char *fmt, va_list ap)
+{
+    int sverrno = errno;
+#ifdef HAVE___PROGNAME
+    fprintf(stderr, "%s", __progname);
+    if(fmt != NULL || doerrno)
+	fprintf(stderr, ": ");
+#endif
+    if (fmt != NULL){
+	vfprintf(stderr, fmt, ap);
+	if(doerrno)
+	    fprintf(stderr, ": ");
+    }
+    if(doerrno)
+	fprintf(stderr, "%s", strerror(sverrno));
+    fprintf(stderr, "\n");
+    if(doexit)
+	exit(eval);
+}

lib/roken/warnx.c

@@ -1,27 +1,32 @@
-/*-
+/*
- * Copyright (c) 1993
+ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan 
- *      The Regents of the University of California.  All rights reserved.
+ * (Royal Institute of Technology, Stockholm, Sweden).  
+ * 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
+ *      This product includes software developed by the Kungliga Tekniska
- *      California, Berkeley and its contributors.
+ *      H<EFBFBD>gskolan and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 
+ * 4. Neither the name of the Institute 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
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE 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
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE 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)