sync with tokyocabinet-1.3.27.tar.gz

clement · Jan 6, 2009 · cb9f7b5 · cb9f7b5
1 parent 62d0f49
commit cb9f7b5
Show file tree

Hide file tree

Showing 36 changed files with 103 additions and 63 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-27  Mikio Hirabayashi  <mikio@users.sourceforge.net>
+
+	* tcadb.c (tcadbmisc): the return value of the "getlist" function was modified.
+
+	- Release: 1.3.27
+
 2008-12-17  Mikio Hirabayashi  <mikio@users.sourceforge.net>
 
 	* tchdb.c (tchdbforeach): global locking was replaced by record locking.

diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for tokyocabinet 1.3.26.
+# Generated by GNU Autoconf 2.61 for tokyocabinet 1.3.27.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='tokyocabinet'
 PACKAGE_TARNAME='tokyocabinet'
-PACKAGE_VERSION='1.3.26'
-PACKAGE_STRING='tokyocabinet 1.3.26'
+PACKAGE_VERSION='1.3.27'
+PACKAGE_STRING='tokyocabinet 1.3.27'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -1192,7 +1192,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tokyocabinet 1.3.26 to adapt to many kinds of systems.
+\`configure' configures tokyocabinet 1.3.27 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1253,7 +1253,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tokyocabinet 1.3.26:";;
+     short | recursive ) echo "Configuration of tokyocabinet 1.3.27:";;
    esac
   cat <<\_ACEOF
 
@@ -1354,7 +1354,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tokyocabinet configure 1.3.26
+tokyocabinet configure 1.3.27
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1368,7 +1368,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tokyocabinet $as_me 1.3.26, which was
+It was created by tokyocabinet $as_me 1.3.27, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1724,7 +1724,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Package information
 MYLIBVER=7
-MYLIBREV=3
+MYLIBREV=4
 MYFORMATVER="1.0"
 
 # Targets
@@ -6279,7 +6279,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tokyocabinet $as_me 1.3.26, which was
+This file was extended by tokyocabinet $as_me 1.3.27, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6322,7 +6322,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-tokyocabinet config.status 1.3.26
+tokyocabinet config.status 1.3.27
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
@@ -7,11 +7,11 @@
 #================================================================
 
 # Package name
-AC_INIT(tokyocabinet, 1.3.26)
+AC_INIT(tokyocabinet, 1.3.27)
 
 # Package information
 MYLIBVER=7
-MYLIBREV=3
+MYLIBREV=4
 MYFORMATVER="1.0"
 
 # Targets

diff --git a/doc/index.html b/doc/index.html
@@ -64,8 +64,8 @@
 
 <h1 id="headline">Tokyo Cabinet: a modern implementation of DBM</h1>
 
-<div class="note">Copyright (C) 2006-2008 Mikio Hirabayashi</div>
-<div class="note">Last Update: Tue, 25 Nov 2008 17:55:58 +0900</div>
+<div class="note">Copyright (C) 2006-2009 Mikio Hirabayashi</div>
+<div class="note">Last Update: Sat, 03 Jan 2009 21:41:33 +0900</div>
 <div class="navi">[<span class="void">English</span>/<a href="index.ja.html" hreflang="ja">Japanese</a>]</div>
 
 <div class="logo"><img src="logo.png" alt="Tokyo Cabinet" width="300" height="110" /></div>
@@ -126,7 +126,7 @@ <h2>Packages</h2>
 <p>The following are the source packages of Tokyo Cabinet.  As for binary packages, see the site of each distributor.</p>
 
 <ul>
-<li><a href="tokyocabinet-1.3.26.tar.gz">Latest Source Package (version 1.3.26)</a></li>
+<li><a href="tokyocabinet-1.3.27.tar.gz">Latest Source Package (version 1.3.27)</a></li>
 <li><a href="pastpkg/">Past Versions</a></li>
 </ul>
 

diff --git a/doc/index.ja.html b/doc/index.ja.html
@@ -105,8 +105,8 @@
 
 <h1 id="headline">Tokyo Cabinet: DBMの現代的な壱実装</h1>
 
-<div class="note">Copyright (C) 2006-2008 Mikio Hirabayashi</div>
-<div class="note">Last Update: Tue, 25 Nov 2008 17:55:58 +0900</div>
+<div class="note">Copyright (C) 2006-2009 Mikio Hirabayashi</div>
+<div class="note">Last Update: Sat, 03 Jan 2009 21:41:33 +0900</div>
 <div class="navi">[<a href="index.html" hreflang="en">English</a>/<span class="void">Japanese</span>]</div>
 
 <div class="logo"><img src="logo-ja.png" alt="Tokyo Cabinet" width="300" height="110" /></div>
@@ -167,7 +167,7 @@ <h2>ダウンロード</h2>
 <p>以下のソースパッケージをダウンロードしてください。バイナリパッケージについては、各ディストリビュータのサイトをご覧ください。</p>
 
 <ul>
-<li><a href="tokyocabinet-1.3.26.tar.gz">最新のソースパッケージ（バージョン1.3.26）</a></li>
+<li><a href="tokyocabinet-1.3.27.tar.gz">最新のソースパッケージ（バージョン1.3.27）</a></li>
 <li><a href="pastpkg/">過去のバージョン</a></li>
 </ul>
 

diff --git a/doc/spex-en.html b/doc/spex-en.html
@@ -23,8 +23,8 @@
 
 <h1>Fundamental Specifications of Tokyo Cabinet Version 1</h1>
 
-<div class="note">Copyright (C) 2006-2008 Mikio Hirabayashi</div>
-<div class="note">Last Update: Tue, 25 Nov 2008 17:55:58 +0900</div>
+<div class="note">Copyright (C) 2006-2009 Mikio Hirabayashi</div>
+<div class="note">Last Update: Sat, 03 Jan 2009 21:41:33 +0900</div>
 <div class="navi">[<span class="void">English</span>/<a href="spex-ja.html" hreflang="ja">Japanese</a>] [<a href="index.html">HOME</a>]</div>
 
 <hr />
@@ -184,7 +184,7 @@ <h3>Result</h3>
 /usr/local/include/tcfdb.h
 /usr/local/include/tcadb.h
 /usr/local/lib/libtokyocabinet.a
-/usr/local/lib/libtokyocabinet.so.7.3.0
+/usr/local/lib/libtokyocabinet.so.7.4.0
 /usr/local/lib/libtokyocabinet.so.7
 /usr/local/lib/libtokyocabinet.so
 /usr/local/lib/pkgconfig/tokyocabinet.pc
@@ -5431,7 +5431,7 @@ <h3>API</h3>
 <dd>`<var>name</var>' specifies the name of the function.</dd>
 <dd>`<var>args</var>' specifies a list object containing arguments.</dd>
 <dd>If successful, the return value is a list object of the result.  `NULL' is returned on failure.</dd>
-<dd>All databases support "putlist", "outlist", and "getlist".  "putlist" is to store records.  It receives keys and values one after the other, and returns an empty list.  "outlist" is to remove records.  It receives keys, and returns an empty list.  "getlist" is to retrieve records.  It receives keys, and returns values.  Because the object of the return value is created with the function `tclistnew', it should be deleted with the function `tclistdel' when it is no longer in use.</dd>
+<dd>All databases support "putlist", "outlist", and "getlist".  "putlist" is to store records.  It receives keys and values one after the other, and returns an empty list.  "outlist" is to remove records.  It receives keys, and returns an empty list.  "getlist" is to retrieve records.  It receives keys, and returns keys and values of corresponding records one after the other.  Because the object of the return value is created with the function `tclistnew', it should be deleted with the function `tclistdel' when it is no longer in use.</dd>
 </dl>
 
 <h3>Example</h3>

diff --git a/doc/spex-ja.html b/doc/spex-ja.html
@@ -23,8 +23,8 @@
 
 <h1>Tokyo Cabinet第1版基本仕様書</h1>
 
-<div class="note">Copyright (C) 2006-2008 Mikio Hirabayashi</div>
-<div class="note">Last Update: Tue, 25 Nov 2008 17:55:58 +0900</div>
+<div class="note">Copyright (C) 2006-2009 Mikio Hirabayashi</div>
+<div class="note">Last Update: Sat, 03 Jan 2009 21:41:33 +0900</div>
 <div class="navi">[<a href="spex-en.html" hreflang="en">English</a>/<span class="void">Japanese</span>] [<a href="index.ja.html">HOME</a>]</div>
 
 <hr />
@@ -187,7 +187,7 @@ <h3>結果</h3>
 /usr/local/include/tcfdb.h
 /usr/local/include/tcadb.h
 /usr/local/lib/libtokyocabinet.a
-/usr/local/lib/libtokyocabinet.so.7.3.0
+/usr/local/lib/libtokyocabinet.so.7.4.0
 /usr/local/lib/libtokyocabinet.so.7
 /usr/local/lib/libtokyocabinet.so
 /usr/local/lib/pkgconfig/tokyocabinet.pc
@@ -5434,7 +5434,7 @@ <h3>API（英語ごめんね）</h3>
 <dd>`<var>name</var>' specifies the name of the function.</dd>
 <dd>`<var>args</var>' specifies a list object containing arguments.</dd>
 <dd>If successful, the return value is a list object of the result.  `NULL' is returned on failure.</dd>
-<dd>All databases support "putlist", "outlist", and "getlist".  "putlist" is to store records.  It receives keys and values one after the other, and returns an empty list.  "outlist" is to remove records.  It receives keys, and returns an empty list.  "getlist" is to retrieve records.  It receives keys, and returns values.  Because the object of the return value is created with the function `tclistnew', it should be deleted with the function `tclistdel' when it is no longer in use.</dd>
+<dd>All databases support "putlist", "outlist", and "getlist".  "putlist" is to store records.  It receives keys and values one after the other, and returns an empty list.  "outlist" is to remove records.  It receives keys, and returns an empty list.  "getlist" is to retrieve records.  It receives keys, and returns keys and values of corresponding records one after the other.  Because the object of the return value is created with the function `tclistnew', it should be deleted with the function `tclistdel' when it is no longer in use.</dd>
 </dl>
 
 <h3>コード例</h3>

diff --git a/lab/yearchange b/lab/yearchange
@@ -0,0 +1,29 @@
+#! /bin/sh
+
+#================================================================
+# yearchange
+# Replace year expressions
+#================================================================
+
+
+# set variables
+year=`date '+%Y'`
+regex='(\.h|\.c|\.cc|\.cpp|\.cxx|\.java|\.pl|\.pm|\.pod|\.rb|\.rd|\.lua)$'
+
+
+# replace year expressions
+find . -type f | egrep "$regex" |
+while read file
+do
+  echo "$file"
+  sed "s/\\(20[0-9][0-9]\\)-\\(20[0-9][0-9]\\)/\\1-$year/g" "$file" > "$file.tmp"
+  mv -f "$file.tmp" "$file"
+done
+
+
+# exit normally
+exit 0
+
+
+
+# END OF FILE
diff --git a/man/tcadb.3 b/man/tcadb.3
@@ -581,7 +581,7 @@ The function `tcadbmisc' is used in order to call a versatile function for misce
 If successful, the return value is a list object of the result.  `NULL' is returned on failure.
 .RE
 .RS
-All databases support "putlist", "outlist", and "getlist".  "putlist" is to store records.  It receives keys and values one after the other, and returns an empty list.  "outlist" is to remove records.  It receives keys, and returns an empty list.  "getlist" is to retrieve records.  It receives keys, and returns values.  Because the object of the return value is created with the function `tclistnew', it should be deleted with the function `tclistdel' when it is no longer in use.
+All databases support "putlist", "outlist", and "getlist".  "putlist" is to store records.  It receives keys and values one after the other, and returns an empty list.  "outlist" is to remove records.  It receives keys, and returns an empty list.  "getlist" is to retrieve records.  It receives keys, and returns keys and values of corresponding records one after the other.  Because the object of the return value is created with the function `tclistnew', it should be deleted with the function `tclistdel' when it is no longer in use.
 .RE
 .RE
 

diff --git a/myconf.c b/myconf.c
@@ -1,6 +1,6 @@
 /*************************************************************************************************
  * System-dependent configurations of Tokyo Cabinet
- *                                                      Copyright (C) 2006-2008 Mikio Hirabayashi
+ *                                                      Copyright (C) 2006-2009 Mikio Hirabayashi
  * This file is part of Tokyo Cabinet.
  * Tokyo Cabinet is free software; you can redistribute it and/or modify it under the terms of
  * the GNU Lesser General Public License as published by the Free Software Foundation; either

diff --git a/myconf.h b/myconf.h
@@ -1,6 +1,6 @@
 /*************************************************************************************************
  * System-dependent configurations of Tokyo Cabinet
- *                                                      Copyright (C) 2006-2008 Mikio Hirabayashi
+ *                                                      Copyright (C) 2006-2009 Mikio Hirabayashi
  * This file is part of Tokyo Cabinet.
  * Tokyo Cabinet is free software; you can redistribute it and/or modify it under the terms of
  * the GNU Lesser General Public License as published by the Free Software Foundation; either

diff --git a/tcadb.c b/tcadb.c
@@ -1,6 +1,6 @@
 /*************************************************************************************************
  * The abstract database API of Tokyo Cabinet
- *                                                      Copyright (C) 2006-2008 Mikio Hirabayashi
+ *                                                      Copyright (C) 2006-2009 Mikio Hirabayashi
  * This file is part of Tokyo Cabinet.
  * Tokyo Cabinet is free software; you can redistribute it and/or modify it under the terms of
  * the GNU Lesser General Public License as published by the Free Software Foundation; either
@@ -943,6 +943,7 @@ TCLIST *tcadbmisc(TCADB *adb, const char *name, const TCLIST *args){
         int vsiz;
         char *vbuf = tcmdbget(adb->mdb, kbuf, ksiz, &vsiz);
         if(vbuf){
+          tclistpush(rv, kbuf, ksiz);
           tclistpush(rv, vbuf, vsiz);
           tcfree(vbuf);
         }
@@ -977,6 +978,7 @@ TCLIST *tcadbmisc(TCADB *adb, const char *name, const TCLIST *args){
         int vsiz;
         char *vbuf = tcndbget(adb->ndb, kbuf, ksiz, &vsiz);
         if(vbuf){
+          tclistpush(rv, kbuf, ksiz);
           tclistpush(rv, vbuf, vsiz);
           tcfree(vbuf);
         }
@@ -1028,6 +1030,7 @@ TCLIST *tcadbmisc(TCADB *adb, const char *name, const TCLIST *args){
         int vsiz;
         char *vbuf = tchdbget(adb->hdb, kbuf, ksiz, &vsiz);
         if(vbuf){
+          tclistpush(rv, kbuf, ksiz);
           tclistpush(rv, vbuf, vsiz);
           tcfree(vbuf);
         } else if(tchdbecode(adb->hdb) != TCENOREC){
@@ -1086,6 +1089,7 @@ TCLIST *tcadbmisc(TCADB *adb, const char *name, const TCLIST *args){
         if(vals){
           int vnum = tclistnum(vals);
           for(int j = 0; j < vnum; j++){
+            tclistpush(rv, kbuf, ksiz);
             int vsiz;
             const char *vbuf = tclistval(vals, j, &vsiz);
             tclistpush(rv, vbuf, vsiz);
@@ -1146,6 +1150,7 @@ TCLIST *tcadbmisc(TCADB *adb, const char *name, const TCLIST *args){
         int vsiz;
         char *vbuf = tcfdbget2(adb->fdb, kbuf, ksiz, &vsiz);
         if(vbuf){
+          tclistpush(rv, kbuf, ksiz);
           tclistpush(rv, vbuf, vsiz);
           tcfree(vbuf);
         } else if(tcfdbecode(adb->fdb) != TCENOREC){

diff --git a/tcadb.h b/tcadb.h
@@ -1,6 +1,6 @@
 /*************************************************************************************************
  * The abstract database API of Tokyo Cabinet
- *                                                      Copyright (C) 2006-2008 Mikio Hirabayashi
+ *                                                      Copyright (C) 2006-2009 Mikio Hirabayashi
  * This file is part of Tokyo Cabinet.
  * Tokyo Cabinet is free software; you can redistribute it and/or modify it under the terms of
  * the GNU Lesser General Public License as published by the Free Software Foundation; either
@@ -358,9 +358,9 @@ uint64_t tcadbsize(TCADB *adb);
    All databases support "putlist", "outlist", and "getlist".  "putlist" is to store records.  It
    receives keys and values one after the other, and returns an empty list.  "outlist" is to
    remove records.  It receives keys, and returns an empty list.  "getlist" is to retrieve
-   records.  It receives keys, and returns values.  Because the object of the return value is
-   created with the function `tclistnew', it should be deleted with the function `tclistdel' when
-   it is no longer in use. */
+   records.  It receives keys, and returns keys and values of corresponding records one after the
+   other.  Because the object of the return value is created with the function `tclistnew', it
+   should be deleted with the function `tclistdel' when it is no longer in use. */
 TCLIST *tcadbmisc(TCADB *adb, const char *name, const TCLIST *args);
 
 

diff --git a/tcamgr.c b/tcamgr.c
@@ -1,6 +1,6 @@
 /*************************************************************************************************
  * The command line utility of the abstract database API
- *                                                      Copyright (C) 2006-2008 Mikio Hirabayashi
+ *                                                      Copyright (C) 2006-2009 Mikio Hirabayashi
  * This file is part of Tokyo Cabinet.
  * Tokyo Cabinet is free software; you can redistribute it and/or modify it under the terms of
  * the GNU Lesser General Public License as published by the Free Software Foundation; either
@@ -590,7 +590,7 @@ static int procmisc(const char *name, const char *func, const TCLIST *args, bool
 /* perform version command */
 static int procversion(void){
   printf("Tokyo Cabinet version %s (%d:%s)\n", tcversion, _TC_LIBVER, _TC_FORMATVER);
-  printf("Copyright (C) 2006-2008 Mikio Hirabayashi\n");
+  printf("Copyright (C) 2006-2009 Mikio Hirabayashi\n");
   return 0;
 }
 

diff --git a/tcatest.c b/tcatest.c
@@ -1,6 +1,6 @@
 /*************************************************************************************************
  * The test cases of the abstract database API
- *                                                      Copyright (C) 2006-2008 Mikio Hirabayashi
+ *                                                      Copyright (C) 2006-2009 Mikio Hirabayashi
  * This file is part of Tokyo Cabinet.
  * Tokyo Cabinet is free software; you can redistribute it and/or modify it under the terms of
  * the GNU Lesser General Public License as published by the Free Software Foundation; either

diff --git a/tcawmgr.c b/tcawmgr.c
@@ -1,6 +1,6 @@
 /*************************************************************************************************
  * The CGI utility of the abstract database API
- *                                                      Copyright (C) 2006-2008 Mikio Hirabayashi
+ *                                                      Copyright (C) 2006-2009 Mikio Hirabayashi
  * This file is part of Tokyo Cabinet.
  * Tokyo Cabinet is free software; you can redistribute it and/or modify it under the terms of
  * the GNU Lesser General Public License as published by the Free Software Foundation; either

diff --git a/tcbdb.c b/tcbdb.c
@@ -1,6 +1,6 @@
 /*************************************************************************************************
  * The B+ tree database API of Tokyo Cabinet
- *                                                      Copyright (C) 2006-2008 Mikio Hirabayashi
+ *                                                      Copyright (C) 2006-2009 Mikio Hirabayashi
  * This file is part of Tokyo Cabinet.
  * Tokyo Cabinet is free software; you can redistribute it and/or modify it under the terms of
  * the GNU Lesser General Public License as published by the Free Software Foundation; either

diff --git a/tcbdb.h b/tcbdb.h
@@ -1,6 +1,6 @@
 /*************************************************************************************************
  * The B+ tree database API of Tokyo Cabinet
- *                                                      Copyright (C) 2006-2008 Mikio Hirabayashi
+ *                                                      Copyright (C) 2006-2009 Mikio Hirabayashi
  * This file is part of Tokyo Cabinet.
  * Tokyo Cabinet is free software; you can redistribute it and/or modify it under the terms of
  * the GNU Lesser General Public License as published by the Free Software Foundation; either