WebSVN – Kolibri OS – Diff – /programs/develop/libraries/zlib/gzlib.c

 /* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004, 2010 Mark Adler
+ * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
+#include "gzguts.h"
+#if defined(_WIN32) && !defined(__BORLANDC__)
-#include "gzguts.h"
+#  define LSEEK _lseeki64
 #else
 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
 #  define LSEEK lseek64
 #else
+#  define LSEEK lseek
-#  define LSEEK lseek
+#endif
 #endif
 /* Local functions */
 local void gz_reset OF((gz_statep));
-local gzFile gz_open OF((const char *, int, const char *));
+local gzFile gz_open OF((const void *, int, const char *));
 /* Reset gzip file state */
 local void gz_reset(state)
     gz_statep state;
+{
     state->x.have = 0;              /* no output data available */
-    if (state->mode == GZ_READ) {   /* for reading ... */
-        state->have = 0;            /* no output data available */
+    if (state->mode == GZ_READ) {   /* for reading ... */
+        state->eof = 0;             /* not at end of file */
-        state->eof = 0;             /* not at end of file */
+        state->past = 0;            /* have not read past end yet */
-        state->how = LOOK;          /* look for gzip header */
-        state->direct = 1;          /* default for empty file */
+        state->how = LOOK;          /* look for gzip header */
+    }
     state->seek = 0;                /* no seek request pending */
     gz_error(state, Z_OK, NULL);    /* clear error */
-    state->pos = 0;                 /* no uncompressed data yet */
+    state->x.pos = 0;               /* no uncompressed data yet */
     state->strm.avail_in = 0;       /* no input data yet */
+}
 /* Open a gzip file either by name or file descriptor. */
 local gzFile gz_open(path, fd, mode)
-    const char *path;
+    const void *path;
     int fd;
     const char *mode;
+{
+    gz_statep state;
+    size_t len;
+    int oflag;
+#ifdef O_CLOEXEC
+    int cloexec = 0;
+#endif
+#ifdef O_EXCL
+    int exclusive = 0;
+#endif
+    /* check input */
     if (path == NULL)
-    gz_statep state;
+        return NULL;
     /* allocate gzFile structure to return */
-    state = malloc(sizeof(gz_state));
+    state = (gz_statep)malloc(sizeof(gz_state));
     if (state == NULL)
         return NULL;
     state->size = 0;            /* no buffers allocated yet */
     state->want = GZBUFSIZE;    /* requested buffer size */
     state->msg = NULL;          /* no error message yet */
+    /* interpret mode */
-    /* interpret mode */
+    state->mode = GZ_NONE;
-    state->mode = GZ_NONE;
+    state->level = Z_DEFAULT_COMPRESSION;
-    state->level = Z_DEFAULT_COMPRESSION;
+    state->strategy = Z_DEFAULT_STRATEGY;
-    state->strategy = Z_DEFAULT_STRATEGY;
+    state->direct = 0;
     while (*mode) {
             case '+':       /* can't read and write at the same time */
                 free(state);
                 return NULL;
             case 'b':       /* ignore -- will request binary anyway */
                 break;
+#ifdef O_CLOEXEC
+            case 'e':
+                cloexec = 1;
+                break;
+#endif
+#ifdef O_EXCL
+            case 'x':
+                exclusive = 1;
+                break;
+#endif
             case 'f':
                 state->strategy = Z_FILTERED;
                 break;
             case 'h':
                 state->strategy = Z_HUFFMAN_ONLY;
             case 'R':
                 state->strategy = Z_RLE;
                 break;
             case 'F':
                 state->strategy = Z_FIXED;
+                break;
+            case 'T':
+                state->direct = 1;
+                break;
             default:        /* could consider as an error, but just ignore */
+                ;
+            }
         mode++;
+    }
     if (state->mode == GZ_NONE) {
         free(state);
         return NULL;
+    }
+    /* can't force transparent read */
+    if (state->mode == GZ_READ) {
+        if (state->direct) {
+            free(state);
+            return NULL;
+        }
+        state->direct = 1;      /* for empty file */
+    }
+    /* save the path name for error messages */
+#ifdef _WIN32
+    if (fd == -2) {
+        len = wcstombs(NULL, path, 0);
+        if (len == (size_t)-1)
+            len = 0;
+    }
+    else
+#endif
-    /* save the path name for error messages */
+        len = strlen((const char *)path);
-    state->path = malloc(strlen(path) + 1);
+    state->path = (char *)malloc(len + 1);
     if (state->path == NULL) {
         free(state);
         return NULL;
+    }
+#ifdef _WIN32
+    if (fd == -2)
+        if (len)
+            wcstombs(state->path, path, len + 1);
+        else
+            *(state->path) = 0;
+    else
+#endif
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+        snprintf(state->path, len + 1, "%s", (const char *)path);
 #else
+        strcpy(state->path, path);
-    strcpy(state->path, path);
+#endif
-    /* open the file with the appropriate mode (or just use fd) */
-    state->fd = fd != -1 ? fd :
+    /* compute the flags for open() */
-        open(path,
+    oflag =
 #ifdef O_LARGEFILE
-            O_LARGEFILE |
+        O_LARGEFILE |
 #endif
 #ifdef O_BINARY
+        O_BINARY |
+#endif
+#ifdef O_CLOEXEC
-            O_BINARY |
+        (cloexec ? O_CLOEXEC : 0) |
 #endif
-            (state->mode == GZ_READ ?
+        (state->mode == GZ_READ ?
+         O_RDONLY :
+         (O_WRONLY | O_CREAT |
+#ifdef O_EXCL
-                O_RDONLY :
+          (exclusive ? O_EXCL : 0) |
-                (O_WRONLY | O_CREAT | (
+#endif
-                    state->mode == GZ_WRITE ?
+          (state->mode == GZ_WRITE ?
+           O_TRUNC :
+           O_APPEND)));
-                        O_TRUNC :
+    /* open the file with the appropriate flags (or just use fd) */
+    state->fd = fd > -1 ? fd : (
+#ifdef _WIN32
+        fd == -2 ? _wopen(path, oflag, 0666) :
-                        O_APPEND))),
+#endif
-);
+        open((const char *)path, oflag, 0666));
     if (state->fd == -1) {
         free(state->path);
         free(state);
     const char *mode;
+{
     char *path;         /* identifier for error messages */
     gzFile gz;
-    if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL)
+    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
+        return NULL;
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    snprintf(path, 7 + 3 * sizeof(int), "", fd); /* for debugging */
-        return NULL;
+#else
+    sprintf(path, "", fd);   /* for debugging */
-    sprintf(path, "", fd);   /* for debugging */
+#endif
     gz = gz_open(path, fd, mode);
     free(path);
     return gz;
+}
+/* -- see zlib.h -- */
+#ifdef _WIN32
+gzFile ZEXPORT gzopen_w(path, mode)
+    const wchar_t *path;
+    const char *mode;
+{
+    return gz_open(path, -2, mode);
+}
+#endif
 /* -- see zlib.h -- */
 int ZEXPORT gzbuffer(file, size)
     gzFile file;
     unsigned size;
     /* make sure we haven't already allocated memory */
     if (state->size != 0)
         return -1;
     /* check and set requested size */
-    if (size == 0)
+    if (size < 2)
-        return -1;
+        size = 2;               /* need two bytes to check magic header */
     state->want = size;
     return 0;
+}
     if (file == NULL)
         return -1;
     state = (gz_statep)file;
     /* check that we're reading and that there's no error */
+    if (state->mode != GZ_READ ||
-    if (state->mode != GZ_READ || state->err != Z_OK)
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
     /* back up and start over */
     state = (gz_statep)file;
     if (state->mode != GZ_READ && state->mode != GZ_WRITE)
         return -1;
     /* check that there's no error */
-    if (state->err != Z_OK)
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
         return -1;
     /* can only seek from start or relative to current position */
     if (whence != SEEK_SET && whence != SEEK_CUR)
         return -1;
     /* normalize offset to a SEEK_CUR specification */
     if (whence == SEEK_SET)
-        offset -= state->pos;
+        offset -= state->x.pos;
     else if (state->seek)
         offset += state->skip;
     state->seek = 0;
     /* if within raw area while reading, just go there */
     if (state->mode == GZ_READ && state->how == COPY &&
-        state->pos + offset >= state->raw) {
+            state->x.pos + offset >= 0) {
-        ret = LSEEK(state->fd, offset - state->have, SEEK_CUR);
+        ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
+        if (ret == -1)
-        if (ret == -1)
+            return -1;
-            return -1;
+        state->x.have = 0;
-        state->have = 0;
+        state->eof = 0;
-        state->eof = 0;
+        state->past = 0;
         state->seek = 0;
         gz_error(state, Z_OK, NULL);
         state->strm.avail_in = 0;
-        state->pos += offset;
+        state->x.pos += offset;
-        return state->pos;
+        return state->x.pos;
+    }
     /* calculate skip amount, rewinding if needed for back seek when reading */
     if (offset < 0) {
         if (state->mode != GZ_READ)         /* writing -- can't go backwards */
             return -1;
-        offset += state->pos;
+        offset += state->x.pos;
         if (offset < 0)                     /* before start of file! */
             return -1;
         if (gzrewind(file) == -1)           /* rewind, then skip to offset */
             return -1;
     }
     /* if reading, skip what's in output buffer (one less gzgetc() check) */
     if (state->mode == GZ_READ) {
-        n = GT_OFF(state->have) || (z_off64_t)state->have > offset ?
+        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
-            (unsigned)offset : state->have;
+            (unsigned)offset : state->x.have;
-        state->have -= n;
+        state->x.have -= n;
-        state->next += n;
+        state->x.next += n;
-        state->pos += n;
+        state->x.pos += n;
         offset -= n;
     }
     /* request skip (if not zero) */
     if (offset) {
         state->seek = 1;
     state = (gz_statep)file;
     if (state->mode != GZ_READ && state->mode != GZ_WRITE)
         return -1;
     /* return position */
-    return state->pos + (state->seek ? state->skip : 0);
+    return state->x.pos + (state->seek ? state->skip : 0);
+}
 /* -- see zlib.h -- */
     state = (gz_statep)file;
     if (state->mode != GZ_READ && state->mode != GZ_WRITE)
         return 0;
     /* return end-of-file state */
-    return state->mode == GZ_READ ?
-        (state->eof && state->strm.avail_in == 0 && state->have == 0) : 0;
+    return state->mode == GZ_READ ? state->past : 0;
+}
 /* -- see zlib.h -- */
         return NULL;
     /* return error information */
     if (errnum != NULL)
         *errnum = state->err;
+    return state->err == Z_MEM_ERROR ? "out of memory" :
-    return state->msg == NULL ? "" : state->msg;
+                                       (state->msg == NULL ? "" : state->msg);
+}
 /* -- see zlib.h -- */
     state = (gz_statep)file;
     if (state->mode != GZ_READ && state->mode != GZ_WRITE)
         return;
     /* clear error and end-of-file */
-    if (state->mode == GZ_READ)
+    if (state->mode == GZ_READ) {
+        state->eof = 0;
+        state->past = 0;
         state->eof = 0;
     gz_error(state, Z_OK, NULL);
+}
         if (state->err != Z_MEM_ERROR)
             free(state->msg);
         state->msg = NULL;
+    }
+    /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
+    if (err != Z_OK && err != Z_BUF_ERROR)
+        state->x.have = 0;
     /* set error code, and if no message, then done */
     state->err = err;
     if (msg == NULL)
         return;
-    /* for an out of memory error, save as static string */
-    if (err == Z_MEM_ERROR) {
+    /* for an out of memory error, return literal string when requested */
-        state->msg = (char *)msg;
-        return;
+    if (err == Z_MEM_ERROR)
-    }
+        return;
     /* construct error message with path */
-    /* construct error message with path */
-    if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) {
+    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) ==
-        state->err = Z_MEM_ERROR;
+            NULL) {
+        state->err = Z_MEM_ERROR;
+        return;
+    }
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
-        state->msg = (char *)"out of memory";
+    snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
-        return;
+             "%s%s%s", state->path, ": ", msg);
 #else
+    strcpy(state->msg, state->path);
-    strcpy(state->msg, state->path);
+    strcat(state->msg, ": ");
-    strcat(state->msg, ": ");
+    strcat(state->msg, msg);
-    strcat(state->msg, msg);
+#endif
     return;

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/zlib/gzlib.c – Rev 1896 → 3926