Changeset 681

Timestamp:

Sep 10, 2003, 4:39:08 PM (22 years ago)

Author:

bird

Message:

#456: Include files fixes.

File:

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

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

@@ -2725 +2725 @@
 }
 
+/* Converts dashed filenames to somewhat absolute ones assuming that 
+   the current directory is what they're relative to. */
+
+static int abspath_filename(char *dst, const char *src, int size)
+{
+  int   rc = -1;
+  char *psz;
+  
+  if (src[1] != ':' && src[0] != '\\' && src[0] != '/')
+    rc = _abspath(dst, src, size);
+  if (rc)
+  {
+      *dst = '\0';
+      strncat(dst, src, size);
+  }
+
+  for (psz = dst; *psz; psz++)
+    if (*psz == '/')
+      *psz = '\\';
+  return psz - dst;
+}
 
 /* Derive the module name and store it to the mod_name variable.
@@ -2821 +2842 @@
     if (strcmp (file_list[i], name) == 0)
       return i;
-  if (file_grow.count >= 255)
+  if (hll_version <= 3 && file_grow.count >= 255)
     {
       warning ("Too many source files, cannot convert line number info");
@@ -2959 +2980 @@
       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. */
 
@@ -2982 +3012 @@
       put_8 (3);                    /* Entry type: some visual age stuff I believe */
       put_8 (0);                    /* Reserved */
-      put_16 (1);                   /* Count of line number entries */
+      put_16 (file_grow.count);     /* Count of line number entries */
       put_16 (0);                   /* Segment number */
       put_32 (len);                 /* Size of file names table */
@@ -2992 +3022 @@
       for (i = 0; i < file_grow.count; ++i)
         {
-          len = strlen (file_list[i]);
-          if (len > sizeof (buf) - 1)
-            len = sizeof (buf) - 1;
-          memcpy (buf, file_list[i], len);
-          buf[len] = 0;
-          convert_filename (buf);
+          len = strlen(file_list[i]);
           if (started && !fits (1 + len))
             {
@@ -3011 +3036 @@
             }
           put_8 (len);
-          put_mem (buf, len);
+          put_mem (file_list[i], len);
         }
 
@@ -3053 +3078 @@
               }
             put_16 (line_list[i].line);
-            put_16(line_list[i].file_index + 1);
+            put_16 (line_list[i].file_index + 1);
             put_32 (line_list[i].addr);
           }