/ Check-in [a886062457]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix the TCL installer so that it omits the release number. Ticket #3396. Use strcmp() instead of sqlite3StrICmp() in the "copy" method of the SQLite object in the TCL interface. (CVS 5735)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a88606245760eaf8054d67773db7d8b795e8ca25
User & Date: drh 2008-09-23 10:12:14
Context
2008-09-23
10:16
Remove an unused variable from the test logic. (CVS 5736) check-in: 309ba380d9 user: drh tags: trunk
10:12
Fix the TCL installer so that it omits the release number. Ticket #3396. Use strcmp() instead of sqlite3StrICmp() in the "copy" method of the SQLite object in the TCL interface. (CVS 5735) check-in: a886062457 user: drh tags: trunk
09:58
Add no-op Unload entry points to the TCL interface. Ticket #3397. (CVS 5734) check-in: b31dd1e3f1 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.in.

   743    743   	$(INSTALL) -d $(DESTDIR)$(includedir)
   744    744   	$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(includedir)
   745    745   	$(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir)
   746    746   	$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
   747    747   	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
   748    748   
   749    749   tcl_install:	libtclsqlite3.la
   750         -	$(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(VERSION)
          750  +	$(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(RELEASE)
   751    751   
   752    752   clean:	
   753    753   	rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la
   754    754   	rm -f sqlite3.h opcodes.*
   755    755   	rm -rf .libs .deps tsrc
   756    756   	rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz
   757    757   	rm -f mkkeywordhash$(BEXE) keywordhash.h

Changes to src/tclsqlite.c.

     8      8   **    May you find forgiveness for yourself and forgive others.
     9      9   **    May you share freely, never taking more than you give.
    10     10   **
    11     11   *************************************************************************
    12     12   ** A TCL Interface to SQLite.  Append this file to sqlite3.c and
    13     13   ** compile the whole thing to build a TCL-enabled version of SQLite.
    14     14   **
    15         -** $Id: tclsqlite.c,v 1.225 2008/09/23 09:58:47 drh Exp $
           15  +** $Id: tclsqlite.c,v 1.226 2008/09/23 10:12:15 drh Exp $
    16     16   */
    17     17   #include "tcl.h"
    18     18   #include <errno.h>
    19     19   
    20     20   /*
    21     21   ** Some additional include files are needed if this file is not
    22     22   ** appended to the amalgamation.
................................................................................
  1339   1339       zFile = Tcl_GetStringFromObj(objv[4], 0);
  1340   1340       nSep = strlen(zSep);
  1341   1341       nNull = strlen(zNull);
  1342   1342       if( nSep==0 ){
  1343   1343         Tcl_AppendResult(interp,"Error: non-null separator required for copy",0);
  1344   1344         return TCL_ERROR;
  1345   1345       }
  1346         -    if(sqlite3StrICmp(zConflict, "rollback") != 0 &&
  1347         -       sqlite3StrICmp(zConflict, "abort"   ) != 0 &&
  1348         -       sqlite3StrICmp(zConflict, "fail"    ) != 0 &&
  1349         -       sqlite3StrICmp(zConflict, "ignore"  ) != 0 &&
  1350         -       sqlite3StrICmp(zConflict, "replace" ) != 0 ) {
         1346  +    if(strcmp(zConflict, "rollback") != 0 &&
         1347  +       strcmp(zConflict, "abort"   ) != 0 &&
         1348  +       strcmp(zConflict, "fail"    ) != 0 &&
         1349  +       strcmp(zConflict, "ignore"  ) != 0 &&
         1350  +       strcmp(zConflict, "replace" ) != 0 ) {
  1351   1351         Tcl_AppendResult(interp, "Error: \"", zConflict, 
  1352   1352               "\", conflict-algorithm must be one of: rollback, "
  1353   1353               "abort, fail, ignore, or replace", 0);
  1354   1354         return TCL_ERROR;
  1355   1355       }
  1356   1356       zSql = sqlite3_mprintf("SELECT * FROM '%q'", zTable);
  1357   1357       if( zSql==0 ){