Changeset 2673 for trunk/emx/src/emxbind

Timestamp:

Mar 19, 2006, 6:21:22 AM (20 years ago)

Author:

bird

Message:

• *:

o Synced over changed from 0.6.1 bugfixing.

• emxbind:

o #38: Fixed truncation bug writing to the LX nametable. (Yuri)
o #38: Imports and exports are limited to 255 not 127 chars. (Yuri)
o #28: Use DLL name from the .def file when present.

• emxomf:

o #70: Demangle symbol names in debug info. (thanks to Yuri)

• emxomfld:

o #55: delete the response file when reinit the args.
o #46: specify .map file extension to the linker.
o #34: Removed all the silliness trying to deal with truncated symbols.
o Don't display usage() on failure, just the error message.
o #20: use mkstemp + close instead of mktemp for the response file.

• ld:

o #20: use make_temp_file instead of mktemp. This involved including

libiberty.h which required some adjustments of duplicate code to work.

o #27: Applied fix from Yuri.

• libmoddef:

o Allow '.' and '@' in LIBRARY/NAME names.

Location:

trunk/emx/src/emxbind

Files:

• emxbind.c (modified) (1 diff)
• emxbind.h (modified) (1 diff)
• export.c (modified) (1 diff)
• fixup.c (modified) (1 diff)
• utils.c (modified) (1 diff)

trunk/emx/src/emxbind/emxbind.c

@@ -160 +160 @@
     case _MD_LIBRARY:
 
-      /* Create a DLL.  Save the initialization and termination
-         policies after choosing default values for unspecified
-         values. */
+      /* Create a DLL. Override the module name if specified. Save the
+         initialization and termination policies after choosing default
+         values for unspecified values. */
 
       dll_flag = TRUE;
+
+      if (stmt->library.name[0] != 0)
+        module_name = xstrdup (stmt->library.name);
+
       switch (stmt->library.init)
         {

trunk/emx/src/emxbind/emxbind.h

@@ -519 +519 @@
 
 void error (const char *fmt, ...) NORETURN2;
+void warning (const char *fmt, ...);
 void my_read (void *dst, size_t size, struct file *f);
 void my_read_str (byte *dst, size_t size, struct file *f);

trunk/emx/src/emxbind/export.c

@@ -76 +76 @@
 
   name_len = strlen (name);
-  if (name_len >= 128)
-    name_len = 127;
+  if (name_len > 255)
+    {
+      warning("truncating export '%s' to 255 chars (ord %d)!", name, ord);
+      blen = 255;
+    }
   else
     blen = (byte)name_len;

trunk/emx/src/emxbind/fixup.c

@@ -285 +285 @@
 
   name_len = strlen (name);
-  if (name_len >= 128)
-    name_len = 127;
   i = 0;
   while (i < procs.len)

trunk/emx/src/emxbind/utils.c

@@ -49 +49 @@
   exit (2);
 }
+
+
+/* Print an warning message. This function is called like  printf().
+   The message will be prefixed with  "emxbind: warning: " and a
+   newline will be added at the end. */
+
+void warning (const char *fmt, ...)
+{
+  va_list arg_ptr;
+
+  va_start (arg_ptr, fmt);
+  fprintf (stderr, "emxbind: warning: ");
+  vfprintf (stderr, fmt, arg_ptr);
+  fputc ('\n', stderr);
+}
+
 
 /* Print an out of memory message and abort. */