Changeset 1311

Timestamp:

Mar 16, 2004, 3:27:56 AM (21 years ago)

Author:

bird

Message:

Initial port.

Location:

trunk/src/emx/src/gencat

Files:

• gencat.c (modified) (6 diffs, 1 prop)
• gencat.smak (added)
• genlib.c (modified) (1 diff, 1 prop)

trunk/src/emx/src/gencat/gencat.c

@@ -37 +37 @@
 #include <sys/stat.h>
 #include <err.h>
+#ifndef __EMX__
 #include <paths.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -106 +108 @@
                 catfile = argv[i];
                 if (new) {
+#ifndef __EMX__
                     if ((ofd = open(catfile, O_WRONLY|O_TRUNC|O_CREAT, 0666)) < 0)
+#else
+                    if ((ofd = open(catfile, O_WRONLY|O_TRUNC|O_CREAT|O_BINARY, 0666)) < 0)
+#endif
                                 errx(1, "unable to create a new %s", catfile);
+#ifndef __EMX__
                 } else if ((ofd = open(catfile, O_RDONLY)) < 0) {
                     if ((ofd = open(catfile, O_WRONLY|O_CREAT, 0666)) < 0)
+#else
+                } else if ((ofd = open(catfile, O_RDONLY|O_BINARY)) < 0) {
+                    if ((ofd = open(catfile, O_WRONLY|O_CREAT|O_BINARY, 0666)) < 0)
+#endif
                                 errx(1, "unable to create %s", catfile);
                 } else {
                     MCReadCat(ofd);
                     close(ofd);
+#ifndef __EMX__
                     if ((ofd = open(catfile, O_WRONLY|O_TRUNC)) < 0)
+#else
+                    if ((ofd = open(catfile, O_WRONLY|O_TRUNC|O_BINARY)) < 0)
+#endif
                                 errx(1, "unable to truncate %s", catfile);
                 }
             } else {
                 input = argv[i];
+#ifndef __EMX__
                 if ((ifd = open(input, O_RDONLY)) < 0)
+#else
+                if ((ifd = open(input, O_RDONLY|O_TEXT)) < 0)
+#endif
                     errx(1, "unable to read %s", input);
                 MCParse(ifd);
@@ -138 +157 @@
 writeIfChanged(char *fname, int lang, int orConsts)
 {
+#ifndef __EMX__
     char        tmpname[] = _PATH_TMP"/gencat.XXXXXX";
+#else
+    char        tmpname[_MAX_PATH];
+    char *      tmp;
+#endif
     char        buf[BUFSIZ], tbuf[BUFSIZ], *cptr, *tptr;
     int         fd, tfd;
@@ -144 +168 @@
     int         len, tlen;
     struct stat sbuf;
+#ifdef __EMX__
+    /* setup tmpname */
+    tmp = getenv("TMP");
+    if (!tmp)
+        tmp = getenv("TMPDIR");
+    if (!tmp)
+        tmp = getenv("TEMP");
+    if (!tmp)
+        tmp = "/tmp";
+    strcat(strcpy(tmpname, tmp), "/gencat.XXXXX");
+#endif
 
     /* If it doesn't exist, just create it */
     if (stat(fname, &sbuf)) {
+#ifndef __EMX__
         if ((fd = open(fname, O_WRONLY|O_CREAT, 0666)) < 0)
+#else
+        if ((fd = open(fname, O_WRONLY|O_CREAT|O_BINARY, 0666)) < 0)
+#endif
             errx(1, "unable to create header file %s", fname);
         MCWriteConst(fd, lang, orConsts);
@@ -163 +202 @@
 
     /* Open the real header file */
+#ifndef __EMX__
     if ((fd = open(fname, O_RDONLY)) < 0)
+#else
+    if ((fd = open(fname, O_RDONLY | O_BINARY)) < 0)
+#endif
                 errx(1, "unable to read header file: %s", fname);
 
@@ -188 +231 @@
             errx(1, "unable to seek in tempfile: %s", tmpname);
         close(fd);
+#ifndef __EMX__
         if ((fd = open(fname, O_WRONLY|O_TRUNC)) < 0)
+#else
+        if ((fd = open(fname, O_WRONLY|O_TRUNC|O_BINARY)) < 0)
+#endif
             errx(1, "unable to truncate header file: %s", fname);
         while ((len = read(tfd, buf, BUFSIZ)) > 0) {

trunk/src/emx/src/gencat/genlib.c

@@ -40 +40 @@
 #include <string.h>
 #include <unistd.h>
+#ifndef __EMX__
 #include "msgcat.h"
+#else
+#include "../lib/bsd/nls/msgcat.h"
+#endif
 #include "gencat.h"