Import SQLite 3.10.2.

third_party/sqlite/src/ext/misc/amatch.c

 /*
 ** 2013-03-14
 **
 ** The author disclaims copyright to this source code.  In place of
 ** a legal notice, here is a blessing:
 **
 **    May you do good and not evil.
 **    May you find forgiveness for yourself and forgive others.
 **    May you share freely, never taking more than you give.
 **
@@ skipping 380 matching lines @@
   /* assert( amatchAvlIntegrity(*ppHead) ); */
   /* assert( amatchAvlIntegrity2(*ppHead) ); */
   return 0;
 }
 
 /* Remove node pOld from the tree.  pOld must be an element of the tree or
 ** the AVL tree will become corrupt.
 */
 static void amatchAvlRemove(amatch_avl **ppHead, amatch_avl *pOld){
   amatch_avl **ppParent;
-  amatch_avl *pBalance;
+  amatch_avl *pBalance = 0;
   /* assert( amatchAvlSearch(*ppHead, pOld->zKey)==pOld ); */
   ppParent = amatchAvlFromPtr(pOld, ppHead);
   if( pOld->pBefore==0 && pOld->pAfter==0 ){
     *ppParent = 0;
     pBalance = pOld->pUp;
   }else if( pOld->pBefore && pOld->pAfter ){
     amatch_avl *pX, *pY;
     pX = amatchAvlFirst(pOld->pAfter);
     *amatchAvlFromPtr(pX, 0) = pX->pAfter;
     if( pX->pAfter ) pX->pAfter->pUp = pX->pUp;
@@ skipping 397 matching lines @@
 **
 ** If it is, return a pointer to the first character of VALUE.
 ** If not, return NULL.  Spaces around the = are ignored.
 */
 static const char *amatchValueOfKey(const char *zKey, const char *zStr){
   int nKey = (int)strlen(zKey);
   int nStr = (int)strlen(zStr);
   int i;
   if( nStr<nKey+1 ) return 0;
   if( memcmp(zStr, zKey, nKey)!=0 ) return 0;
-  for(i=nKey; isspace(zStr[i]); i++){}
+  for(i=nKey; isspace((unsigned char)zStr[i]); i++){}
   if( zStr[i]!='=' ) return 0;
   i++;
-  while( isspace(zStr[i]) ){ i++; }
+  while( isspace((unsigned char)zStr[i]) ){ i++; }
   return zStr+i;
 }
 
 /*
 ** xConnect/xCreate method for the amatch module. Arguments are:
 **
 **   argv[0]    -> module name  ("approximate_match")
 **   argv[1]    -> database name
 **   argv[2]    -> table name
 **   argv[3...] -> arguments
@@ skipping 158 matching lines @@
 
 /*
 ** Write the zCost[] field for a amatch_word object
 */
 static void amatchWriteCost(amatch_word *pWord){
   amatchEncodeInt(pWord->rCost, pWord->zCost);
   amatchEncodeInt(pWord->iSeq, pWord->zCost+4);
   pWord->zCost[8] = 0;
 }
 
+/* Circumvent compiler warnings about the use of strcpy() by supplying
+** our own implementation.
+*/
+#if defined(__OpenBSD__)
+static void amatchStrcpy(char *dest, const char *src){
+  while( (*(dest++) = *(src++))!=0 ){}
+}
+static void amatchStrcat(char *dest, const char *src){
+  while( *dest ) dest++;
+  amatchStrcpy(dest, src);
+}
+#else
+# define amatchStrcpy strcpy
+# define amatchStrcat strcat
+#endif
+
+
 /*
 ** Add a new amatch_word object to the queue.
 **
 ** If a prior amatch_word object with the same zWord, and nMatch
 ** already exists, update its rCost (if the new rCost is less) but
 ** otherwise leave it unchanged.  Do not add a duplicate.
 **
 ** Do nothing if the cost exceeds threshold.
 */
 static void amatchAddWord(
@@ skipping 55 matching lines @@
   amatchWriteCost(pWord);
   pWord->nMatch = nMatch;
   pWord->pNext = pCur->pAllWords;
   pCur->pAllWords = pWord;
   pWord->sCost.zKey = pWord->zCost;
   pWord->sCost.pWord = pWord;
   pOther = amatchAvlInsert(&pCur->pCost, &pWord->sCost);
   assert( pOther==0 ); (void)pOther;
   pWord->sWord.zKey = pWord->zWord;
   pWord->sWord.pWord = pWord;
-  strcpy(pWord->zWord, pCur->zBuf);
+  amatchStrcpy(pWord->zWord, pCur->zBuf);
   pOther = amatchAvlInsert(&pCur->pWord, &pWord->sWord);
   assert( pOther==0 ); (void)pOther;
 #ifdef AMATCH_TRACE_1
   printf("INSERT [%s][%.*s^%s] %d (\"%s\" \"%s\")\n", pWord->zWord+2,
        pWord->nMatch, pCur->zInput, pCur->zInput+pWord->nMatch, rCost,
        pWord->zWord, pWord->zCost);
 #endif
 }
 
+
 /*
 ** Advance a cursor to its next row of output
 */
 static int amatchNext(sqlite3_vtab_cursor *cur){
   amatch_cursor *pCur = (amatch_cursor*)cur;
   amatch_word *pWord = 0;
   amatch_avl *pNode;
   int isMatch = 0;
   amatch_vtab *p = pCur->pVtab;
   int nWord;
@@ skipping 45 matching lines @@
     printf("PROCESS [%s][%.*s^%s] %d (\"%s\" \"%s\")\n",
        pWord->zWord+2, pWord->nMatch, pCur->zInput, pCur->zInput+pWord->nMatch,
        pWord->rCost, pWord->zWord, pWord->zCost);
 #endif
     nWord = (int)strlen(pWord->zWord+2);
     if( nWord+20>nBuf ){
       nBuf = nWord+100;
       zBuf = sqlite3_realloc(zBuf, nBuf);
       if( zBuf==0 ) return SQLITE_NOMEM;
     }
-    strcpy(zBuf, pWord->zWord+2);
+    amatchStrcpy(zBuf, pWord->zWord+2);
     zNext[0] = 0;
     zNextIn[0] = pCur->zInput[pWord->nMatch];
     if( zNextIn[0] ){
       for(i=1; i<=4 && (pCur->zInput[pWord->nMatch+i]&0xc0)==0x80; i++){
         zNextIn[i] = pCur->zInput[pWord->nMatch+i];
       }
       zNextIn[i] = 0;
       nNextIn = i;
     }else{
       nNextIn = 0;
     }
 
     if( zNextIn[0] && zNextIn[0]!='*' ){
       sqlite3_reset(p->pVCheck);
-      strcat(zBuf, zNextIn);
+      amatchStrcat(zBuf, zNextIn);
       sqlite3_bind_text(p->pVCheck, 1, zBuf, nWord+nNextIn, SQLITE_STATIC);
       rc = sqlite3_step(p->pVCheck);
       if( rc==SQLITE_ROW ){
         zW = (const char*)sqlite3_column_text(p->pVCheck, 0);
         if( strncmp(zBuf, zW, nWord+nNextIn)==0 ){
           amatchAddWord(pCur, pWord->rCost, pWord->nMatch+nNextIn, zBuf, "");
         }
       }
       zBuf[nWord] = 0;
     }
 
     while( 1 ){
-      strcpy(zBuf+nWord, zNext);
+      amatchStrcpy(zBuf+nWord, zNext);
       sqlite3_reset(p->pVCheck);
       sqlite3_bind_text(p->pVCheck, 1, zBuf, -1, SQLITE_TRANSIENT);
       rc = sqlite3_step(p->pVCheck);
       if( rc!=SQLITE_ROW ) break;
       zW = (const char*)sqlite3_column_text(p->pVCheck, 0);
-      strcpy(zBuf+nWord, zNext);
+      amatchStrcpy(zBuf+nWord, zNext);
       if( strncmp(zW, zBuf, nWord)!=0 ) break;
       if( (zNextIn[0]=='*' && zNextIn[1]==0)
        || (zNextIn[0]==0 && zW[nWord]==0)
       ){
         isMatch = 1;
         zNextIn[0] = 0;
         nNextIn = 0;
         break;
       }
       zNext[0] = zW[nWord];
@@ skipping 282 matching lines @@
   const sqlite3_api_routines *pApi
 ){
   int rc = SQLITE_OK;
   SQLITE_EXTENSION_INIT2(pApi);
   (void)pzErrMsg;  /* Not used */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
   rc = sqlite3_create_module(db, "approximate_match", &amatchModule, 0);
 #endif /* SQLITE_OMIT_VIRTUALTABLE */
   return rc;
 }