[69414] trunk/dports/multimedia/cws2fws

[takanori at macports.org]

Revision: 69414
          http://trac.macports.org/changeset/69414
Author:   takanori at macports.org
Date:     2010-07-04 16:06:03 -0700 (Sun, 04 Jul 2010)
Log Message:
-----------
cws2fws: fixed some issues in cws2fws.c

Modified Paths:
--------------
    trunk/dports/multimedia/cws2fws/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/cws2fws/files/
    trunk/dports/multimedia/cws2fws/files/patch-tools_cws2fws.c.diff

Modified: trunk/dports/multimedia/cws2fws/Portfile
===================================================================
--- trunk/dports/multimedia/cws2fws/Portfile	2010-07-04 19:52:17 UTC (rev 69413)
+++ trunk/dports/multimedia/cws2fws/Portfile	2010-07-04 23:06:03 UTC (rev 69414)
@@ -4,6 +4,7 @@
 
 name                cws2fws
 version             0
+revision            1
 set ver_ffmpeg      0.6
 categories          multimedia
 maintainers         nomaintainer
@@ -15,6 +16,7 @@
 use_bzip2           yes
 distname            ffmpeg-${ver_ffmpeg}
 dist_subdir         ffmpeg
+patchfiles          patch-tools_cws2fws.c.diff
 
 depends_lib         port:zlib
 

Added: trunk/dports/multimedia/cws2fws/files/patch-tools_cws2fws.c.diff
===================================================================
--- trunk/dports/multimedia/cws2fws/files/patch-tools_cws2fws.c.diff	                        (rev 0)
+++ trunk/dports/multimedia/cws2fws/files/patch-tools_cws2fws.c.diff	2010-07-04 23:06:03 UTC (rev 69414)
@@ -0,0 +1,56 @@
+--- tools/cws2fws.c.orig	2007-07-19 00:38:04.000000000 +0900
++++ tools/cws2fws.c	2010-07-05 08:02:17.000000000 +0900
+@@ -39,7 +39,7 @@
+         exit(1);
+     }
+ 
+-    fd_out = open(argv[2], O_WRONLY|O_CREAT, 00644);
++    fd_out = open(argv[2], O_WRONLY|O_CREAT|O_TRUNC, 00644);
+     if (fd_out < 0)
+     {
+         perror("Error while opening: ");
+@@ -63,7 +63,7 @@
+ 
+     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);
++    uncomp_len = (buf_in[4] & 0xff) | ((buf_in[5] & 0xff) << 8) | ((buf_in[6] & 0xff) << 16) | ((buf_in[7] & 0xff) << 24);
+ 
+     printf("Compressed size: %d Uncompressed size: %d\n", comp_len-4, uncomp_len-4);
+ 
+@@ -78,16 +78,19 @@
+ 
+     for (i = 0; i < comp_len-8;)
+     {
+-        int ret, len = read(fd_in, &buf_in, 1024);
++        int ret, len = 0;
++        if (zstream.avail_in == 0) {
++            len = read(fd_in, &buf_in, sizeof(buf_in));
+ 
+-        dbgprintf("read %d bytes\n", len);
++            dbgprintf("read %d bytes\n", len);
+ 
+-        last_out = zstream.total_out;
+-
+-        zstream.next_in = &buf_in[0];
+-        zstream.avail_in = len;
++            zstream.next_in = &buf_in[0];
++            zstream.avail_in = len;
++        }
+         zstream.next_out = &buf_out[0];
+-        zstream.avail_out = 65536;
++        zstream.avail_out = sizeof(buf_out);
++
++        last_out = zstream.total_out;
+ 
+         ret = inflate(&zstream, Z_SYNC_FLUSH);
+         if (ret != Z_STREAM_END && ret != Z_OK)
+@@ -103,7 +106,7 @@
+ 
+         write(fd_out, &buf_out, zstream.total_out-last_out);
+ 
+-        i += len;
++        i += (len - zstream.avail_in);
+ 
+         if (ret == Z_STREAM_END || ret == Z_BUF_ERROR)
+             break;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100704/c19e53e8/attachment-0001.html>