add Berkeley specific header; written by Sam Leffler

[unix-history] / usr / src / lib / libc / gen / setjmperr.c

diff --git a/usr/src/lib/libc/gen/setjmperr.c b/usr/src/lib/libc/gen/setjmperr.c
index 92216bc..3b1e6d1 100644 (file)
--- a/usr/src/lib/libc/gen/setjmperr.c
+++ b/usr/src/lib/libc/gen/setjmperr.c
@@ -1,14 +1,23 @@
 /*
  * Copyright (c) 1980 Regents of the University of California.
 /*
  * Copyright (c) 1980 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)setjmperr.c        5.2 (Berkeley) %G%";
-#endif LIBC_SCCS and not lint
-
-#define ERRMSG "longjmp botch\n"
+static char sccsid[] = "@(#)setjmperr.c        5.4 (Berkeley) %G%";
+#endif /* LIBC_SCCS and not lint */

 
 /*
  * This routine is called from longjmp() when an error occurs.
 
 /*
  * This routine is called from longjmp() when an error occurs.


@@ -16,8 +25,9 @@ static char sccsid[] = "@(#)setjmperr.c       5.2 (Berkeley) %G%";
  * write their own versions.
  * If this routine returns, the program is aborted.
  */
  * write their own versions.
  * If this routine returns, the program is aborted.
  */

+

 longjmperror()
 {
 longjmperror()
 {

-
-       write(2, ERRMSG, sizeof(ERRMSG));
+#define        ERRMSG  "longjmp botch\n"
+       write(2, ERRMSG, sizeof(ERRMSG) - 1);

 }
 }