Changeset 2513 for branches/libc-0.6/src/emx

Timestamp:

Feb 3, 2006, 10:48:10 PM (20 years ago)

Author:

bird

Message:

Bug 20, fixed: use libiberty make_temp_file instead of big, clumsy and unsafe mktemp stuff.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/ld/ld.c (modified) (20 diffs)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -2 +2 @@
 
 TODO: open replace on RAMFS fails with error 32!
+
+2006-02-03: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - ld:
+        o #20: use make_temp_file instead of mktemp. This involved including
+          libiberty.h which required some adjustments of duplicate code to work.
 
 2006-01-18: knut st. osmundsen <bird-gccos2-spam@anduin.net>

branches/libc-0.6/src/emx/src/ld/ld.c

@@ -43 +43 @@
 #include <string.h>
 #endif
+#include "libiberty.h"
 
 #if !defined(A_OUT)
@@ -872 +873 @@
 int cl_refs_allocated;
 
-char *xmalloc (int);
-void *xrealloc (void *, int);
+void *xmalloc (size_t);
+void *xrealloc (void *, size_t);
 void usage (char *, char *);
 void fatal (char *, ...);
@@ -899 +900 @@
 void symtab_init (void);
 void padfile (int, int);
-char *concat (const char *, const char *, const char *);
 char *get_file_name (struct file_entry *);
 symbol *getsym (char *), *getsym_soft (char *);
@@ -1213 +1213 @@
           discard_locals = DISCARD_ALL;
           break;
-        
+
         case 'y':
           {
@@ -1242 +1242 @@
           search_dirs[n_search_dirs - 1] = optarg;
           break;
-        
+
         case 'M':
           write_map = 1;
@@ -1309 +1309 @@
               = (struct string_list_element *)
                 xmalloc (sizeof (struct string_list_element));
-        
+
             new->str = optarg;
             new->next = set_element_prefixes;
@@ -1392 +1392 @@
 
         case 'l':
-          p->filename = concat ("", optarg, "");
-          p->local_sym_name = concat ("-l", optarg, "");
+          p->filename = concat ("", optarg, "", NULL);
+          p->local_sym_name = concat ("-l", optarg, "", NULL);
           p->search_dirs_flag = 1;
           p->dynamic = !opt_libs_static;
@@ -1612 +1612 @@
         {
           int lendir = strlen (search_dirs[i]);
-          register char *string = xmalloc (lendir + lenname + 4 + 6 + 1);
+          register char *string = (char *) xmalloc (lendir + lenname + 4 + 6 + 1);
           int j;
 
@@ -2483 +2483 @@
                          entry->filename);
                 read_entry_symbols (desc, subentry);
-                subentry->strings = xmalloc (subentry->strs_size);
+                subentry->strings = (char *) xmalloc (subentry->strs_size);
                 read_entry_strings (desc, subentry);
 
@@ -3419 +3419 @@
           if (!demangler || !(nm = (*demangler)(g->name)))
             nm = g->name;
-          errmsg = xmalloc (strlen (errfmt) + strlen (nm) + 1);
+          errmsg = (char *) xmalloc (strlen (errfmt) + strlen (nm) + 1);
           sprintf (errmsg, errfmt, nm, data_segment ? "data" : "text");
           if (nm != g->name)
@@ -3854 +3854 @@
 void check_exe (void)
 {
-  char *ext, *tmp_dir;
-  size_t tmp_dir_len;
+  char *ext;
 
   if (exe_flag)
@@ -3867 +3866 @@
       {
         touch_filename = output_filename;
-        exe_filename = concat (output_filename, ".exe", "");
+        exe_filename = concat (output_filename, ".exe", NULL);
       }
     }
@@ -3887 +3886 @@
   /* Create a temporary a.out executable file. */
 
-  tmp_dir = getenv ("TMPDIR");
-  if (tmp_dir == NULL) tmp_dir = getenv ("TMP");
-  if (tmp_dir == NULL) tmp_dir = getenv ("TEMP");
-  if (tmp_dir == NULL) tmp_dir = ".";
-  tmp_dir_len = strlen (tmp_dir);
-  output_filename = xmalloc (tmp_dir_len + 10);
-  memcpy (output_filename, tmp_dir, tmp_dir_len);
-  if (tmp_dir_len != 0 && strchr ("\\/:", tmp_dir[tmp_dir_len-1]) == NULL)
-    output_filename[tmp_dir_len++] = '\\';
-  strcpy (output_filename + tmp_dir_len, "ldXXXXXX");
-  if (mktemp (output_filename) == NULL)
-    fatal ("mktemp(\"%s\") failed", output_filename);
+  output_filename = make_temp_file ("ldXXXXXX");
 
   if (rsxnt_linked != EMX_DEFAULT && strip_symbols != STRIP_NONE) /* RSXNT */
@@ -5051 +5039 @@
         if (strncmp (tmp, "-l", 2) != 0
             && (len < 2 || strcmp (tmp+len-2, ".o") != 0))
-          tmp = concat (tmp, ".o", "");   /* Needed by GDB */
+          tmp = concat (tmp, ".o", NULL);   /* Needed by GDB */
         nl.n_un.n_strx = assign_string_table_index (tmp);
       }
@@ -5397 +5385 @@
 
   if (errno < sys_nerr)
-    s = concat ("", sys_errlist[errno], " for %s");
+    s = concat ("", sys_errlist[errno], " for %s", NULL);
   else
     s = "cannot open %s";
@@ -5413 +5401 @@
 
   if (errno < sys_nerr)
-    s = concat ("", sys_errlist[errno], " for ");
+    s = concat ("", sys_errlist[errno], " for ", NULL);
   else
     s = "cannot open ";
@@ -5474 +5462 @@
 }
 
-/* Return a newly-allocated string
-   whose contents concatenate the strings S1, S2, S3.  */
-
-char *
-concat (s1, s2, s3)
-     const char *s1, *s2, *s3;
-{
-  register int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
-  register char *result = (char *) xmalloc (len1 + len2 + len3 + 1);
-
-  strcpy (result, s1);
-  strcpy (result + len1, s2);
-  strcpy (result + len1 + len2, s3);
-  result[len1 + len2 + len3] = 0;
-
-  return result;
-}
-
 /* Parse the string ARG using scanf format FORMAT, and return the result.
    If it does not parse, report fatal error
@@ -5508 +5478 @@
 /* Like malloc but get fatal error if memory is exhausted.  */
 
-char *
+void *
 xmalloc (size)
-     int size;
+     size_t size;
 {
   register char *result = malloc (size);
@@ -5523 +5493 @@
 xrealloc (ptr, size)
      void *ptr;
-     int size;
+     size_t size;
 {
   register char *result = realloc (ptr, size);
@@ -5684 +5654 @@
      */
     pName = (struct lx_tmp *)xmalloc(sizeof(*pName));
-    pName->name = psz = xmalloc(_MAX_PATH);
+    pName->name = psz = (char *)xmalloc(_MAX_PATH);
     if (!make_tempfile(psz, "lddef", ".def"))
     {