ferret 0.11.8.6 → 0.11.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79d986336c6e1786037d5af14c9a046bacd03154
-  data.tar.gz: e59ca1733e53263346275dc573e2ac8ea5b80ab6
+  metadata.gz: e72c061a77aa3e4cf6e82525a102ccf10517b949
+  data.tar.gz: dc4af1937f19310f827ddc8ecaead7745a0a1d25
 SHA512:
-  metadata.gz: 1ca3fcc094d39e327d3844ebbe329b91f397daf08853bd4ef3217bc3ba630475511f8909d689172345aaaf6c0ce9f14b5fd0210bcdf9dca6b8ea8c8d22625427
-  data.tar.gz: 5b0ae5d2659df9c5f2caca31fd38697924f165d749ce8d2d76fc0e60d1acd852cfdbd1e4478a0dba10ab2ae382a3e0587e84b3827da24ace703f31f5dbf82bb2
+  metadata.gz: dbf72dbe1900dceebee48f1cf38179beefaa98aff7ef4e67d987e8677ae1d41d0f15941b74cd4f779ac3061b9bbc59f51d5b9ecc0ff118ea9da82d18c23c369e
+  data.tar.gz: ec4021c84497bf407a7e44c6f9c19577b034ed76c8044d8e0494ece990f22a9384c8ae7b3c5f2183249c8c72c0726a0a1ad1d7c56c9a9eff741cebee4df87798

data/{README → README.md}

@@ -15,13 +15,10 @@ search for things in them later.
 
   $ sudo gem install ferret
 
-If you don't have rubygems installed you can still install Ferret. Just
-download one of the zipped up versions of Ferret, unzip it and change into the
-unzipped directory. Then run the following set of commands;
+Or to build it from this git repository:
 
-  $ ruby setup.rb config
-  $ ruby setup.rb setup
-  $ sudo ruby setup.rb install
+  $ cd ruby
+  $ rake install
 
 == Usage
 

data/Rakefile

@@ -83,7 +83,9 @@ namespace :build do
     dest_fn = EXT_SRC_MAP[fn]
     # prepend lib files to avoid conflicts
     file dest_fn => fn do |t|
-      ln_sf File.expand_path(fn), File.expand_path(dest_fn)
+      dest_path = File.expand_path(dest_fn)
+      rm_f dest_path
+      cp File.expand_path(fn), dest_path
 
       if fn =~ /stemmer/
         # flatten the directory structure for lib_stemmer
@@ -198,9 +200,9 @@ namespace :doc do
     rdoc.options << '--inline-source'
     rdoc.options << '--charset=utf-8'
 #    rdoc.template = allison_template if allison_template
-    rdoc.rdoc_files.include('README')
+    rdoc.rdoc_files.include('README.md')
     rdoc.rdoc_files.include('TODO')
-    rdoc.rdoc_files.include('TUTORIAL')
+    rdoc.rdoc_files.include('TUTORIAL.md')
     rdoc.rdoc_files.include('MIT-LICENSE')
     rdoc.rdoc_files.include('lib/**/*.rb')
     rdoc.rdoc_files.include('ext/r_*.c')
@@ -218,7 +220,6 @@ end
 ##############################################################################
 
 PKG_FILES = FileList[
-  'setup.rb',
   '[-A-Z]*',
   'lib/**/*.rb',
   'lib/**/*.rhtml',
@@ -251,8 +252,7 @@ spec = Gem::Specification.new do |s|
   #### Author and project details.
   s.author = "David Balmain"
   s.email = "dbalmain@gmail.com"
-  #s.homepage = "http://ferret.davebalmain.com/trac"
-  s.homepage = "http://github.com/jkraemer/ferret"
+  s.homepage = "http://github.com/dbalmain/ferret"
   s.rubyforge_project = "ferret"
 
   s.has_rdoc = true
@@ -297,7 +297,7 @@ task :uninstall => :clobber do
   sh "#{SUDO}gem uninstall ferret"
 end
 
-desc "Same as :install but you must be rootgem"
+desc "Same as :install but you must be root"
 task :root_install => :gem do
   sh "gem install pkg/ferret-#{Ferret::VERSION}.gem --no-rdoc --no-ri -l"
 end

data/ext/BZLIB_blocksort.c

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

data/ext/BZLIB_bzlib.c

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
@@ -31,7 +31,6 @@
 #include "bzlib_private.h"
 
 
-
 /*---------------------------------------------------*/
 /*--- Compression stuff                           ---*/
 /*---------------------------------------------------*/
@@ -49,7 +48,7 @@ void BZ2_bz__AssertH__fail ( int errcode )
       "component, you should also report this bug to the author(s)\n"
       "of that program.  Please make an effort to report this bug;\n"
       "timely and accurate bug reports eventually lead to higher\n"
-      "quality software.  Thanks.  Julian Seward, 15 February 2005.\n\n",
+      "quality software.  Thanks.  Julian Seward, 10 December 2007.\n\n",
       errcode,
       BZ2_bzlibVersion()
    );
@@ -84,9 +83,6 @@ void BZ2_bz__AssertH__fail ( int errcode )
 
    exit(3);
 }
-#else
-void BZ2_bz__AssertH__fail ( int errcode ) { (void)errcode; }
-void bz_internal_error     ( int errcode ) { (void)errcode; }
 #endif
 
 
@@ -106,7 +102,6 @@ static
 void* default_bzalloc ( void* opaque, Int32 items, Int32 size )
 {
    void* v = malloc ( items * size );
-   (void)opaque; /* Ferret modification to remove compile warning */
    return v;
 }
 
@@ -114,7 +109,6 @@ static
 void default_bzfree ( void* opaque, void* addr )
 {
    if (addr != NULL) free ( addr );
-   (void)opaque; /* Ferret modification to remove compile warning */
 }
 
 
@@ -604,6 +598,7 @@ Bool unRLE_obuf_to_output_FAST ( DState* s )
       UInt32        c_tPos               = s->tPos;
       char*         cs_next_out          = s->strm->next_out;
       unsigned int  cs_avail_out         = s->strm->avail_out;
+      Int32         ro_blockSize100k     = s->blockSize100k;
       /* end restore */
 
       UInt32       avail_out_INIT = cs_avail_out;
@@ -1511,7 +1506,6 @@ int BZ_API(BZ2_bzwrite) (BZFILE* b, void* buf, int len )
 int BZ_API(BZ2_bzflush) (BZFILE *b)
 {
    /* do nothing now... */
-   (void)b; /* Ferret modification to remove compile warning */
    return 0;
 }
 

data/ext/BZLIB_compress.c

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

data/ext/BZLIB_crctable.c

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

data/ext/BZLIB_decompress.c

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
@@ -381,6 +381,13 @@ Int32 BZ2_decompress ( DState* s )
             es = -1;
             N = 1;
             do {
+               /* Check that N doesn't get too big, so that es doesn't
+                  go negative.  The maximum value that can be
+                  RUNA/RUNB encoded is equal to the block size (post
+                  the initial RLE), viz, 900k, so bounding N at 2
+                  million should guard against overflow without
+                  rejecting any legitimate inputs. */
+               if (N >= 2*1024*1024) RETURN(BZ_DATA_ERROR);
                if (nextSym == BZ_RUNA) es = es + (0+1) * N; else
                if (nextSym == BZ_RUNB) es = es + (1+1) * N;
                N = N * 2;
@@ -485,15 +492,28 @@ Int32 BZ2_decompress ( DState* s )
          RETURN(BZ_DATA_ERROR);
 
       /*-- Set up cftab to facilitate generation of T^(-1) --*/
+      /* Check: unzftab entries in range. */
+      for (i = 0; i <= 255; i++) {
+         if (s->unzftab[i] < 0 || s->unzftab[i] > nblock)
+            RETURN(BZ_DATA_ERROR);
+      }
+      /* Actually generate cftab. */
       s->cftab[0] = 0;
       for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1];
       for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1];
+      /* Check: cftab entries in range. */
       for (i = 0; i <= 256; i++) {
          if (s->cftab[i] < 0 || s->cftab[i] > nblock) {
             /* s->cftab[i] can legitimately be == nblock */
             RETURN(BZ_DATA_ERROR);
          }
       }
+      /* Check: cftab entries non-descending. */
+      for (i = 1; i <= 256; i++) {
+         if (s->cftab[i-1] > s->cftab[i]) {
+            RETURN(BZ_DATA_ERROR);
+         }
+      }
 
       s->state_out_len = 0;
       s->state_out_ch  = 0;

data/ext/BZLIB_huffman.c

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

data/ext/BZLIB_randtable.c

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

data/ext/bitvector.c

@@ -43,6 +43,8 @@ void bv_scan_reset(BitVector *bv)
 
 int bv_eq(BitVector *bv1, BitVector *bv2)
 {
+    u32 *bits, *bits2;
+    int min_size, word_size, ext_word_size = 0, i;
     if (bv1 == bv2) {
         return true;
     }
@@ -51,12 +53,10 @@ int bv_eq(BitVector *bv1, BitVector *bv2)
         return false;
     }
 
-    u32 *bits = bv1->bits;
-    u32 *bits2 = bv2->bits;
-    int min_size = min2(bv1->size, bv2->size);
-    int word_size = TO_WORD(min_size);
-    int ext_word_size = 0;
-    int i;
+    bits = bv1->bits;
+    bits2 = bv2->bits;
+    min_size = min2(bv1->size, bv2->size);
+    word_size = TO_WORD(min_size);
 
     for (i = 0; i < word_size; i++) {
         if (bits[i] != bits2[i]) {

data/ext/bzlib.h

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.

data/ext/bzlib_private.h

@@ -8,8 +8,8 @@
    This file is part of bzip2/libbzip2, a program and library for
    lossless, block-sorting data compression.
 
-   bzip2/libbzip2 version 1.0.4 of 20 December 2006
-   Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+   bzip2/libbzip2 version 1.0.6 of 6 September 2010
+   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
 
    Please read the WARNING, DISCLAIMER and PATENTS sections in the 
    README file.
@@ -36,7 +36,7 @@
 
 /*-- General stuff. --*/
 
-#define BZ_VERSION  "1.0.4, 20-Dec-2006"
+#define BZ_VERSION  "1.0.6, 6-Sept-2010"
 
 typedef char            Char;
 typedef unsigned char   Bool;
@@ -442,11 +442,15 @@ typedef
 /*-- Macros for decompression. --*/
 
 #define BZ_GET_FAST(cccc)                     \
+    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
     s->tPos = s->tt[s->tPos];                 \
     cccc = (UChar)(s->tPos & 0xff);           \
     s->tPos >>= 8;
 
 #define BZ_GET_FAST_C(cccc)                   \
+    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+    if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \
     c_tPos = c_tt[c_tPos];                    \
     cccc = (UChar)(c_tPos & 0xff);            \
     c_tPos >>= 8;
@@ -469,8 +473,10 @@ typedef
    (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
 
 #define BZ_GET_SMALL(cccc)                            \
-      cccc = BZ2_indexIntoF ( s->tPos, s->cftab );    \
-      s->tPos = GET_LL(s->tPos);
+    /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+    if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
+    cccc = BZ2_indexIntoF ( s->tPos, s->cftab );    \
+    s->tPos = GET_LL(s->tPos);
 
 
 /*-- externs for decompression. --*/

data/ext/compound_io.c

@@ -215,7 +215,7 @@ Store *open_cmpd_store(Store *store, const char *name)
     int count, i;
     off_t offset;
     char *fname;
-    FileEntry *entry = NULL;
+    FileEntry *volatile entry = NULL;
     Store *new_store = NULL;
     CompoundStore *volatile cmpd = NULL;
     InStream *volatile is = NULL;

data/ext/document.c

@@ -59,9 +59,6 @@ void df_destroy(DocField *df)
  */
 char *df_to_s(DocField *df)
 {
-#define APPEND(dst, src) ((dst)[0] = (src)[0], 1)
-#define APPEND2(dst, src) (APPEND(dst, src), APPEND(dst+1, src+1), 2)
-
     int i, len = 0, namelen = sym_len(df->name);
     char *str, *s;
     for (i = 0; i < df->size; i++) {
@@ -70,23 +67,23 @@ char *df_to_s(DocField *df)
     s = str = ALLOC_N(char, namelen + len + 5);
     memcpy(s, df->name, namelen);
     s += namelen;
-    s += APPEND2(s, ": ");
+    s = strapp(s, ": ");
 
     if (df->size > 1) {
-        s += APPEND(s, "[");
+        s = strapp(s, "[");
     }
     for (i = 0; i < df->size; i++) {
         if (i != 0) {
-            s += APPEND2(s, ", ");
+            s = strapp(s, ", ");
         }
-        s += APPEND(s, "\"");
+        s = strapp(s, "\"");
         memcpy(s, df->data[i], df->lengths[i]);
         s += df->lengths[i];
-        s += APPEND(s, "\"");
+        s = strapp(s, "\"");
     }
 
     if (df->size > 1) {
-        s += APPEND(s, "]");
+        s = strapp(s, "]");
     }
     *s = 0;
     return str;

data/ext/except.c

@@ -20,8 +20,8 @@ static const char *const ERROR_TYPES[] = {
     "Lock Error"
 };
 
-char *const UNSUPPORTED_ERROR_MSG = "Unsupported operation";
-char *const EOF_ERROR_MSG = "Read past end of file";
+const char *const UNSUPPORTED_ERROR_MSG = "Unsupported operation";
+const char *const EOF_ERROR_MSG = "Read past end of file";
 char xmsg_buffer[XMSG_BUFFER_SIZE];
 char xmsg_buffer_final[XMSG_BUFFER_SIZE];
 

data/ext/except.h

@@ -98,8 +98,8 @@ extern "C" {
 #define FRT_INDEX_ERROR 11
 #define FRT_LOCK_ERROR 12
 
-extern char *const FRT_UNSUPPORTED_ERROR_MSG;
-extern char *const FRT_EOF_ERROR_MSG;
+extern const char *const FRT_UNSUPPORTED_ERROR_MSG;
+extern const char *const FRT_EOF_ERROR_MSG;
 
 typedef struct frt_xcontext_t
 {

data/ext/field_index.c

@@ -234,7 +234,7 @@ static void string_handle_term(void *index_ptr,
     StringIndex *index = (StringIndex *)index_ptr;
     if (index->v_size >= index->v_capa) {
         index->v_capa *= 2;
-        index->values = REALLOC_N(index->values, char *, index->v_capa);
+        REALLOC_N(index->values, char *, index->v_capa);
     }
     index->values[index->v_size] = estrdup(text);
     while (tde->next(tde)) {

data/ext/global.c

@@ -3,6 +3,7 @@
 #include "hash.h"
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
@@ -45,7 +46,7 @@ int scmp(const void *p1, const void *p2)
     return strcmp(*(char **) p1, *(char **) p2);
 }
 
-void frt_strsort(char **str_array, int size)
+void strsort(char **str_array, int size)
 {
     qsort(str_array, size, sizeof(char *), &scmp);
 }
@@ -165,6 +166,20 @@ char *dbl_to_s(char *buf, double num)
     return buf;
 }
 
+/**
+ * strapp: appends a string up to, but not including the \0 character to the
+ * end of a string returning a pointer to the next unassigned character in the
+ * string.
+ */
+char *strapp(char *dst, const char *src) {
+    while (*src != '\0') {
+        *dst = *src;
+        ++dst;
+        ++src;
+    }
+    return dst;
+}
+
 /* strfmt: like sprintf except that it allocates memory for the string */
 char *vstrfmt(const char *fmt, va_list args)
 {
@@ -172,7 +187,7 @@ char *vstrfmt(const char *fmt, va_list args)
     char *p = (char *) fmt, *q;
     int len = (int) strlen(fmt) + 1;
     int slen, curlen;
-    char *s;
+    const char *s;
     long l;
     double d;
 
@@ -248,36 +263,17 @@ void dummy_free(void *p)
 #define CMD_BUF_SIZE (128 + FILENAME_MAX)
 /* need to declare this as it is masked by default in linux */
 
-static char *build_shell_command(const char *gdb_filename)
+static char *build_shell_command()
 {
     int   pid = getpid();
     char *buf = ALLOC_N(char, CMD_BUF_SIZE);
     char *command =
-        "gdb -quiet -command=%s %s %d 2>/dev/null | grep '^[ #]'";
+        "gdb -quiet -ex='bt' -ex='quit' %s %d 2>/dev/null | grep '^[ #]'";
 
-    snprintf(buf, CMD_BUF_SIZE, command, gdb_filename, progname(), pid);
+    snprintf(buf, CMD_BUF_SIZE, command, progname(), pid);
     return buf;
 }
 
-/* Returns the fd to the tempfile */
-static int build_tempfile(char *name, size_t max_size)
-{
-    char *tmpdir = getenv("TMPDIR");
-
-    snprintf(name, max_size, "%s/frt.XXXXXXXXXX", tmpdir ? tmpdir : "/tmp");
-    return mkstemp(name);
-}
-
-static char *build_gdb_commandfile()
-{
-    const char *commands = "bt\nquit\n";
-    char *filename = ALLOC_N(char, FILENAME_MAX);
-    int fd = build_tempfile(filename, FILENAME_MAX);
-    if (fd < 0) { return NULL; }
-    write(fd, commands, strlen(commands));
-    close(fd);
-    return filename;
-}
 #endif
 
 /**
@@ -290,12 +286,7 @@ char *get_stacktrace()
     char *gdb_filename = NULL, *buf = NULL, *stack = NULL;
     int   offset = -BUFFER_SIZE;
 
-    if ( !(gdb_filename = build_gdb_commandfile()) ) {
-        fprintf(EXCEPTION_STREAM,
-                "Unable to build gdb command file\n");
-        goto cleanup;
-    }
-    if ( !(buf = build_shell_command(gdb_filename)) ) {
+    if ( !(buf = build_shell_command()) ) {
         fprintf(EXCEPTION_STREAM,
                 "Unable to build stacktrace shell command\n");
         goto cleanup;