Changeset 1116 for trunk/src

Timestamp:

Jan 30, 2004, 4:37:05 AM (22 years ago)

Author:

bird

Message:

#733: fixed source file matching and completion.

File:

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

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

@@ -347 +347 @@
 /* This variable holds the module name.  See get_mod_name(). */
 static char mod_name[256];
+
+/* This variable holds the base(=current) directory.  See get_mod_name(). */
+static char base_dir[256];
 
 /* This variable holds a normalized module name used with weak syms.  See get_mod_name(). */
@@ -651 +654 @@
 {
   FILE *wf;
+  char line [1024];
 
 
@@ -670 +674 @@
   */
 
-  char line [1024];
   while (fgets (line, sizeof (line), wf))
     {
@@ -2763 +2766 @@
 }
 
+#if 0
 /* Converts dashed filenames to somewhat absolute ones assuming that
    the current directory is what they're relative to. */
@@ -2784 +2788 @@
   return psz - dst;
 }
-
-/* Derive the module name and store it to the mod_name variable.
-   Search the symbol table for an N_SO symbol.  If there is no such
-   symbol, use the output file name. */
+#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 
+   but maybe for a drive letter.
+   
+   If there is no such symbol, use the output file name. */
 
 static void get_mod_name (void)
@@ -2795 +2807 @@
   char *p3;
 
+  base_dir[0] = '\0';
   ok = FALSE;
   for (i = 0; i < sym_count; ++i)
@@ -2801 +2814 @@
         p1 = str_ptr + sym_ptr[i].n_un.n_strx;
         len = strlen (p1);
-        if (len > 0 && p1[len-1] != '/')
+        if (len > 0 && p1[len-1] == '/' )
+          {
+            if (!base_dir[0])
+              {
+                _strncpy (base_dir, p1, sizeof(base_dir));
+                convert_filename (base_dir);
+              }
+          }
+        else if (len > 0)
           {
             ok = TRUE;
             _strncpy (mod_name, p1, sizeof (mod_name));
             convert_filename (mod_name);
+            /* The base dir doesn't currently have any drive letter.
+               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. */
+            if (   (base_dir[0] == '\\' ||  base_dir[0] == '/')
+                &&  base_dir[1] != '\\' &&  base_dir[1] != '/' /* unc */
+                &&  mod_name[1] == ':')
+              {
+                len = strlen(base_dir) + 1;
+                memmove(base_dir + 2, base_dir, len);
+                base_dir[0] = mod_name[0];
+                base_dir[1] = mod_name[1];
+              }
             break;
           }
@@ -2818 +2852 @@
     }
 
-  /* Find the base name and lenght (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';
+  /* make sure we have base_dir and that it's an abspath */
+  if (!base_dir[0])
+      getcwd(base_dir, sizeof(base_dir));
+  else if (   (base_dir[0] == '\\' ||  base_dir[0] == '/')
+           &&  base_dir[1] != '\\' &&  base_dir[1] != '/') /* unc */
+    {   /* make it absolute using current drive */ 
+      len = strlen(base_dir) + 1;
+      memmove(base_dir + 2, base_dir, len);
+      base_dir[0] = _getdrive();
+      base_dir[1] = ':';
+    }
+
+  /* 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';
+    }
 }
 
@@ -2929 +2979 @@
 {
   int i;
-
+  char *psz;
+  
+  /* canonize the filename - slashes and possibly abs path. */
+  if (name[0] != '/' && name[0] != '\\' && name[1] != ':')
+    { /* need to add base_dir. */
+      int cch1 = strlen(base_dir);
+      int cch2 = strlen(name) + 1;
+      psz = xmalloc(cch1 + cch2);
+      memcpy(psz, base_dir, cch1);
+      memcpy(psz + cch1, name, cch2);
+    }
+  else
+    psz = xstrdup(name);
+  convert_filename(psz);
+
+  /* search for previous instances */
   for (i = 0; i < file_grow.count; ++i)
-    if (strcmp (file_list[i], name) == 0)
-      return i;
+    if (!strcmp(file_list[i], psz))
+      {
+        free(psz);
+        return i;
+      }
+
+  /* new source file, add it if possible. */
   if (hll_version <= 3 && file_grow.count >= 255)
     {
       warning ("Too many source files, cannot convert line number info");
+      free(psz);
       return file_grow.count;
     }
   grow_by (&file_grow, 1);
   i = file_grow.count++;
-  file_list[i] = xstrdup (name);
+  file_list[i] = psz;
   return i;
 }
@@ -3070 +3141 @@
   if (valid_lines <= 0 || file_grow.count <= 0)
       return;
-
-  /* Make the paths absolute - TODO: this might be done by GCC as well.. */
-
-  for (i = 0; i < file_grow.count; ++i)
-    {
-      char buf[260];
-      len = abspath_filename (buf, file_list[i], 255);
-      file_list[i] = xrealloc(file_list[i], len + 1);
-      memcpy(file_list[i], buf, len + 1);
-    }
 
   /* Compute the size of the file names table. */