[ViewVC] Diff of: cvs/liblzf/lzf.c

Comparing liblzf/lzf.c (file contents):
Revision 1.10 by root, Thu Oct 12 14:38:24 2006 UTC vs.
Revision 1.14 by root, Fri Mar 30 20:58:09 2012 UTC

 /*
  * Copyright (c) 2006      Stefan Traby <stefan@hello-penguin.com>
+ * Copyright (c) 2012      Marc Lehmann <schmorp@schmorp.de>
  *
  * Redistribution and use in source and binary forms, with or without modifica-
  * tion, are permitted provided that the following conditions are met:
  *
  *   1.  Redistributions of source code must retain the above copyright notice,
  *       this list of conditions and the following disclaimer.
  *
  *   2.  Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
- *
- *   3.  The name of the author may not be used to endorse or promote products
- *       derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
  * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
  * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
  * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * Alternatively, the contents of this file may be used under the terms of
- * the GNU General Public License version 2 (the "GPL"), in which case the
+ * the GNU General Public License ("GPL") version 2 or any later version,
- * provisions of the GPL are applicable instead of the above. If you wish to
+ * in which case the provisions of the GPL are applicable instead of
- * allow the use of your version of this file only under the terms of the
+ * the above. If you wish to allow the use of your version of this file
- * GPL and not to allow others to use your version of this file under the
+ * only under the terms of the GPL and not to allow others to use your
- * BSD license, indicate your decision by deleting the provisions above and
+ * version of this file under the BSD license, indicate your decision
- * replace them with the notice and other provisions required by the GPL. If
+ * by deleting the provisions above and replace them with the notice
- * you do not delete the provisions above, a recipient may use your version
+ * and other provisions required by the GPL. If you do not delete the
- * of this file under either the BSD or the GPL License.
+ * provisions above, a recipient may use your version of this file under
+ * either the BSD or the GPL.
  */
 #include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <limits.h>
 #include "lzf.h"
+#include "lzf_c_best.c"
 #ifdef HAVE_GETOPT_H
 # include <getopt.h>
 #endif
 static off_t nr_read, nr_written;
 static const char *imagename;
 static enum { compress, uncompress, lzcat } mode = compress;
 static int verbose = 0;
+static int best = 0;
 static int force = 0;
 static long blocksize = BLOCKSIZE;
 #ifdef HAVE_GETOPT_LONG
   struct option longopts[] = {
-    {"compress", 0, 0, 'c'},
+    {"compress"  , 0, 0, 'c'},
     {"decompress", 0, 0, 'd'},
     {"uncompress", 0, 0, 'd'},
+    {"best"      , 0, 0, '9'},
-    {"force", 0, 0, 'f'},
+    {"force"     , 0, 0, 'f'},
-    {"help", 0, 0, 'h'},
+    {"help"      , 0, 0, 'h'},
-    {"verbose", 0, 0, 'v'},
+    {"verbose"   , 0, 0, 'v'},
-    {"blocksize", 1, 0, 'b'},
+    {"blocksize" , 1, 0, 'b'},
-    {0, 0, 0, 0}
+    {0           , 0, 0,   0}
   };
   static const char *opt =
     "-c --compress    compress\n"
     "-d --decompress  decompress\n"
+    "-9 --best        best compression\n"
     "-f --force       force overwrite of output file\n"
-    "-h --help        give this help\n" "-v --verbose     verbose mode\n" "-b # --blocksize # set blocksize\n" "\n";
+    "-h --help        give this help\n"
+    "-v --verbose     verbose mode\n"
+    "-b # --blocksize # set blocksize\n"
+    "\n";
 #else
   static const char *opt =
     "-c   compress\n"
     "-d   decompress\n"
+    "-9   best compression\n"
     "-f   force overwrite of output file\n"
     "-h   give this help\n"
     "-v   verbose mode\n"
     "-b # set blocksize\n"
     "\n";
   fprintf (stderr, "\n"
            "lzf, a very lightweight compression/decompression utility written by Stefan Traby.\n"
            "uses liblzf written by Marc Lehmann <schmorp@schmorp.de> You can find more info at\n"
            "http://liblzf.plan9.de/\n"
            "\n"
-           "usage: lzf [-dufhvb] [file ...]\n"
+           "usage: lzf [-dufhvb9] [file ...]\n"
            "       unlzf [file ...]\n"
            "       lzcat [file ...]\n"
            "\n%s",
            opt);
   u8 *header;
   nr_read = nr_written = 0;
   while ((us = rread (from, &buf1[MAX_HDR_SIZE], blocksize)) > 0)
     {
-      cs = lzf_compress (&buf1[MAX_HDR_SIZE], us, &buf2[MAX_HDR_SIZE], us > 4 ? us - 4 : us);
+      cs = (best ? lzf_compress_best : lzf_compress) (&buf1[MAX_HDR_SIZE], us, &buf2[MAX_HDR_SIZE], us > 4 ? us - 4 : us);
       if (cs)
         {
           header = &buf2[MAX_HDR_SIZE - TYPE1_HDR_SIZE];
           header[0] = 'Z';
           header[1] = 'V';
   if (force)
     m = 0;
   fd = open (name, O_CREAT | O_WRONLY | O_TRUNC | m, 600);
+#if defined(__MINGW32__)
+  _setmode(fd, _O_BINARY);
+#endif
   return fd;
 }
 static int
 compose_name (const char *fname, char *oname)
   if (mode != lzcat)
     if (compose_name (fname, oname))
       return -1;
+#if !defined(__MINGW32__)
   rc = lstat (fname, &mystat);
+#else
+  rc = stat (fname, &mystat);
+#endif
   fd = open (fname, O_RDONLY);
+#if defined(__MINGW32__)
+  _setmode(fd, _O_BINARY);
+#endif
   if (rc || fd == -1)
     {
       fprintf (stderr, "%s: %s: ", imagename, fname);
       perror ("");
       return -1;
       if (!rc && verbose)
         fprintf (stderr, "%s:  %5.1f%% -- replaced with %s\n",
                  fname, nr_written == 0 ? 0 : 100.0 - nr_read / ((double) nr_written / 100.0), oname);
     }
+#if !defined(__MINGW32__)
   fchmod (fd2, mystat.st_mode);
+#else
+  chmod (oname, mystat.st_mode);
+#endif
   close (fd);
   close (fd2);
   if (!rc)
     unlink (fname);
   if (strstr (imagename, "cat"))
     mode = lzcat;
 #ifdef HAVE_GETOPT_LONG
-  while ((optc = getopt_long (argc, argv, "cdfhvb:", longopts, 0)) != -1)
+  while ((optc = getopt_long (argc, argv, "cd9fhvb:", longopts, 0)) != -1)
 #else
-  while ((optc = getopt (argc, argv, "cdfhvb:")) != -1)
+  while ((optc = getopt (argc, argv, "cd9fhvb:")) != -1)
 #endif
     {
       switch (optc)
         {
           case 'c':
             mode = compress;
             break;
           case 'd':
             mode = uncompress;
+            break;
+          case '9':
+            best = 1;
             break;
           case 'f':
             force = 1;
             break;
           case 'h':

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing liblzf/lzf.c (file contents): Revision 1.10 by root, Thu Oct 12 14:38:24 2006 UTC vs. Revision 1.14 by root, Fri Mar 30 20:58:09 2012 UTC

Diff Legend

Comparing liblzf/lzf.c (file contents):
Revision 1.10 by root, Thu Oct 12 14:38:24 2006 UTC vs.
Revision 1.14 by root, Fri Mar 30 20:58:09 2012 UTC