Changeset 1307

Timestamp:

Mar 16, 2004, 2:51:34 AM (21 years ago)

Author:

bird

Message:

Initial port of FreeBSD nl_types.

Location:

trunk/src/emx/src/lib

Files:

• bsd/nls/msgcat.c (modified) (5 diffs, 1 prop)
• bsd/nls/nls.smak (added)
• libc.def (modified) (1 diff, 1 prop)

trunk/src/emx/src/lib/bsd/nls/msgcat.c

@@ -55 +55 @@
 
 #include "msgcat.h"
+#ifndef __EMX__
 #include "../locale/setlocale.h"        /* for ENCODING_LEN */
-
+#else
+#define ENCODING_LEN    31              /* bird: wonder if this is allright. */
+#endif
+
+#ifndef __EMX__
 #define _DEFAULT_NLS_PATH "/usr/share/nls/%L/%N.cat:/usr/share/nls/%N/%L:/usr/local/share/nls/%L/%N.cat:/usr/local/share/nls/%N/%L"
+#else /* bird: we use a different separator character. */
+#define _DEFAULT_NLS_PATH "/usr/share/nls/%L/%N.cat;/usr/share/nls/%N/%L;/usr/local/share/nls/%L/%N.cat;/usr/local/share/nls/%N/%L"
+#endif
 
 #define TRUE    1
@@ -65 +73 @@
 #define NLRETERR(errc)  { errno = errc; return (NLERR); }
 
+#ifndef __EMX__
 static nl_catd  loadCat();
 static int      loadSet();
 static void     __nls_free_resources();
+#else
+static nl_catd  loadCat(__const char *);
+static int      loadSet(MCCatT*, MCSetT*);
+static void     __nls_free_resources(MCCatT*, int);
+#endif
 
 nl_catd
@@ -112 +126 @@
         }
 
+#ifndef __EMX__
         if ((nlspath = getenv("NLSPATH")) == NULL || issetugid())
+#else
+        if ((nlspath = getenv("NLSPATH")) == NULL)
+#endif
                 nlspath = _DEFAULT_NLS_PATH;
 
@@ -122 +140 @@
         }
 
+#ifndef __EMX__
         while ((nlspath = strsep(&cptr, ":")) != NULL) {
+#else
+        while ((nlspath = strsep(&cptr, ";")) != NULL) {
+#endif
                 pathP = path;
                 if (*nlspath) {
@@ -366 +388 @@
         cat->loadType = MCLoadBySet;
 
+#ifndef __EMX__
         if ((cat->fp = fopen(catpath, "r")) == NULL) {
+#else
+        if ((cat->fp = fopen(catpath, "rb")) == NULL) {
+#endif
                 saverr = errno;
                 free(cat);

trunk/src/emx/src/lib/libc.def

@@ -1090 +1090 @@
     "_warnc" @1113
     "_warnx" @1114
-
+    "_catclose" @1115
+    "_catgets" @1116
+    "_catopen" @1117