Changeset 1120

Timestamp:

Jan 30, 2004, 9:51:36 PM (22 years ago)

Author:

bird

Message:

Shit, weak_mod_name was for the new weak handling.

File:

• trunk/src/emx/src/emxomf/emxomf.c (modified) (5 diffs, 1 prop)

trunk/src/emx/src/emxomf/emxomf.c

@@ -2788 +2788 @@
   return psz - dst;
 }
-#endif 
+#endif
 
 /* Derive the module name and store it in the mod_name variable.
    Derive the current director and store it in the base_dir variable.
-   
+
    Search the symbol table for N_SO symbols. There are two kinds, base dir
    and main source file name. The base dir one ends with a slash.
-   
-   We assume that the base dir name comes first, and that is it's prefect 
+
+   We assume that the base dir name comes first, and that is it's prefect
    but maybe for a drive letter.
-   
+
    If there is no such symbol, use the output file name. */
 
@@ -2828 +2828 @@
             convert_filename (mod_name);
             /* The base dir doesn't currently have any drive letter.
-               steal that from the source filename if possible. 
+               steal that from the source filename if possible.
                ASSUME: that it's more like that source is right than curdir
                        bacause of stuff like makeomflibs.cmd and autoconv. */
@@ -2857 +2857 @@
   else if (   (base_dir[0] == '\\' ||  base_dir[0] == '/')
            &&  base_dir[1] != '\\' &&  base_dir[1] != '/') /* unc */
-    {   /* make it absolute using current drive */ 
+    {   /* make it absolute using current drive */
       len = strlen(base_dir) + 1;
       memmove(base_dir + 2, base_dir, len);
@@ -2864 +2864 @@
     }
 
-  /* do we need a weak module name? */
-  if (weak_list_filename)
-    {
-      /* Find the base name and length (excluding extension)
-         This is used for weak symbol handling. */
-      for (p1 = "\\/:", p2 = mod_name; *p1; p1++)
-        if ((p3 = strrchr(p2, *p1)) != NULL)
-          p2 = p3 + 1;
-      for (p3 = weak_mod_name; *p2; p2++)
-        if (isalnum(*p2) || *p2 == '$' || *p2 == '_' || *p2 == '@')
-            *p3++ = *p2;
-      *p3 = '\0';
-    }
+  /* Find the base name and length (excluding extension)
+     This is used for weak symbol handling. */
+  for (p1 = "\\/:", p2 = mod_name; *p1; p1++)
+    if ((p3 = strrchr(p2, *p1)) != NULL)
+      p2 = p3 + 1;
+  for (p3 = weak_mod_name; *p2; p2++)
+    if (isalnum(*p2) || *p2 == '$' || *p2 == '_' || *p2 == '@')
+        *p3++ = *p2;
+    else if (*p2 == '.')
+        *p3++ = '_';
+  *p3 = '\0';
 }
 
@@ -2980 +2978 @@
   int i;
   char *psz;
-  
+
   /* canonize the filename - slashes and possibly abs path. */
   if (name[0] != '/' && name[0] != '\\' && name[1] != ':')