anm also works on aal archives now
authorceriel <none@none>
Mon, 18 Nov 1991 09:46:53 +0000 (09:46 +0000)
committerceriel <none@none>
Mon, 18 Nov 1991 09:46:53 +0000 (09:46 +0000)
util/amisc/anm.1
util/amisc/anm.c

index 525377e..48cdff8 100644 (file)
@@ -7,7 +7,8 @@ anm [ \-gnoprus ] [ file ... ]
 .I Anm
 prints the name list (symbol table) of each ack.out(5) format object
 .I file
-in the argument list.
+in the argument list. If an argument is an aal(1) or arch(1) archive,
+a listing of each object file in the archive will be produced.
 If no
 .I file
 is given, the symbols in
index c62b0c6..c0235a1 100644 (file)
@@ -11,6 +11,8 @@
 */
 
 #include       "out.h"
+#include       "arch.h"
+#include       "ranlib.h"
 
 #include       <stdio.h>
 #include       <ctype.h>
@@ -31,12 +33,11 @@ char        *malloc();
 char   *realloc();
 long   s_base[S_MAX];  /* for specially encoded bases */
 char   *filename;
+int    narg;
 
 main(argc, argv)
 char **argv;
 {
-       int     narg;
-       int     compare();
 
        if (--argc>0 && argv[1][0]=='-' && argv[1][1]!=0) {
                argv++;
@@ -82,177 +83,218 @@ char **argv;
        narg = argc;
 
        while(argc--) {
-               struct  outname *nbufp = NULL;
-               struct  outname nbuf;
-               char            *cbufp;
-               long            fi_to_co;
-               long            n;
-               unsigned        readcount;
-               int             i,j;
-
-               read_error = 0;
-               if (! rd_open(*++argv)) {
-                       fprintf(stderr, "anm: cannot open %s\n", *argv);
-                       continue;
-               }
+               int fd;
 
-               filename = *argv;
-               rd_ohead(&hbuf);
-               if (read_error) {
-                       rd_close();
-                       continue;
-               }
-               if (BADMAGIC(hbuf)) {
-                       fprintf(stderr, "anm: %s -- bad format\n", *argv);
-                       rd_close();
+               filename = *++argv;
+               if ((fd = open(filename, 0)) < 0) {
+                       fprintf(stderr, "anm: cannot open %s\n", filename);
                        continue;
                }
-               if (narg > 1)
-                       printf("\n%s:\n", *argv);
+               process(fd);
+               close(fd);
+       }
+       exit(0);
+}
 
-               n = hbuf.oh_nname;
-               if (n == 0) {
-                       fprintf(stderr, "anm: %s -- no name list\n", *argv);
-                       rd_close();
-                       continue;
-               }
+extern int rd_unsigned2();
+extern long lseek();
+extern char *strncpy();
 
-               if (hbuf.oh_nchar == 0) {
-                       fprintf(stderr, "anm: %s -- no names\n", *argv);
-                       rd_close();
-                       continue;
-               }
-               if ((readcount = hbuf.oh_nchar) != hbuf.oh_nchar) {
-                       fprintf(stderr, "anm: string area too big in %s\n", *argv);
-                       exit(2);
+process(fd)
+       int     fd;
+{
+       unsigned int    magic;
+       long            nextpos;
+       struct ar_hdr   archive_header;
+       static char     buf[sizeof(archive_header.ar_name)+1];
+
+       if (narg > 1) printf("\n%s:\n", filename);
+
+       magic = rd_unsigned2(fd);
+       switch(magic) {
+       case O_MAGIC:
+               lseek(fd, 0L, 0);
+               do_file(fd);
+               break;
+       case ARMAG:
+       case AALMAG:
+               while (rd_arhdr(fd, &archive_header)) {
+                       nextpos = lseek(fd, 0L, 1) + archive_header.ar_size;
+                       if (nextpos & 1) nextpos++;
+                       strncpy(buf,archive_header.ar_name,sizeof(archive_header.ar_name));
+                       filename = buf;
+                       if ( strcmp(filename, SYMDEF)) {
+                               printf("\n%s:\n", filename);
+                               do_file(fd);
+                       }
+                       lseek(fd, nextpos, 0);
                }
+               break;
+       default:
+               fprintf(stderr, "anm: %s -- bad format\n", filename);
+               break;
+       }
+}
 
-               /* store special section bases ??? */
-               if (hbuf.oh_flags & HF_8086) {
-                       rd_sect(&sbuf, hbuf.oh_nsect);
-                       if (read_error) {
-                               rd_close();
-                               continue;
-                       }
-                       for (i=0; i<hbuf.oh_nsect; i++) {
-                               s_base[i+S_MIN] =
-                                       (sbuf.os_base>>12) & 03777760;
-                       }
+do_file(fd)
+       int     fd;
+{
+       struct  outname *nbufp = NULL;
+       struct  outname nbuf;
+       char            *cbufp;
+       long            fi_to_co;
+       long            n;
+       unsigned        readcount;
+       int             i,j;
+       int             compare();
+
+       read_error = 0;
+       rd_fdopen(fd);
+
+       rd_ohead(&hbuf);
+       if (read_error) {
+               return;
+       }
+       if (BADMAGIC(hbuf)) {
+               return;
+       }
+
+       n = hbuf.oh_nname;
+       if (n == 0) {
+               fprintf(stderr, "anm: %s -- no name list\n", filename);
+               return;
+       }
+
+       if (hbuf.oh_nchar == 0) {
+               fprintf(stderr, "anm: %s -- no names\n", filename);
+               return;
+       }
+       if ((readcount = hbuf.oh_nchar) != hbuf.oh_nchar) {
+               fprintf(stderr, "anm: string area too big in %s\n", filename);
+               exit(2);
+       }
+
+       /* store special section bases ??? */
+       if (hbuf.oh_flags & HF_8086) {
+               rd_sect(&sbuf, hbuf.oh_nsect);
+               if (read_error) {
+                       return;
                }
-                
-               if ((cbufp = (char *)malloc(readcount)) == NULL) {
-                       fprintf(stderr, "anm: out of memory on %s\n", *argv);
-                       exit(2);
+               for (i=0; i<hbuf.oh_nsect; i++) {
+                       s_base[i+S_MIN] =
+                               (sbuf.os_base>>12) & 03777760;
                }
-               rd_string(cbufp, hbuf.oh_nchar);
+       }
+
+       if ((cbufp = (char *)malloc(readcount)) == NULL) {
+               fprintf(stderr, "anm: out of memory on %s\n", filename);
+               exit(2);
+       }
+       rd_string(cbufp, hbuf.oh_nchar);
+       if (read_error) {
+               free(cbufp);
+               return;
+       }
+
+       fi_to_co = (long) (cbufp - OFF_CHAR(hbuf));
+       i = 0;
+       while (--n >= 0) {
+               rd_name(&nbuf, 1);
                if (read_error) {
-                       free(cbufp);
-                       rd_close();
-                       continue;
+                       break;
                }
 
-               fi_to_co = (long) (cbufp - OFF_CHAR(hbuf));
-               i = 0;
-               while (--n >= 0) {
-                       rd_name(&nbuf, 1);
-                       if (read_error) {
-                               break;
-                       }
+               if (globl_flg && (nbuf.on_type&S_EXT)==0)
+                       continue;
 
-                       if (globl_flg && (nbuf.on_type&S_EXT)==0)
-                               continue;
-
-                       if (undef_flg
-                           &&
-                           ((nbuf.on_type&S_TYP)!=S_UND || (nbuf.on_type&S_ETC)!=0))
-                               continue;
-
-                       if (nbuf.on_foff == 0) nbuf.on_mptr = 0;
-                       else nbuf.on_mptr = (char *) (nbuf.on_foff + fi_to_co);
-
-                       /* adjust value for specially encoded bases */
-                       if (hbuf.oh_flags & HF_8086) {
-                           if (((nbuf.on_type&S_ETC) == 0) ||
-                               ((nbuf.on_type&S_ETC) == S_SCT)) {
-                               j = nbuf.on_type&S_TYP;
-                               if ((j>=S_MIN) && (j<=S_MAX))
-                                   nbuf.on_valu += s_base[j];
-                           }
-                       }
+               if (undef_flg
+                   &&
+                   ((nbuf.on_type&S_TYP)!=S_UND || (nbuf.on_type&S_ETC)!=0))
+                       continue;
 
-                       if (nbufp == NULL)
-                               nbufp = (struct outname *)malloc(sizeof(struct outname));
-                       else
-                               nbufp = (struct outname *)realloc(nbufp, (i+1)*sizeof(struct outname));
-                       if (nbufp == NULL) {
-                               fprintf(stderr, "anm: out of memory on %s\n", *argv);
-                               exit(2);
-                       }
-                       nbufp[i++] = nbuf;
-               }
+               if (nbuf.on_foff == 0) nbuf.on_mptr = 0;
+               else nbuf.on_mptr = (char *) (nbuf.on_foff + fi_to_co);
 
-               if (nbufp && nosort_flg==0)
-                       qsort(nbufp, i, sizeof(struct outname), compare);
+               /* adjust value for specially encoded bases */
+               if (hbuf.oh_flags & HF_8086) {
+                   if (((nbuf.on_type&S_ETC) == 0) ||
+                       ((nbuf.on_type&S_ETC) == S_SCT)) {
+                       j = nbuf.on_type&S_TYP;
+                       if ((j>=S_MIN) && (j<=S_MAX))
+                           nbuf.on_valu += s_base[j];
+                   }
+               }
 
-               for (n=0; n<i; n++) {
-                       char    cs1[4];
-                       char    cs2[4];
+               if (nbufp == NULL)
+                       nbufp = (struct outname *)malloc(sizeof(struct outname));
+               else
+                       nbufp = (struct outname *)realloc(nbufp, (i+1)*sizeof(struct outname));
+               if (nbufp == NULL) {
+                       fprintf(stderr, "anm: out of memory on %s\n", filename);
+                       exit(2);
+               }
+               nbufp[i++] = nbuf;
+       }
 
-                       if (prep_flg)
-                               printf("%s:", *argv);
+       if (nbufp && nosort_flg==0)
+               qsort(nbufp, i, sizeof(struct outname), compare);
+
+       for (n=0; n<i; n++) {
+               char    cs1[4];
+               char    cs2[4];
+
+               if (prep_flg)
+                       printf("%s:", filename);
+
+               switch(nbufp[n].on_type&S_ETC) {
+               case S_SCT:
+                       sprintf(cs1, "%2d", (nbufp[n].on_type&S_TYP) - S_MIN);
+                       sprintf(cs2, " S");
+                       break;
+               case S_FIL:
+                       sprintf(cs1, " -");
+                       sprintf(cs2, " F");
+                       break;
+               case S_MOD:
+                       sprintf(cs1, " -");
+                       sprintf(cs2, " M");
+                       break;
+               case S_COM:
+                       sprintf(cs1, " C");
+                       if (nbufp[n].on_type&S_EXT)
+                               sprintf(cs2, " E");
+                       else
+                               sprintf(cs2, " -");
+                       break;
+               case 0:
+                       if (nbufp[n].on_type&S_EXT)
+                               sprintf(cs2, " E");
+                       else
+                               sprintf(cs2, " -");
 
-                       switch(nbufp[n].on_type&S_ETC) {
-                       case S_SCT:
-                               sprintf(cs1, "%2d", (nbufp[n].on_type&S_TYP) - S_MIN);
-                               sprintf(cs2, " S");
+                       switch(nbufp[n].on_type&S_TYP) {
+                       case S_UND:
+                               sprintf(cs1, " U");
                                break;
-                       case S_FIL:
-                               sprintf(cs1, " -");
-                               sprintf(cs2, " F");
-                               break;
-                       case S_MOD:
-                               sprintf(cs1, " -");
-                               sprintf(cs2, " M");
-                               break;
-                       case S_COM:
-                               sprintf(cs1, " C");
-                               if (nbufp[n].on_type&S_EXT)
-                                       sprintf(cs2, " E");
-                               else
-                                       sprintf(cs2, " -");
-                               break;
-                       case 0:
-                               if (nbufp[n].on_type&S_EXT)
-                                       sprintf(cs2, " E");
-                               else
-                                       sprintf(cs2, " -");
-
-                               switch(nbufp[n].on_type&S_TYP) {
-                               case S_UND:
-                                       sprintf(cs1, " U");
-                                       break;
-                               case S_ABS:
-                                       sprintf(cs1, " A");
-                                       break;
-                               default:
-                                       sprintf(cs1, "%2d", (nbufp[n].on_type&S_TYP) - S_MIN);
-                               }
+                       case S_ABS:
+                               sprintf(cs1, " A");
                                break;
                        default:
-                               sprintf(cs1, "??");
-                               sprintf(cs2, " ?");
+                               sprintf(cs1, "%2d", (nbufp[n].on_type&S_TYP) - S_MIN);
                        }
-
-                       printf("%8lx %s %s %s\n",nbufp[n].on_valu,cs1,cs2,nbufp[n].on_mptr ? nbufp[n].on_mptr : "(NULL)");
+                       break;
+               default:
+                       sprintf(cs1, "??");
+                       sprintf(cs2, " ?");
                }
 
-               if (nbufp)
-                       free((char *)nbufp);
-               if (cbufp)
-                       free((char *)cbufp);
-               rd_close();
+               printf("%8lx %s %s %s\n",nbufp[n].on_valu,cs1,cs2,nbufp[n].on_mptr ? nbufp[n].on_mptr : "(NULL)");
        }
-       exit(0);
+
+       if (nbufp)
+               free((char *)nbufp);
+       if (cbufp)
+               free((char *)cbufp);
 }
 
 compare(p1, p2)