Changeset 2263 for trunk/src

Timestamp:

Jan 23, 2009, 1:22:47 AM (16 years ago)

Author:

bird

Message:

kDepObj: Initial code that deals with Watcom and MASM OMF files.

Location:

trunk/src

Files:

• kmk/Makefile.am (modified) (1 diff)
• kmk/Makefile.kmk (modified) (3 diffs)
• kmk/kmkbuiltin.c (modified) (1 diff)
• kmk/kmkbuiltin.h (modified) (1 diff)
• kmk/kmkbuiltin/kDepIDB.c (modified) (38 diffs)
• kmk/kmkbuiltin/kDepObj.c (added)
• lib/kDep.c (modified) (5 diffs)
• lib/kDep.h (modified) (1 diff)

trunk/src/kmk/Makefile.am

@@ -69 +69 @@
                 kmkbuiltin/install.c \
                 kmkbuiltin/kDepIDB.c \
+                kmkbuiltin/kDepObj.c \
                 kmkbuiltin/ln.c \
                 kmkbuiltin/md5sum.c \

trunk/src/kmk/Makefile.kmk

@@ -240 +240 @@
         kmkbuiltin/install.c \
         kmkbuiltin/kDepIDB.c \
+        kmkbuiltin/kDepObj.c \
         kmkbuiltin/md5sum.c \
         kmkbuiltin/mkdir.c \
@@ -281 +282 @@
         kmk_test \
         kDepIDB \
+        kDepObj \
 
 kmk_append_TEMPLATE = BIN-KMK
@@ -383 +385 @@
 kDepIDB_SOURCES = \
         kmkbuiltin/kDepIDB.c
+
+kDepObj_TEMPLATE = BIN-KMK
+kDepObj_DEFS = kmk_builtin_kDepObj=main
+kDepObj_INCS = .
+kDepObj_LIBS = $(LIB_KDEP)
+kDepObj_SOURCES = \
+        kmkbuiltin/kDepObj.c
 
 

trunk/src/kmk/kmkbuiltin.c

@@ -211 +211 @@
         rc = kmk_builtin_test(argc, argv, environ, ppapszArgvToSpawn);
     /* rarely used commands: */
+    else if (!strcmp(pszCmd, "kDepObj"))
+        rc = kmk_builtin_kDepObj(argc, argv, environ);
     else if (!strcmp(pszCmd, "chmod"))
         rc = kmk_builtin_chmod(argc, argv, environ);

trunk/src/kmk/kmkbuiltin.h

@@ -53 +53 @@
 extern int kmk_builtin_test(int argc, char **argv, char **envp, char ***ppapszArgvSpawn);
 extern int kmk_builtin_kDepIDB(int argc, char **argv, char **envp);
+extern int kmk_builtin_kDepObj(int argc, char **argv, char **envp);
 
 extern char *kmk_builtin_func_printf(char *o, char **argv, const char *funcname);

trunk/src/kmk/kmkbuiltin/kDepIDB.c

@@ -38 +38 @@
 #endif
 #if !defined(_MSC_VER)
-# include <stdint.h>
 # include <unistd.h>
 #else
-# define USE_WIN_MMAP
 # include <io.h>
-# include <Windows.h>
- typedef unsigned char  uint8_t;
- typedef unsigned short uint16_t;
- typedef unsigned int   uint32_t;
 #endif
-/*#include "kDep.h"*/
+#include "../../lib/k/kDefs.h"
+#include "../../lib/k/kTypes.h"
 #include "../../lib/kDep.h"
 #include "kmkbuiltin.h"
 
-#define OFFSETOF(type, member)  ( (int)(size_t)(void *)&( ((type *)(void *)0)->member) )
-
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
 /*#define DEBUG*/
 #ifdef DEBUG
 # define dprintf(a)             printf a
-# define dump(pb, cb, offBase)  hexdump(pb,cb,offBase)
+# define dump(pb, cb, offBase)  depHexDump(pb,cb,offBase)
 #else
 # define dprintf(a)             do {} while (0)
@@ -70 +67 @@
 static const char *argv0 = "";
 
-#ifdef DEBUG
-/**
- * Performs a hexdump.
- */
-static void hexdump(const uint8_t *pb, size_t cb, size_t offBase)
-{
-    static const char   szHex[16] = "0123456789abcdef";
-
-    const unsigned      cchWidth = 16;
-    size_t              off = 0;
-    while (off < cb)
-    {
-        unsigned i;
-        printf("%s%0*x %04x:", off ? "\n" : "", sizeof(pb) * 2, offBase + off, off);
-        for (i = 0; i < cchWidth && off + i < cb ; i++)
-            printf(off + i < cb ? !(i & 7) && i ? "-%02x" : " %02x" : "   ", pb[i]);
-
-        while (i++ < cchWidth)
-                printf("   ");
-        printf(" ");
-
-        for (i = 0; i < cchWidth && off + i < cb; i++)
-        {
-            const uint8_t u8 = pb[i];
-            printf("%c", u8 < 127 && u8 >= 32 ? u8 : '.', 1);
-        }
-        off += cchWidth;
-        pb  += cchWidth;
-    }
-    printf("\n");
-}
-#endif
 
 /**
@@ -113 +78 @@
  * @param   cchPrefix       The size of the prefix.
  */
-static int ScanStream(uint8_t *pbStream, size_t cbStream, const char *pszPrefix, size_t cchPrefix)
-{
-    const uint8_t  *pbCur = pbStream;
+static int ScanStream(KU8 *pbStream, size_t cbStream, const char *pszPrefix, size_t cchPrefix)
+{
+    const KU8      *pbCur = pbStream;
     size_t          cbLeft = cbStream;
     register char   chFirst = *pszPrefix;
@@ -140 +105 @@
 
     return 0;
-}
-
-
-#ifdef USE_WIN_MMAP
-/** Handle to the current file mapping object. */
-static HANDLE g_hMapObj = NULL;
-#endif
-
-
-/**
- * Reads the file specified by the pInput file stream into memory.
- * The size of the file is returned in *pcbFile if specified.
- * The returned pointer should be freed by FreeFileMemory().
- */
-void *ReadFileIntoMemory(FILE *pInput, size_t *pcbFile)
-{
-    void       *pvFile;
-    long        cbFile;
-
-    /*
-     * Figure out file size.
-     */
-#if defined(_MSC_VER)
-    cbFile = _filelength(fileno(pInput));
-    if (cbFile < 0)
-#else
-    if (    fseek(pInput, 0, SEEK_END) < 0
-        ||  (cbFile = ftell(pInput)) < 0
-        ||  fseek(pInput, 0, SEEK_SET))
-#endif
-    {
-        fprintf(stderr, "%s: error: Failed to determin file size.\n", argv0);
-        return NULL;
-    }
-    if (pcbFile)
-        *pcbFile = cbFile;
-
-    /*
-     * Try mmap first.
-     */
-#ifdef USE_WIN_MMAP
-    {
-        HANDLE hMapObj = CreateFileMapping((HANDLE)_get_osfhandle(fileno(pInput)),
-                                           NULL, PAGE_READONLY, 0, cbFile, NULL);
-        if (hMapObj != NULL)
-        {
-            pvFile = MapViewOfFile(hMapObj, FILE_MAP_READ, 0, 0, cbFile);
-            if (pvFile)
-            {
-                g_hMapObj = hMapObj;
-                return pvFile;
-            }
-            fprintf(stderr, "%s: warning: MapViewOfFile failed, %d.\n", argv0, GetLastError());
-            CloseHandle(hMapObj);
-        }
-        else
-            fprintf(stderr, "%s: warning: CreateFileMapping failed, %d.\n", argv0, GetLastError());
-    }
-
-#endif
-
-    /*
-     * Allocate memory and read the file.
-     */
-    pvFile = malloc(cbFile + 1);
-    if (pvFile)
-    {
-        if (fread(pvFile, cbFile, 1, pInput))
-        {
-            ((uint8_t *)pvFile)[cbFile] = '\0';
-            return pvFile;
-        }
-        fprintf(stderr, "%s: error: Failed to read %ld bytes.\n", argv0, cbFile);
-        free(pvFile);
-    }
-    else
-        fprintf(stderr, "%s: error: Failed to allocate %ld bytes (file mapping).\n", argv0, cbFile);
-    return NULL;
-}
-
-
-static void FreeFileMemory(void *pvFile)
-{
-#if defined(USE_WIN_MMAP)
-    if (g_hMapObj)
-    {
-        UnmapViewOfFile(pvFile);
-        CloseHandle(g_hMapObj);
-        return;
-    }
-#endif
-    free(pvFile);
 }
 
@@ -244 +117 @@
 
 /** A PDB 7.0 Page number. */
-typedef uint32_t PDB70PAGE;
+typedef KU32 PDB70PAGE;
 /** Pointer to a PDB 7.0 Page number. */
 typedef PDB70PAGE *PPDB70PAGE;
@@ -254 +127 @@
 {
     /** The size of the stream. */
-    uint32_t    cbStream;
+    KU32        cbStream;
 } PDB70STREAM, *PPDB70STREAM;
 
@@ -266 +139 @@
 {
     /** The signature string. */
-    uint8_t     szSignature[sizeof(PDB_SIGNATURE_700)];
+    KU8         szSignature[sizeof(PDB_SIGNATURE_700)];
     /** The page size. */
-    uint32_t    cbPage;
+    KU32        cbPage;
     /** The start page. */
     PDB70PAGE   iStartPage;
@@ -274 +147 @@
     PDB70PAGE   cPages;
     /** The root stream directory. */
-    uint32_t    cbRoot;
+    KU32        cbRoot;
     /** Unknown function, always 0. */
-    uint32_t    u32Reserved;
+    KU32        u32Reserved;
     /** The page index of the root page table. */
     PDB70PAGE   iRootPages;
@@ -287 +160 @@
 {
     /** The number of streams */
-    uint32_t    cStreams;
+    KU32        cStreams;
     /** Array of streams. */
     PDB70STREAM aStreams[1];
-    /* uint32_t aiPages[] */
+    /* KU32 aiPages[] */
 } PDB70ROOT, *PPDB70ROOT;
 
@@ -299 +172 @@
 {
     /** The structure version. */
-    uint32_t        Version;
+    KU32            Version;
     /** Timestamp.  */
-    uint32_t        TimeStamp;
+    KU32            TimeStamp;
     /** Unknown. */
-    uint32_t        Unknown1;
+    KU32            Unknown1;
     /** GUID. */
-    uint32_t        u32Guid[4];
+    KU32            u32Guid[4];
     /** The size of the following name table. */
-    uint32_t        cbNames;
+    KU32            cbNames;
     /** The name table. */
     char            szzNames[1];
@@ -341 +214 @@
 static size_t Pdb70Align(PPDB70HDR pHdr, size_t cb)
 {
-    if (cb == ~(uint32_t)0 || !cb)
+    if (cb == ~(KU32)0 || !cb)
         return 0;
     return ((cb + pHdr->cbPage - 1) / pHdr->cbPage) * pHdr->cbPage;
@@ -349 +222 @@
 static size_t Pdb70Pages(PPDB70HDR pHdr, size_t cb)
 {
-    if (cb == ~(uint32_t)0 || !cb)
+    if (cb == ~(KU32)0 || !cb)
         return 0;
     return (cb + pHdr->cbPage - 1) / pHdr->cbPage;
@@ -358 +231 @@
     const size_t    cbPage = pHdr->cbPage;
     size_t          cPages = Pdb70Pages(pHdr, cb);
-    uint8_t *pbBuf = malloc(cPages * cbPage + 1);
+    KU8            *pbBuf = malloc(cPages * cbPage + 1);
     if (pbBuf)
     {
@@ -368 +241 @@
             {
                 off *= cbPage;
-                memcpy(pbBuf + iPage * cbPage, (uint8_t *)pHdr + off, cbPage);
+                memcpy(pbBuf + iPage * cbPage, (KU8 *)pHdr + off, cbPage);
                 dump(pbBuf + iPage * cbPage, iPage + 1 < cPages ? cbPage : cb % cbPage, off);
             }
@@ -393 +266 @@
      * (Todo: Check if we can just use the stream #0 size..)
      */
-    PPDB70PAGE piPageMap = (uint32_t *)((uint8_t *)pHdr + pHdr->iRootPages * pHdr->cbPage);
+    PPDB70PAGE piPageMap = (KU32 *)((KU8 *)pHdr + pHdr->iRootPages * pHdr->cbPage);
     PPDB70ROOT pRoot = Pdb70AllocAndRead(pHdr, pHdr->cbRoot, piPageMap);
     if (pRoot)
@@ -400 +273 @@
         /* This stuff is probably unnecessary: */
         /* size = stream header + array of stream. */
-        size_t cb = OFFSETOF(PDB70ROOT, aStreams[pRoot->cStreams]);
+        size_t cb = K_OFFSETOF(PDB70ROOT, aStreams[pRoot->cStreams]);
         free(pRoot);
         pRoot = Pdb70AllocAndRead(pHdr, cb, piPageMap);
@@ -408 +281 @@
             unsigned iStream = pRoot->cStreams;
             while (iStream-- > 0)
-                if (pRoot->aStreams[iStream].cbStream != ~(uint32_t)0)
+                if (pRoot->aStreams[iStream].cbStream != ~(KU32)0)
                     cb += Pdb70Pages(pHdr, pRoot->aStreams[iStream].cbStream) * sizeof(PDB70PAGE);
             free(pRoot);
@@ -431 +304 @@
     PPDB70PAGE      paiPageMap;
     if (    iStream >= pRoot->cStreams
-        ||  cbStream == ~(uint32_t)0)
+        ||  cbStream == ~(KU32)0)
     {
         fprintf(stderr, "%s: error: Invalid stream %d\n", argv0, iStream);
@@ -439 +312 @@
     paiPageMap = (PPDB70PAGE)&pRoot->aStreams[pRoot->cStreams];
     while (iStream-- > 0)
-        if (pRoot->aStreams[iStream].cbStream != ~(uint32_t)0)
+        if (pRoot->aStreams[iStream].cbStream != ~(KU32)0)
             paiPageMap += Pdb70Pages(pHdr, pRoot->aStreams[iStream].cbStream);
 
@@ -447 +320 @@
 }
 
-static int Pdb70Process(uint8_t *pbFile, size_t cbFile)
+static int Pdb70Process(KU8 *pbFile, size_t cbFile)
 {
     PPDB70HDR   pHdr = (PPDB70HDR)pbFile;
@@ -477 +350 @@
         if (    pNames->Version == PDB70NAMES_VERSION
             &&  pNames->cbNames > 32
-            &&  pNames->cbNames + offsetof(PDB70NAMES, szzNames) <= pRoot->aStreams[1].cbStream)
+            &&  pNames->cbNames + K_OFFSETOF(PDB70NAMES, szzNames) <= pRoot->aStreams[1].cbStream)
         {
             /*
@@ -529 +402 @@
         for (iStream = 0; iStream < pRoot->cStreams && !rc; iStream++)
         {
-            uint8_t *pbStream;
-            if (    pRoot->aStreams[iStream].cbStream == ~(uint32_t)0
+            KU8 *pbStream;
+            if (    pRoot->aStreams[iStream].cbStream == ~(KU32)0
                 ||  !pRoot->aStreams[iStream].cbStream)
                 continue;
             dprintf(("Stream #%d: %#x bytes (%#x aligned)\n", iStream, pRoot->aStreams[iStream].cbStream,
                      Pdb70Align(pHdr, pRoot->aStreams[iStream].cbStream)));
-            pbStream = (uint8_t *)Pdb70AllocAndReadStream(pHdr, pRoot, iStream, &cbStream);
+            pbStream = (KU8 *)Pdb70AllocAndReadStream(pHdr, pRoot, iStream, &cbStream);
             if (pbStream)
             {
@@ -562 +435 @@
 
 /** A PDB 2.0 Page number. */
-typedef uint16_t PDB20PAGE;
+typedef KU16 PDB20PAGE;
 /** Pointer to a PDB 2.0 Page number. */
 typedef PDB20PAGE *PPDB20PAGE;
@@ -572 +445 @@
 {
     /** The size of the stream. */
-    uint32_t    cbStream;
+    KU32        cbStream;
     /** Some unknown value. */
-    uint32_t    u32Unknown;
+    KU32        u32Unknown;
 } PDB20STREAM, *PPDB20STREAM;
 
@@ -585 +458 @@
 {
     /** The signature string. */
-    uint8_t     szSignature[sizeof(PDB_SIGNATURE_200)];
+    KU8         szSignature[sizeof(PDB_SIGNATURE_200)];
     /** The page size. */
-    uint32_t    cbPage;
+    KU32        cbPage;
     /** The start page - whatever that is... */
     PDB20PAGE   iStartPage;
@@ -604 +477 @@
 {
     /** The number of streams */
-    uint16_t    cStreams;
+    KU16        cStreams;
     /** Reserved or high part of cStreams. */
-    uint16_t    u16Reserved;
+    KU16        u16Reserved;
     /** Array of streams. */
     PDB20STREAM aStreams[1];
@@ -629 +502 @@
 static size_t Pdb20Pages(PPDB20HDR pHdr, size_t cb)
 {
-    if (cb == ~(uint32_t)0 || !cb)
+    if (cb == ~(KU32)0 || !cb)
         return 0;
     return (cb + pHdr->cbPage - 1) / pHdr->cbPage;
@@ -637 +510 @@
 {
     size_t cPages = Pdb20Pages(pHdr, cb);
-    uint8_t *pbBuf = malloc(cPages * pHdr->cbPage + 1);
+    KU8   *pbBuf = malloc(cPages * pHdr->cbPage + 1);
     if (pbBuf)
     {
@@ -645 +518 @@
             size_t off = paiPageMap[iPage];
             off *= pHdr->cbPage;
-            memcpy(pbBuf + iPage * pHdr->cbPage, (uint8_t *)pHdr + off, pHdr->cbPage);
+            memcpy(pbBuf + iPage * pHdr->cbPage, (KU8 *)pHdr + off, pHdr->cbPage);
             iPage++;
         }
@@ -665 +538 @@
     {
         /* size = stream header + array of stream. */
-        size_t cb = OFFSETOF(PDB20ROOT, aStreams[pRoot->cStreams]);
+        size_t cb = K_OFFSETOF(PDB20ROOT, aStreams[pRoot->cStreams]);
         free(pRoot);
         pRoot = Pdb20AllocAndRead(pHdr, cb, &pHdr->aiRootPageMap[0]);
@@ -673 +546 @@
             unsigned iStream = pRoot->cStreams;
             while (iStream-- > 0)
-                if (pRoot->aStreams[iStream].cbStream != ~(uint32_t)0)
+                if (pRoot->aStreams[iStream].cbStream != ~(KU32)0)
                     cb += Pdb20Pages(pHdr, pRoot->aStreams[iStream].cbStream) * sizeof(PDB20PAGE);
             free(pRoot);
@@ -693 +566 @@
     PPDB20PAGE  paiPageMap;
     if (    iStream >= pRoot->cStreams
-        ||  cbStream == ~(uint32_t)0)
+        ||  cbStream == ~(KU32)0)
     {
         fprintf(stderr, "%s: error: Invalid stream %d\n", argv0, iStream);
@@ -701 +574 @@
     paiPageMap = (PPDB20PAGE)&pRoot->aStreams[pRoot->cStreams];
     while (iStream-- > 0)
-        if (pRoot->aStreams[iStream].cbStream != ~(uint32_t)0)
+        if (pRoot->aStreams[iStream].cbStream != ~(KU32)0)
             paiPageMap += Pdb20Pages(pHdr, pRoot->aStreams[iStream].cbStream);
 
@@ -709 +582 @@
 }
 
-static int Pdb20Process(uint8_t *pbFile, size_t cbFile)
+static int Pdb20Process(KU8 *pbFile, size_t cbFile)
 {
     PPDB20HDR   pHdr = (PPDB20HDR)pbFile;
@@ -732 +605 @@
     for (iStream = 0; iStream < pRoot->cStreams && !rc; iStream++)
     {
-        uint8_t *pbStream;
-        if (pRoot->aStreams[iStream].cbStream == ~(uint32_t)0)
+        KU8 *pbStream;
+        if (pRoot->aStreams[iStream].cbStream == ~(KU32)0)
             continue;
-        pbStream = (uint8_t *)Pdb20AllocAndReadStream(pHdr, pRoot, iStream, NULL);
+        pbStream = (KU8 *)Pdb20AllocAndReadStream(pHdr, pRoot, iStream, NULL);
         if (pbStream)
         {
@@ -756 +629 @@
 {
     size_t      cbFile;
-    uint8_t    *pbFile;
+    KU8        *pbFile;
+    void       *pvOpaque;
     int         rc = 0;
 
@@ -762 +636 @@
      * Read the file into memory.
      */
-    pbFile = (uint8_t *)ReadFileIntoMemory(pInput, &cbFile);
+    pbFile = (KU8 *)depReadFileIntoMemory(pInput, &cbFile, &pvOpaque);
     if (!pbFile)
         return 1;
@@ -779 +653 @@
     }
 
-    FreeFileMemory(pbFile);
+    depFreeFileMemory(pbFile, pvOpaque);
     return rc;
 }

trunk/src/lib/kDep.c

@@ -35 +35 @@
 #include <sys/stat.h>
 #include "k/kDefs.h"
+#include "k/kTypes.h"
 #if K_OS == K_OS_WINDOWS
-# include <windows.h>
+# define USE_WIN_MMAP
+# include <io.h>
+# include <Windows.h>
  extern void nt_fullpath(const char *pszPath, char *pszFull, size_t cchFull); /* nt_fullpath.c */
 #else
@@ -294 +297 @@
    this is one of the algorithms used in berkeley db (see sleepycat) and
    elsewhere. */
-static unsigned sdbm(const char *str)
+static unsigned sdbm(const char *str, size_t size)
 {
     unsigned hash = 0;
     int c;
 
-    while ((c = *(unsigned const char *)str++))
+    while (size-- > 0 && (c = *(unsigned const char *)str++))
         hash = c + (hash << 6) + (hash << 16) - hash;
 
@@ -310 +313 @@
  *
  * @returns Pointer to the allocated dependency.
- * @param   pszFilename     The filename.
+ * @param   pszFilename     The filename. Does not need to be terminated.
  * @param   cchFilename     The length of the filename.
  */
 PDEP depAdd(const char *pszFilename, size_t cchFilename)
 {
-    unsigned uHash = sdbm(pszFilename);
-    PDEP    pDep;
-    PDEP    pDepPrev;
+    unsigned    uHash = sdbm(pszFilename, cchFilename);
+    PDEP        pDep;
+    PDEP        pDepPrev;
 
     /*
@@ -341 +344 @@
 
     pDep->cchFilename = cchFilename;
-    memcpy(pDep->szFilename, pszFilename, cchFilename + 1);
+    memcpy(pDep->szFilename, pszFilename, cchFilename);
+    pDep->szFilename[cchFilename] = '\0';
     pDep->uHash = uHash;
 
@@ -373 +377 @@
 }
 
+
+/**
+ * Performs a hexdump.
+ */
+void depHexDump(const KU8 *pb, size_t cb, size_t offBase)
+{
+    const unsigned      cchWidth = 16;
+    size_t              off = 0;
+    while (off < cb)
+    {
+        unsigned i;
+        printf("%s%0*x %04x:", off ? "\n" : "", sizeof(pb) * 2, offBase + off, off);
+        for (i = 0; i < cchWidth && off + i < cb ; i++)
+            printf(off + i < cb ? !(i & 7) && i ? "-%02x" : " %02x" : "   ", pb[i]);
+
+        while (i++ < cchWidth)
+                printf("   ");
+        printf(" ");
+
+        for (i = 0; i < cchWidth && off + i < cb; i++)
+        {
+            const KU8 u8 = pb[i];
+            printf("%c", u8 < 127 && u8 >= 32 ? u8 : '.', 1);
+        }
+        off += cchWidth;
+        pb  += cchWidth;
+    }
+    printf("\n");
+}
+
+
+/**
+ * Reads the file specified by the pInput file stream into memory.
+ *
+ * @returns The address of the memory mapping on success. This must be
+ *          freed by calling depFreeFileMemory.
+ *
+ * @param   pInput      The file stream to load or map into memory.
+ * @param   pcbFile     Where to return the mapping (file) size.
+ * @param   ppvOpaque   Opaque data when mapping, otherwise NULL.
+ */
+void *depReadFileIntoMemory(FILE *pInput, size_t *pcbFile, void **ppvOpaque)
+{
+    void       *pvFile;
+    long        cbFile;
+
+    /*
+     * Figure out file size.
+     */
+#if defined(_MSC_VER)
+    cbFile = _filelength(fileno(pInput));
+    if (cbFile < 0)
+#else
+    if (    fseek(pInput, 0, SEEK_END) < 0
+        ||  (cbFile = ftell(pInput)) < 0
+        ||  fseek(pInput, 0, SEEK_SET))
+#endif
+    {
+        fprintf(stderr, "kDep: error: Failed to determin file size.\n");
+        return NULL;
+    }
+    if (pcbFile)
+        *pcbFile = cbFile;
+
+    /*
+     * Try mmap first.
+     */
+#ifdef USE_WIN_MMAP
+    {
+        HANDLE hMapObj = CreateFileMapping((HANDLE)_get_osfhandle(fileno(pInput)),
+                                           NULL, PAGE_READONLY, 0, cbFile, NULL);
+        if (hMapObj != NULL)
+        {
+            pvFile = MapViewOfFile(hMapObj, FILE_MAP_READ, 0, 0, cbFile);
+            if (pvFile)
+            {
+                *ppvOpaque = hMapObj;
+                return pvFile;
+            }
+            fprintf(stderr, "kDep: warning: MapViewOfFile failed, %d.\n", GetLastError());
+            CloseHandle(hMapObj);
+        }
+        else
+            fprintf(stderr, "kDep: warning: CreateFileMapping failed, %d.\n", GetLastError());
+    }
+
+#endif
+
+    /*
+     * Allocate memory and read the file.
+     */
+    pvFile = malloc(cbFile + 1);
+    if (pvFile)
+    {
+        if (fread(pvFile, cbFile, 1, pInput))
+        {
+            ((KU8 *)pvFile)[cbFile] = '\0';
+            *ppvOpaque = NULL;
+            return pvFile;
+        }
+        fprintf(stderr, "kDep: error: Failed to read %ld bytes.\n", cbFile);
+        free(pvFile);
+    }
+    else
+        fprintf(stderr, "kDep: error: Failed to allocate %ld bytes (file mapping).\n", cbFile);
+    return NULL;
+}
+
+
+/**
+ * Free resources allocated by depReadFileIntoMemory.
+ *
+ * @param   pvFile      The address of the memory mapping.
+ * @param   pvOpaque    The opaque value returned together with the mapping.
+ */
+void depFreeFileMemory(void *pvFile, void *pvOpaque)
+{
+#if defined(USE_WIN_MMAP)
+    if (pvOpaque)
+    {
+        UnmapViewOfFile(pvFile);
+        CloseHandle(pvOpaque);
+        return;
+    }
+#endif
+    free(pvFile);
+}
+

trunk/src/lib/kDep.h

@@ -46 +46 @@
 extern void depPrintStubs(FILE *pOutput);
 extern void depCleanup(void);
+extern void *depReadFileIntoMemory(FILE *pInput, size_t *pcbFile, void **ppvOpaque);
+extern void depFreeFileMemory(void *pvFile, void *pvOpaque);
+#ifdef ___k_kTypes_h___
+extern void depHexDump(const KU8 *pb, size_t cb, size_t offBase);
+#endif
 
 #endif