X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=f2c33539ccf637709607994c32a689320308155c;hb=2e95c146b14d49cf874568e51148377b50c9c5e8;hp=d6905949d33adf5436729a3b7cb5ae161fc2782f;hpb=4472f3c1204955d8cd012f31a2cc37d3af9bdeb3;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index d690594..f2c3353 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -7,7 +7,7 @@
 
    This file is distributed under the GPL, see file COPYING for details */
 
-#define HAVE_STAT
+#include "../config.h"
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
@@ -34,12 +34,14 @@ char * filename = 0;
    to detect errors in the file. (i.e. ids which are defined more than 
    once */
 char idtab[65536];
+char * indent = "                ";
 
 int action = 0;
 int html = 0;
 int xy = 0;
 int showtext = 0;
 int hex = 0;
+int used = 0;
 
 struct options_t options[] =
 {
@@ -49,6 +51,7 @@ struct options_t options[] =
  {"Y","height"},
  {"r","rate"},
  {"e","html"},
+ {"u","used"},
  {"v","verbose"},
  {"V","version"},
  {"d","hex"},
@@ -90,6 +93,10 @@ int args_callback_option(char*name,char*val)
 	hex = 1;
 	return 0;
     }
+    else if(name[0]=='u') {
+	used = 1;
+	return 0;
+    }
     else {
         printf("Unknown option: -%s\n", name);
     }
@@ -111,6 +118,7 @@ void args_callback_usage(char*name)
     printf("\t-a , --action\t\t Disassemble action tags\n");
     printf("\t-t , --text\t\t Show text data\n");
     printf("\t-d , --hex\t\t Print hex output of tag data, too\n");
+    printf("\t-u , --used\t\t Show referred IDs for each Tag\n");
     printf("\t-V , --version\t\t Print program version and exit\n");
 }
 int args_callback_command(char*name,char*val)
@@ -229,7 +237,7 @@ void textcallback(int*glyphs, int nr, int fontid)
 	    a = glyphs[t];
 	}
 	if(a>=32)
-	    printf("%c", a,a);
+	    printf("%c", a);
 	else
 	    printf("\\x%x", (int)a);
     }
@@ -388,6 +396,7 @@ int main (int argc,char ** argv)
     char* spriteframelabel;
     char* framelabel = 0;
     char prefix[128];
+    int filesize = 0;
     prefix[0] = 0;
     memset(idtab,0,65536);
 
@@ -415,9 +424,10 @@ int main (int argc,char ** argv)
 
 #ifdef HAVE_STAT
     fstat(f, &statbuf);
-    if(statbuf.st_size != swf.FileSize)
+    if(statbuf.st_size != swf.fileSize && !swf.compressed)
         dumperror("Real Filesize (%d) doesn't match header Filesize (%d)",
-                statbuf.st_size, swf.FileSize);
+                statbuf.st_size, swf.fileSize);
+    filesize = statbuf.st_size;
 #endif
 
     close(f);
@@ -463,7 +473,14 @@ int main (int argc,char ** argv)
 	return 0;
     } 
     printf("[HEADER]        File version: %d\n", swf.fileVersion);
-    printf("[HEADER]        File size: %ld\n", swf.fileSize);
+    if(swf.compressed) {
+	printf("[HEADER]        File is zlib compressed.");
+	if(filesize && swf.fileSize)
+	    printf(" Ratio: %02d%%\n", filesize*100/(swf.fileSize));
+	else
+	    printf("\n");
+    }
+    printf("[HEADER]        File size: %ld%s\n", swf.fileSize, swf.compressed?" (Depacked)":"");
     printf("[HEADER]        Frame rate: %f\n",swf.frameRate/256.0);
     printf("[HEADER]        Frame count: %d\n",swf.frameCount);
     printf("[HEADER]        Movie width: %.3f\n",(swf.movieSize.xmax-swf.movieSize.xmin)/20.0);
@@ -619,12 +636,29 @@ int main (int argc,char ** argv)
 	    else
 		printf("\n");
 	}
+
+	if(tag->len && used) {
+	    int num = swf_GetNumUsedIDs(tag);
+	    int* used;
+	    int t;
+	    if(num) {
+		used = (int*)malloc(sizeof(int)*num);
+		swf_GetUsedIDs(tag, used);
+		printf("%s%suses IDs: ", indent, prefix);
+		for(t=0;t<num;t++) {
+		    tag->pos = used[t];
+		    printf("%d%s", swf_GetU16(tag), t<num-1?", ":"");
+		}
+		printf("\n");
+	    }
+	}
+
 	if(tag->len && hex) {
 	    int t;
 	    printf("                %s-=> ",prefix);
 	    for(t=0;t<tag->len;t++) {
 		printf("%02x ", tag->data[t]);
-		if((t && !(t&15)) || (t==tag->len-1))
+		if((t && ((t&15)==15)) || (t==tag->len-1))
 		{
 		    if(t==tag->len-1)
 			printf("\n");