Changeset 103503 in vbox for trunk/src/libs/xpcom18a4/xpcom

Timestamp:

Feb 21, 2024 6:47:53 PM (12 months ago)

Author:

vboxsync

Message:

libs/xpcom/xpidl: Some cleanup, bugref:3409

Location:

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl

Files:

• xpidl.c (modified) (3 diffs)
• xpidl_idl.c (modified) (12 diffs)

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl.c

@@ -39 +39 @@
  * Main xpidl program entry point.
  */
+#include <iprt/initterm.h>
 
 #include "xpidl.h"
@@ -94 +95 @@
 }
 
-#if defined(XP_MAC) && defined(XPIDL_PLUGIN)
-#define main xpidl_main
-int xpidl_main(int argc, char *argv[]);
-#endif
-
 int main(int argc, char *argv[])
 {
+    RTR3InitExeNoArguments(0);
+
     int i;
     IncludePathEntry *inc, *inc_head, **inc_tail;
@@ -111 +109 @@
 
     inc_head = xpidl_malloc(sizeof *inc);
-#ifndef XP_MAC
     inc_head->directory = ".";
-#else
-    inc_head->directory = "";
-#endif
     inc_head->next = NULL;
     inc_tail = &inc_head->next;

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_idl.c

@@ -40 +40 @@
  * Common IDL-processing code.
  */
+#include <iprt/errcore.h>
+#include <iprt/file.h>
+#include <iprt/mem.h>
 
 #include "xpidl.h"
-
-#ifdef XP_MAC
-#include <stat.h>
-#endif
 
 static gboolean parsed_empty_file;
@@ -65 +64 @@
     return TRUE;
 }
-
-#if defined(XP_MAC) && defined(XPIDL_PLUGIN)
-extern void mac_warning(const char* warning_message);
-#endif
 
 static int
@@ -89 +84 @@
     warning_message = g_strdup_printf("%s:%d: %s\n", file, line, message);
 
-#if defined(XP_MAC) && defined(XPIDL_PLUGIN)
-    mac_warning(warning_message);
-#else
     fputs(warning_message, stderr);
-#endif
-
     g_free(warning_message);
     return 1;
@@ -125 +115 @@
 } input_callback_state;
 
-static FILE *
-fopen_from_includes(const char *filename, const char *mode,
-                    IncludePathEntry *include_path)
+static void *
+file_read_from_includes(const char *filename, IncludePathEntry *include_path, size_t *pcbFile)
 {
     IncludePathEntry *current_path = include_path;
     char *pathname;
-    FILE *inputfile;
-    if (!strcmp(filename, "-"))
-        return stdin;
 
     if (filename[0] != '/') {
@@ -141 +127 @@
             if (!pathname)
                 return NULL;
-            inputfile = fopen(pathname, mode);
+            void *pvFile = NULL;
+            int vrc = RTFileReadAll(pathname, &pvFile, pcbFile);
             g_free(pathname);
-            if (inputfile)
-                return inputfile;
+            if (RT_SUCCESS(vrc))
+                return pvFile;
             current_path = current_path->next;
         }
     } else {
-        inputfile = fopen(filename, mode);
-        if (inputfile)
-            return inputfile;
+        void *pvFile = NULL;
+        int vrc = RTFileReadAll(filename, &pvFile, pcbFile);
+        if (RT_SUCCESS(vrc))
+            return pvFile;
     }
     return NULL;
@@ -163 +151 @@
 {
     input_data *new_data;
-    FILE *inputfile;
-    char *buffer = NULL;
-    size_t offset = 0;
-    size_t buffer_size;
-#ifdef XP_MAC
-    size_t i;
-#endif
-
-#if defined(XP_MAC) && defined(XPIDL_PLUGIN)
-    /* on Mac, fopen knows how to find files. */
-    inputfile = fopen(filename, "r");
-#elif defined(XP_OS2) || defined(XP_WIN32)
-    /*
-     * if filename is fully qualified (starts with driver letter), then
-     * just call fopen();  else, go with fopen_from_includes()
-     */
-    if( filename[1] == ':' )
-      inputfile = fopen(filename, "r");
-    else
-      inputfile = fopen_from_includes(filename, "r", include_path);
-#else
-    inputfile = fopen_from_includes(filename, "r", include_path);
-#endif
-
-    if (!inputfile)
-        return NULL;
-
-#ifdef XP_MAC
-    {
-        struct stat input_stat;
-        if (fstat(fileno(inputfile), &input_stat))
-            return NULL;
-        buffer = malloc(input_stat.st_size + 1);
-        if (!buffer)
-            return NULL;
-        offset = fread(buffer, 1, input_stat.st_size, inputfile);
-        if (ferror(inputfile))
-            return NULL;
-    }
-#else
+
     /*
      * Rather than try to keep track of many different varieties of state
      * around the boundaries of a circular buffer, we just read in the entire
      * file.
-     *
-     * We iteratively grow the buffer here; an alternative would be to use
-     * stat to find the exact buffer size we need, as xpt_dump does.
      */
-    for (buffer_size = 8191; ; buffer_size *= 2) {
-        size_t just_read;
-        buffer = realloc(buffer, buffer_size + 1); /* +1 for trailing nul */
-        just_read = fread(buffer + offset, 1, buffer_size - offset, inputfile);
-        if (ferror(inputfile))
-        {
-            free(buffer);
-            return NULL;
-        }
-
-        if (just_read < buffer_size - offset || just_read == 0) {
-            /* Done reading. */
-            offset += just_read;
-            break;
-        }
-        offset += just_read;
-    }
-#endif
-
-    fclose(inputfile);
-
-#ifdef XP_MAC
-    /*
-     * libIDL doesn't speak '\r' properly - always make sure lines end with
-     * '\n'.
-     */
-    for (i = 0; i < offset; i++) {
-        if (buffer[i] == '\r')
-            buffer[i] = '\n';
-    }
-#endif
+    size_t cbFile = 0;
+    void *pvFile = file_read_from_includes(filename, include_path, &cbFile);
+    if (!pvFile)
+        return NULL;
+
+    /* Need to copy the data over into a new buffer in order to be able to append a zero terminator. */
+    char *pbBuf = (char *)RTMemDupEx(pvFile, cbFile, 1 /* for the zero terminator */);
+    if (!pbBuf)
+    {
+        RTFileReadAllFree(pvFile, cbFile);
+        return NULL;
+    }
+
+    memcpy(pbBuf, pvFile, cbFile);
+    RTFileReadAllFree(pvFile, cbFile);
 
     new_data = xpidl_malloc(sizeof (struct input_data));
-    new_data->point = new_data->buf = buffer;
-    new_data->max = buffer + offset;
+    if (!new_data)
+    {
+        RTMemFree(pbBuf);
+        return NULL;
+    }
+
+    new_data->point = new_data->buf = pbBuf;
+    new_data->max = pbBuf + cbFile;
     *new_data->max = '\0';
     new_data->filename = xpidl_strdup(filename);
@@ -251 +187 @@
     new_data->lineno = 2;
     new_data->next = NULL;
-
     return new_data;
 }
@@ -630 +565 @@
             next = data->next;
             free(data->filename);
-            free(data->buf);
+            RTMemFree(data->buf);
             free(data);
             data = next;
@@ -656 +591 @@
 
 /* Pick up unlink. */
-#ifdef XP_UNIX
 #include <unistd.h>
-#elif XP_WIN
-/* We get it from stdio.h. */
-#endif
 
 int
@@ -747 +678 @@
             real_outname = g_strdup(outname);
         } else {
-/*
- *This combination seems a little strange, what about OS/2?
- * Assume it's some build issue
- */
-#if defined(XP_UNIX) || defined(XP_WIN)
+
             if (!file_basename) {
                 out_basename = xpidl_basename(outname);
@@ -757 +684 @@
                 out_basename = outname;
             }
-#else
-            out_basename = outname;
-#endif
+
             real_outname = g_strdup_printf("%s.%s", out_basename, mode->suffix);
             if (out_basename != outname)
@@ -806 +731 @@
          * driver code, if the compiler returns failure.)
          */
-#if defined(XP_UNIX) || defined(XP_WIN)
         if (!ok)
             unlink(real_outname);
-#endif
+
         g_free(real_outname);
     }