Changeset 236 for trunk/src/emx/src/emxexp/emxexp.c

Timestamp:

May 26, 2003, 4:43:12 PM (22 years ago)

Author:

zap

Message:

See ChangeLog.

File:

• trunk/src/emx/src/emxexp/emxexp.c (modified) (6 diffs, 1 prop)

trunk/src/emx/src/emxexp/emxexp.c

@@ -27 +27 @@
 #include <errno.h>
 #include <ar.h>
+#include <sys/omflib.h>
+#include <a_out.h>
 #include "defs.h"
-#include <sys/omflib.h>
 #include "demangle.h"
-
-#define VERSION "0.9d"
-#include "../../../../include/innotekversion.h"
 
 struct bss_list
@@ -75 +73 @@
 {
   void *p;
-
+  
   p = malloc (n);
   if (p == NULL)
@@ -90 +88 @@
 {
   void *p;
-
+  
   p = realloc (ptr, n);
   if (p == NULL)
@@ -102 +100 @@
 static void usage (void)
 {
-  fputs ("emxexp " VERSION INNOTEK_VERSION " -- Copyright (c) 1993-1995 by Eberhard Mattes\n\n"
+  fputs ("emxexp " VERSION " -- Copyright (c) 1993-1995 by Eberhard Mattes\n\n"
          "Usage: emxexp [-n] [-u] [-o[<ordinal>] <input_file>...\n\n"
          "Options:\n"
@@ -170 +168 @@
 {
   byte *inp_buf;
-  const struct a_out_header *a_out_h;
+  const struct exec *a_out_h;
   const byte *sym;
   const struct nlist *sym_ptr;
@@ -183 +181 @@
   size = fread (inp_buf, 1, size, inp_file);
 
-  a_out_h = (struct a_out_header *)inp_buf;
-  if (size < sizeof (struct a_out_header) || a_out_h->magic != 0407)
+  a_out_h = (struct exec *)inp_buf;
+  if (size < sizeof (struct exec) || N_MAGIC (*a_out_h) != OMAGIC)
     error ("Malformed input file `%s'", inp_fname);
-  sym = (inp_buf + sizeof (struct a_out_header) + a_out_h->text_size
-         + a_out_h->data_size + a_out_h->trsize + a_out_h->drsize);
-  if (!a_out_h->sym_size)
+  sym = (inp_buf + sizeof (struct exec) + a_out_h->a_text
+         + a_out_h->a_data + a_out_h->a_trsize + a_out_h->a_drsize);
+  if (!a_out_h->a_syms)
     return;
-  str_ptr = sym + a_out_h->sym_size;
+  str_ptr = sym + a_out_h->a_syms;
   if (str_ptr + 4 - inp_buf > size)
     error ("Malformed input file `%s'", inp_fname);
   str_size = *(long *)str_ptr;
   sym_ptr = (const struct nlist *)sym;
-  sym_count = a_out_h->sym_size / sizeof (struct nlist);
+  sym_count = a_out_h->a_syms / sizeof (struct nlist);
   if (str_ptr + str_size - inp_buf > size)
     error ("Malformed input file `%s'", inp_fname);
 
   for (i = 0; i < sym_count; ++i)
-    if (sym_ptr[i].type == (N_TEXT|N_EXT) ||
-        sym_ptr[i].type == (N_DATA|N_EXT) ||
+    if (sym_ptr[i].n_type == (N_TEXT|N_EXT) ||
+        sym_ptr[i].n_type == (N_DATA|N_EXT) ||
         (weak_flag &&
-         (sym_ptr[i].type == N_WEAKT ||
-          sym_ptr[i].type == N_WEAKD)))
+         (sym_ptr[i].n_type == N_WEAKT ||
+          sym_ptr[i].n_type == N_WEAKD)))
       {
-        name = str_ptr + sym_ptr[i].string;
+        name = str_ptr + sym_ptr[i].n_un.n_strx;
         export (name);
       }
-    else if ((sym_ptr[i].type == N_EXT ||
-              sym_ptr[i].type == (N_BSS|N_EXT) ||
-              (weak_flag && sym_ptr[i].type == N_WEAKB)) &&
-             sym_ptr[i].value != 0)
+    else if ((sym_ptr[i].n_type == N_EXT ||
+              sym_ptr[i].n_type == (N_BSS|N_EXT) ||
+              (weak_flag && sym_ptr[i].n_type == N_WEAKB)) &&
+             sym_ptr[i].n_value != 0)
       {
-        name = str_ptr + sym_ptr[i].string;
+        name = str_ptr + sym_ptr[i].n_un.n_strx;
         export_bss (name);
       }