[Dotgnu-pnet-commits] CVS: pnet/ildasm ildasm_global.c,1.2,1.3

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/ildasm
In directory subversions:/tmp/cvs-serv14173/ildasm

Modified Files:
        ildasm_global.c 
Log Message:


Fix the processing of public keys in ilasm and ildasm.


Index: ildasm_global.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ildasm/ildasm_global.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ildasm_global.c     20 Aug 2001 00:58:46 -0000      1.2
--- ildasm_global.c     30 Jan 2003 10:16:45 -0000      1.3
***************
*** 143,147 ****
        if((orig = ILAssemblyGetOriginator(assem, &origLen)) != 0)
        {
!               fputs("\t.originator =", outstream);
                ILDAsmDumpBinaryBlob(outstream, image, orig, origLen);
                putc('\n', outstream);
--- 143,147 ----
        if((orig = ILAssemblyGetOriginator(assem, &origLen)) != 0)
        {
!               fputs("\t.publickey =", outstream);
                ILDAsmDumpBinaryBlob(outstream, image, orig, origLen);
                putc('\n', outstream);
***************
*** 205,208 ****
--- 205,210 ----
  {
        const ILUInt16 *version;
+       const void *orig;
+       unsigned long origLen;
        fputs(".assembly extern ", outstream);
        if((flags & IL_DUMP_SHOW_TOKENS) != 0)
***************
*** 218,221 ****
--- 220,236 ----
                        (unsigned long)(version[0]), (unsigned 
long)(version[1]),
                        (unsigned long)(version[2]), (unsigned 
long)(version[3]));
+       if((orig = ILAssemblyGetOriginator(assem, &origLen)) != 0)
+       {
+               if(ILAssembly_HasFullOriginator(assem))
+               {
+                       fputs("\t.publickey =", outstream);
+               }
+               else
+               {
+                       fputs("\t.publickeytoken =", outstream);
+               }
+               ILDAsmDumpBinaryBlob(outstream, image, orig, origLen);
+               putc('\n', outstream);
+       }
        ILDAsmWalkTokens(image, outstream, flags,
                                         IL_META_TOKEN_OS_REF,