Do not escape the backslash character in shell output. (CVS 353)

FossilOrigin-Name: 5f8c097ebef28315ac2335a768d101e995ccbba2

diff --git a/manifest b/manifest
index 92042a461a21cef47c90983dcabab49dd02b1c75..1e78302997d37ad57f67138b7d455742c535778e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s2.2.4\s(CVS\s449)
-D 2002-01-22T14:15:00
+C Do\snot\sescape\sthe\sbackslash\scharacter\sin\sshell\soutput.\s(CVS\s353)
+D 2002-01-24T00:00:21
 F Makefile.in 9fa4277413bf1d9cf91365f07d4108d7d87ed2af
 F Makefile.template 3e26a3b9e7aee1b811deaf673e8d8973bdb3f22d
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -37,7 +37,7 @@ F src/parse.y f3fc4fb5766393003577bd175eb611495f6efd9f
 F src/printf.c 300a90554345751f26e1fc0c0333b90a66110a1d
 F src/random.c f6b36bec5ebd3edb3440224bf5bf811fe4ac9a1b
 F src/select.c de0d1d12e258d339a7936556512680366177f277
-F src/shell.c a77f9f1fad44a6e109b0c1bf7a170896842564e1
+F src/shell.c c102dfe388c7618a668c944ff157c49cb48f28e3
 F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
 F src/sqlite.h.in f57074c84a2c112a5093ba7a9d9636aa9cacc87c
 F src/sqliteInt.h 3274f3039db3164ba8c31acce027ea6408f247b3
@@ -119,7 +119,7 @@ F www/speed.tcl 83457b2bf6bb430900bd48ca3dd98264d9a916a5
 F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279
 F www/tclsqlite.tcl 829b393d1ab187fd7a5e978631b3429318885c49
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 035984a5b00b4a1a6505405f40b15c7695283c0a
-R 8941cac6aacb0ffecd385f18a7bbf6c9
+P 16712dae4feedd001d8153141a55e298b3a80a94
+R 0530842c82f7bef6b5f9c0ae1cc69c65
 U drh
-Z 8de421cb4f9d39c4c47e4ceb52ea7f81
+Z 61c11f99131a5810bde1ae96d98c46d4

diff --git a/manifest.uuid b/manifest.uuid
index 32b220f605bddbb3379fc9abb723800ac54eecd3..6eeda72068f028392c873527426de0d2d225e3f2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-16712dae4feedd001d8153141a55e298b3a80a94
\ No newline at end of file
+5f8c097ebef28315ac2335a768d101e995ccbba2
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 0b9c18f4322f38ec5369031099cc26d5a71c073b..a500d18c24eeb0bfe690bba5e72c5e83b9a41d80 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.43 2002/01/22 12:39:24 drh Exp $
+** $Id: shell.c,v 1.44 2002/01/24 00:00:21 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -125,7 +125,6 @@ struct callback_data {
   FILE *out;             /* Write results here */
   int mode;              /* An output mode setting */
   int showHeader;        /* True to show column names in List or Column mode */
-  int escape;            /* Escape this character when in MODE_List */
   char *zDestTable;      /* Name of destination table when MODE_Insert */
   char separator[20];    /* Separator character for MODE_List */
   int colWidth[100];     /* Requested width of each column when in column mode*/
@@ -315,18 +314,7 @@ static int callback(void *pArg, int nArg, char **azArg, char **azCol){
       for(i=0; i<nArg; i++){
         char *z = azArg[i];
         if( z==0 ) z = "";
-        while( *z ){
-          int j;
-          for(j=0; z[j] && z[j]!=p->escape && z[j]!='\\'; j++){}
-          if( j>0 ){
-            fprintf(p->out, "%.*s", j, z);
-          }
-          if( z[j] ){
-            fprintf(p->out, "\\%c", z[j]);
-            z++;
-          }
-          z += j;
-        }
+        fprintf(p->out, "%s", z);
         if( i<nArg-1 ){
           fprintf(p->out, "%s", p->separator);
         }else if( p->mode==MODE_Semi ){