svr4-style gencat

1 files changed, 51 insertions, 15 deletions

diff --git a/lib/libc/nls/catclose.c b/lib/libc/nls/catclose.c
index d10d1826b35..7054ada5f2a 100644
--- a/lib/libc/nls/catclose.c
+++ b/lib/libc/nls/catclose.c
@@ -1,25 +1,61 @@
-/*	$NetBSD: catclose.c,v 1.6 1995/03/23 19:59:03 jtc Exp $	*/
+/*	$NetBSD: catclose.c,v 1.7 1996/05/13 23:29:37 jtc Exp $	*/
 
-/*
- * Written by J.T. Conklin, 10/05/94
- * Public domain.
+/*-
+ * Copyright (c) 1996 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by J.T. Conklin.
+ *
+ * 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 NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __indr_reference
-__indr_reference(_catclose,catclose);
-#else
+#define _NLS_PRIVATE
 
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <errno.h>
 #include <nl_types.h>
 
-extern int _catclose __P((nl_catd));
-
 int
-catclose(catd)
+_catclose(catd)
 	nl_catd catd;
 {
-	return _catclose(catd);
-}
+	if (catd == (nl_catd) -1) {
+		errno = EBADF;
+		return -1;
+	}
+	
+	if (catd) {
+		munmap(catd->__data, catd->__size);
+		free (catd);
+	}
 
-#endif
+	return 0;
+}