Changed prototype for chr_map_input - added const.

[idzebra-moved-to-github.git] / bfile / mfile.c

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 44364bc..b2f3012 100644 (file)
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: mfile.c,v $
- * Revision 1.19  1996-05-01 07:16:30  quinn
+ * Revision 1.22  1997-09-04 13:56:39  adam
+ * Added O_BINARY to open calls.
+ *
+ * Revision 1.21  1996/10/29 13:56:18  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.20  1996/05/14 12:10:16  quinn
+ * Bad areadef scan
+ *
+ * Revision 1.19  1996/05/01  07:16:30  quinn
  * Fixed ancient bug.
  *
  * Revision 1.18  1996/04/09  06:47:30  adam
@@ -78,7 +87,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <alexutil.h>
+#include <zebrautl.h>
 #include <mfile.h>
 
 static MFile_area_struct *open_areas = 0;
@@ -134,7 +143,7 @@ static int scan_areadef(MFile_area ma, const char *name)
         else if (*ad == '+')
             ad++;
         size = 0;
-        if (*ad <= '0' || *ad >= '9')
+        if (*ad < '0' || *ad > '9')
         {
            logf (LOG_FATAL, "Missing size after path: %s", ad0);
             return -1;
@@ -182,7 +191,7 @@ static int file_position(MFile mf, int pos, int offset)
     else
        off = c ? (mf->files[c-1].top + 1) : 0;
     if (mf->files[c].fd < 0 && (mf->files[c].fd = open(mf->files[c].path,
-       mf->wr ? O_RDWR|O_CREAT : O_RDONLY, 0666)) < 0)
+       mf->wr ? (O_BINARY|O_RDWR|O_CREAT) : (O_BINARY|O_RDONLY), 0666)) < 0)
     {
         if (!mf->wr && errno == ENOENT && off == 0)
             return -2;
@@ -280,7 +289,7 @@ MFile_area mf_init(const char *name)
            sprintf(tmpnam, "%s/%s", dirp->name, dent->d_name);
            part_f->path = xstrdup(tmpnam);
            /* get size */
-           if ((fd = open(part_f->path, O_RDONLY)) < 0)
+           if ((fd = open(part_f->path, O_BINARY|O_RDONLY)) < 0)
            {
                logf (LOG_FATAL|LOG_ERRNO, "Failed to access %s",
                       dent->d_name);