Changeset 455

Timestamp:

Jul 28, 2003, 12:21:05 AM (22 years ago)

Author:

bird

Message:

#416: Check .a libraries too, they might be OMF you know. This makes life easier when porting stuff like doxygen.

File:

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

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

@@ -34 +34 @@
 #include <emx/getopt.h>
 #include <alloca.h>
+#include <sys/omflib.h>
 #include "defs.h"
 
@@ -425 +426 @@
                     szFilename[cchPath++] = '\\';
 
+                  /* Files we're looking for:
+                   *    1. file with .lib extention.
+                   *    2. file with .lib extention and lib prefix.
+                   *    3. file with .a extention which is an OMF library.
+                   *    4. file with .a extention and lib prefix which is an OMF library.
+                   */
                   strcat(strcpy(szFilename + cchPath, list->name), ".lib");
                   fFound = !stat(szFilename, &s);
@@ -431 +438 @@
                       strcat(strcpy(strcpy(szFilename + cchPath, "lib") + 3, list->name), ".lib");
                       fFound = !stat(szFilename, &s);
+                      if (!fFound)
+                        {
+                          strcat(strcpy(szFilename + cchPath, list->name), ".a");
+                          fFound = !stat(szFilename, &s);
+                          if (!fFound)
+                            {
+                              strcat(strcpy(strcpy(szFilename + cchPath, "lib") + 3, list->name), ".a");
+                              fFound = !stat(szFilename, &s);
+                            }
+                          /*
+                           * Is this an OMF library?
+                           * We will open it hand do some verification of the LIBHDR.
+                           */
+                          if (fFound)
+                            {
+                              FILE *pFile = fopen(szFilename, "rb");
+                              fFound = 0;
+                              if (pFile)
+                                {
+                                  #pragma pack(1)
+                                  struct
+                                  {
+                                      byte rec_type;
+                                      word rec_len;
+                                      dword dict_offset;
+                                      word dict_blocks;
+                                      byte flags;
+                                  } libhdr;
+                                  #pragma pack()
+                                  if (  fread(&libhdr, 1, sizeof(libhdr), pFile) == sizeof(libhdr)
+                                      && libhdr.rec_type == LIBHDR
+                                      && libhdr.flags <= 1 /* ASSUME only first bit is used... */
+                                      )
+                                    {
+                                      int page_size = libhdr.rec_len + 3;
+                                      if (   page_size >= 16
+                                          && page_size <= 32768
+                                          && !(page_size & (page_size - 1)) != 0)
+                                          fFound = 1;
+                                    }
+                                  fclose(pFile);
+                                }
+                            }
+                        }
                     }
                 }
@@ -437 +488 @@
 
       put_arg (fFound ? szFilename : list->name, TRUE, TRUE);
+//fprintf(stderr, "%s -> %s\n", list->name, fFound ? szFilename : strpbrk(list->name,     ":\\/.") ? "not searched for" : "not found");
     } /* foreach list entry */
 }
@@ -541 +593 @@
   char tmp[512], *t;
   static char emxshell [200];
+
+  /* Get options from response files (@filename) and wildcard (*.o) on the command. */
+  _response (&argc, &argv);
+  _wildcard (&argc, &argv);
 
   /* Drop EMXSHELL since it can point to a Unix shell which is bad for us */