Changeset 2673 for trunk/emx/src/emxomf/emxomfld.c

Timestamp:

Mar 19, 2006, 6:21:22 AM (19 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.

File:

• trunk/emx/src/emxomf/emxomfld.c (modified) (10 diffs)

trunk/emx/src/emxomf/emxomfld.c

@@ -349 +349 @@
           if (response_file == NULL)
             {
+              int fd;
 
               /* Complain if we are not allowed to use a response
@@ -363 +364 @@
 
               strcpy (response_fname, "ldXXXXXX");
-              if (mktemp (response_fname) == NULL)
+              fd = mkstemp (response_fname);
+              if (fd < 0)
                 {
                   perror ("emxomfld");
                   exit (2);
                 }
+              close(fd);
               response_file = fopen (response_fname, "wt");
               if (response_file == NULL)
@@ -1161 +1164 @@
 static void arg_init (int rsp)
 {
-  response_fname[0] = '\0';
+  if (response_fname[0] != '\0')
+    {
+      remove (response_fname);
+      response_fname[0] = '\0';
+    }
   command_line[0] = '\0';
   line_len = 0;
@@ -1496 +1503 @@
                   fprintf (stderr,
                            "emxomfld: multiple module definition files\n");
-                  usage ();
+                  return 1;
                 }
               def_fname = _realrealpath(optarg, NULL, 0);
@@ -1512 +1519 @@
                   fprintf (stderr,
                            "emxomfld: multiple binary resource files\n");
-                  usage ();
+                  return 1;
                 }
               res_fname = _realrealpath(optarg, NULL, 0);
@@ -1585 +1592 @@
                 {
                   fprintf (stderr, "emxomfld: multiple map files files\n");
-                  usage ();
+                  return 1;
                 }
             map_fname = optarg;
@@ -1593 +1600 @@
         case OPT_ZSTACK:
           if (!optarg)
-            usage ();
+            return 1;
           errno = 0;
           stack_size = strtol (optarg, &t, 0);
           if (errno != 0 || *t != 0 || t == optarg)
-            usage ();
+            return 1;
           break;
 
@@ -1622 +1629 @@
           if (optind > 1)
             fprintf (stderr, "emxomfld: invalid option (%s)\n", argv[optind - 1]);
-          usage ();
+          else
+            usage ();
+          return 1;
         }
     }
@@ -1639 +1648 @@
     {
       fprintf (stderr, "emxomfld: no input files\n");
-      usage ();
+      return 1;
     }
 
@@ -1656 +1665 @@
   else if (map_fname == NULL)
     {
-      t = xstrdup (output_fname);
+      int cch = strlen (output_fname) + 1;
+      t = xmalloc (cch + 4);
+      memcpy (t, output_fname, cch);
       _remext (t);
+      strcat (t, ".map");
       map_fname = t;
     }