X-Git-Url: https://git.libav.org/?p=libav.git;a=blobdiff_plain;f=cws2fws.c;h=5d8f524b7a1c1131e51bf1ed5e344a7f1f4e279a;hp=5fc6d08ddfdc3b50341c721a5e09ff38e777b46b;hb=a65bafeff018b42b2c6341e172867e213212a7b0;hpb=f7599d5ff0ba61c7281e59f1e41ab1441446ba42

diff --git a/cws2fws.c b/cws2fws.c
index 5fc6d08ddf..5d8f524b7a 100644
--- a/cws2fws.c
+++ b/cws2fws.c
@@ -1,5 +1,6 @@
 /*
- * cws2fws by Alex Beregszaszi <alex@fsn.hu>
+ * cws2fws by Alex Beregszaszi
+ * Public domain.
  *
  * This utility converts compressed Macromedia Flash files to uncompressed ones.
  *
@@ -7,6 +8,8 @@
 
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <zlib.h>
 
@@ -18,50 +21,50 @@
 
 main(int argc, char *argv[])
 {
-    int fd_in, fd_out, comp_len, uncomp_len, tag, i, last_out;
-    char buf_in[1024], buf_out[1024];
+    int fd_in, fd_out, comp_len, uncomp_len, i, last_out;
+    char buf_in[1024], buf_out[65536];
     z_stream zstream;
     struct stat statbuf;
 
     if (argc < 3)
     {
-	printf("Usage: %s <infile.swf> <outfile.swf>\n", argv[0]);
-	exit(1);
+        printf("Usage: %s <infile.swf> <outfile.swf>\n", argv[0]);
+        exit(1);
     }
-    
+
     fd_in = open(argv[1], O_RDONLY);
     if (fd_in < 0)
     {
-	perror("Error while opening: ");
-	exit(1);
+        perror("Error while opening: ");
+        exit(1);
     }
 
     fd_out = open(argv[2], O_WRONLY|O_CREAT, 00644);
     if (fd_out < 0)
     {
-	perror("Error while opening: ");
-	close(fd_in);
-	exit(1);
+        perror("Error while opening: ");
+        close(fd_in);
+        exit(1);
     }
-    
+
     if (read(fd_in, &buf_in, 8) != 8)
     {
-	printf("Header error\n");
-	close(fd_in);
-	close(fd_out);
-	exit(1);
+        printf("Header error\n");
+        close(fd_in);
+        close(fd_out);
+        exit(1);
     }
-    
+
     if (buf_in[0] != 'C' || buf_in[1] != 'W' || buf_in[2] != 'S')
     {
-	printf("Not a compressed flash file\n");
-	exit(1);
+        printf("Not a compressed flash file\n");
+        exit(1);
     }
 
     fstat(fd_in, &statbuf);
     comp_len = statbuf.st_size;
     uncomp_len = buf_in[4] | (buf_in[5] << 8) | (buf_in[6] << 16) | (buf_in[7] << 24);
-    
+
     printf("Compressed size: %d Uncompressed size: %d\n", comp_len-4, uncomp_len-4);
 
     // write out modified header
@@ -72,53 +75,54 @@ main(int argc, char *argv[])
     zstream.zfree = NULL;
     zstream.opaque = NULL;
     inflateInit(&zstream);
-    
-    for (i = 0; i < comp_len-4;)
+
+    for (i = 0; i < comp_len-8;)
     {
-	int ret, len = read(fd_in, &buf_in, 1024);
-
-	dbgprintf("read %d bytes\n", len);
-	
-	last_out = zstream.total_out;
-	
-	zstream.next_in = &buf_in[0];
-	zstream.avail_in = len;
-	zstream.next_out = &buf_out[0];
-	zstream.avail_out = 1024;
-		
-	ret = inflate(&zstream, Z_SYNC_FLUSH);
-	if (ret == Z_STREAM_END || ret == Z_BUF_ERROR)
-	    break;
-	if (ret != Z_OK)
-	{
-	    printf("Error while decompressing: %d\n", ret);
-	    inflateEnd(&zstream);
-	    exit(1);
-	}
-	
-	dbgprintf("a_in: %d t_in: %d a_out: %d t_out: %d -- %d out\n",
-	    zstream.avail_in, zstream.total_in, zstream.avail_out, zstream.total_out,
-	    zstream.total_out-last_out);
-	
-	write(fd_out, &buf_out, zstream.total_out-last_out);
-
-	i += len;
+        int ret, len = read(fd_in, &buf_in, 1024);
+
+        dbgprintf("read %d bytes\n", len);
+
+        last_out = zstream.total_out;
+
+        zstream.next_in = &buf_in[0];
+        zstream.avail_in = len;
+        zstream.next_out = &buf_out[0];
+        zstream.avail_out = 65536;
+
+        ret = inflate(&zstream, Z_SYNC_FLUSH);
+        if (ret != Z_STREAM_END && ret != Z_OK)
+        {
+            printf("Error while decompressing: %d\n", ret);
+            inflateEnd(&zstream);
+            exit(1);
+        }
+
+        dbgprintf("a_in: %d t_in: %d a_out: %d t_out: %d -- %d out\n",
+            zstream.avail_in, zstream.total_in, zstream.avail_out, zstream.total_out,
+            zstream.total_out-last_out);
+
+        write(fd_out, &buf_out, zstream.total_out-last_out);
+
+        i += len;
+
+        if (ret == Z_STREAM_END || ret == Z_BUF_ERROR)
+            break;
     }
-    
+
     if (zstream.total_out != uncomp_len-8)
     {
-	printf("Size mismatch (%d != %d), updating header...\n",
-	    zstream.total_out, uncomp_len-8);
-
-	buf_in[0] = (zstream.total_out+8) & 0xff;
-	buf_in[1] = (zstream.total_out+8 >> 8) & 0xff;
-	buf_in[2] = (zstream.total_out+8 >> 16) & 0xff;
-	buf_in[3] = (zstream.total_out+8 >> 24) & 0xff;
-	
-	lseek(fd_out, 4, SEEK_SET);
-	write(fd_out, &buf_in, 4);
+        printf("Size mismatch (%d != %d), updating header...\n",
+            zstream.total_out, uncomp_len-8);
+
+        buf_in[0] = (zstream.total_out+8) & 0xff;
+        buf_in[1] = (zstream.total_out+8 >> 8) & 0xff;
+        buf_in[2] = (zstream.total_out+8 >> 16) & 0xff;
+        buf_in[3] = (zstream.total_out+8 >> 24) & 0xff;
+
+        lseek(fd_out, 4, SEEK_SET);
+        write(fd_out, &buf_in, 4);
     }
-    
+
     inflateEnd(&zstream);
     close(fd_in);
     close(fd_out);