From a8a87cc61bfeb104ae045e40316a9f63fb8dad22 Mon Sep 17 00:00:00 2001
From: Alexey Zelkin <phantom@FreeBSD.org>
Date: Fri, 1 Sep 2000 12:19:00 +0000
Subject: [PATCH] Set rcsid to correct value Resort #include files Remove SYSV
 compatibility chunks

---
 lib/libc/nls/msgcat.c | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
index 56c88041aa9..d9a651fb104 100644
--- a/lib/libc/nls/msgcat.c
+++ b/lib/libc/nls/msgcat.c
@@ -33,51 +33,33 @@ up-to-date.  Many thanks.
 ******************************************************************/
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: msgcat.c,v 1.11 1995/02/27 13:06:51 cgd Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
-/* Edit History
-
-03/06/91   4 schulert	remove working directory from nlspath
-01/18/91   2 hamilton	#if not rescanned
-01/12/91   3 schulert	conditionally use prototypes
-11/03/90   1 hamilton	Alphalpha->Alfalfa & OmegaMail->Poste
-10/15/90   2 schulert	> #include <unistd.h> if MIPS
-08/13/90   1 schulert	move from ua to omu
-*/
-
 /*
  * We need a better way of handling errors than printing text.  I need
  * to add an error handling routine.
  */
 
-#include "nl_types.h"
-#include "msgcat.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/syslimits.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <locale.h>
+#include <nl_types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "msgcat.h"
+
 #ifndef True
 # define True	~0
 # define False	0
 #endif
 
-/* take care of sysv diffs */
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-#ifndef FD_CLOEXEC
-#define FD_CLOEXEC 1
-#endif
-
 #define	NLERR	((nl_catd) -1)
 
 static nl_catd loadCat();
@@ -87,7 +69,7 @@ nl_catd 	catopen( name, type)
 __const char *name;
 int type;
 {
-    char	path[MAXPATHLEN];
+    char	path[PATH_MAX];
     __const char *catpath = NULL;
     char        *nlspath;
     char	*lang;