From: larrybr Date: Thu, 16 Nov 2023 18:31:05 +0000 (+0000) Subject: Simplify and make more rational how console I/O package features are selected. (Motiv... X-Git-Tag: version-3.45.0~134^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1edecf5d3c3a552af15e515102b98502fc82cc0;p=thirdparty%2Fsqlite.git Simplify and make more rational how console I/O package features are selected. (Motivated by Fiddle and other command-line utilities to soon use the package.) No substantive code-execution changes. FossilOrigin-Name: 1cde05877b7e47cb2ab9de26edd5245eb5ff1d91e69b94f3b24944fd4f6ccd3e --- diff --git a/Makefile.msc b/Makefile.msc index 3a4d46b01f..33a9746dd4 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -2265,6 +2265,8 @@ SHELL_SRC = \ $(TOP)\ext\consio\console_io.h \ $(TOP)\ext\misc\appendvfs.c \ $(TOP)\ext\misc\completion.c \ + $(TOP)\ext\consio\console_io.c \ + $(TOP)\ext\consio\console_io.h \ $(TOP)\ext\misc\base64.c \ $(TOP)\ext\misc\base85.c \ $(TOP)\ext\misc\decimal.c \ diff --git a/ext/consio/console_io.c b/ext/consio/console_io.c old mode 100755 new mode 100644 index 27727f2a8f..7ed06ccd31 --- a/ext/consio/console_io.c +++ b/ext/consio/console_io.c @@ -28,28 +28,32 @@ # include "sqlite3.h" #endif -#if (defined(_WIN32) || defined(WIN32)) && !SQLITE_OS_WINRT -# ifndef SHELL_NO_SYSINC -# include -# include -# undef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# include -# endif -# define SHELL_CON_TRANSLATE 1 /* Use WCHAR Windows APIs for console I/O */ -#else -# ifndef SHELL_NO_SYSINC -# include +#ifndef SQLITE_CIO_NO_TRANSLATE +# if (defined(_WIN32) || defined(WIN32)) && !SQLITE_OS_WINRT +# ifndef SHELL_NO_SYSINC +# include +# include +# undef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# include +# endif +# define CIO_WIN_WC_XLATE 1 /* Use WCHAR Windows APIs for console I/O */ +# else +# ifndef SHELL_NO_SYSINC +# include +# endif +# define CIO_WIN_WC_XLATE 0 /* Use plain C library stream I/O at console */ # endif -# define SHELL_CON_TRANSLATE 0 /* Use plain C library stream I/O at console */ +#else +# define CIO_WIN_WC_XLATE 0 /* Not exposing translation routines at all */ #endif -#if SHELL_CON_TRANSLATE +#if CIO_WIN_WC_XLATE /* Character used to represent a known-incomplete UTF-8 char group (�) */ static WCHAR cBadGroup = 0xfffd; #endif -#if SHELL_CON_TRANSLATE +#if CIO_WIN_WC_XLATE static HANDLE handleOfFile(FILE *pf){ int fileDesc = _fileno(pf); union { intptr_t osfh; HANDLE fh; } fid = { @@ -59,54 +63,51 @@ static HANDLE handleOfFile(FILE *pf){ } #endif +#ifndef SQLITE_CIO_NO_TRANSLATE typedef struct PerStreamTags { -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE HANDLE hx; DWORD consMode; char acIncomplete[4]; -#else +# else short reachesConsole; -#endif +# endif FILE *pf; } PerStreamTags; /* Define NULL-like value for things which can validly be 0. */ -#define SHELL_INVALID_FILE_PTR ((FILE *)~0) -#if SHELL_CON_TRANSLATE -# define SHELL_INVALID_CONS_MODE 0xFFFF0000 -#endif +# define SHELL_INVALID_FILE_PTR ((FILE *)~0) +# if CIO_WIN_WC_XLATE +# define SHELL_INVALID_CONS_MODE 0xFFFF0000 +# endif -#if SHELL_CON_TRANSLATE -# define PST_INITIALIZER { INVALID_HANDLE_VALUE, SHELL_INVALID_CONS_MODE, \ +# if CIO_WIN_WC_XLATE +# define PST_INITIALIZER { INVALID_HANDLE_VALUE, SHELL_INVALID_CONS_MODE, \ {0,0,0,0}, SHELL_INVALID_FILE_PTR } -#else -# define PST_INITIALIZER { 0, SHELL_INVALID_FILE_PTR } -#endif +# else +# define PST_INITIALIZER { 0, SHELL_INVALID_FILE_PTR } +# endif /* Quickly say whether a known output is going to the console. */ -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE static short pstReachesConsole(PerStreamTags *ppst){ -# if SHELL_CON_TRANSLATE return (ppst->hx != INVALID_HANDLE_VALUE); +} # else - return (ppst->reachesConsole != 0); +# define pstReachesConsole(ppst) 0 # endif -} -#else -# define pstReachesConsole(ppst) 0 -#endif -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE static void restoreConsoleArb(PerStreamTags *ppst){ if( pstReachesConsole(ppst) ) SetConsoleMode(ppst->hx, ppst->consMode); } -#else -# define restoreConsoleArb(ppst) -#endif +# else +# define restoreConsoleArb(ppst) +# endif /* Say whether FILE* appears to be a console, collect associated info. */ static short streamOfConsole(FILE *pf, /* out */ PerStreamTags *ppst){ -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE short rv = 0; DWORD dwCM = SHELL_INVALID_CONS_MODE; HANDLE fh = handleOfFile(pf); @@ -117,21 +118,21 @@ static short streamOfConsole(FILE *pf, /* out */ PerStreamTags *ppst){ ppst->hx = (rv)? fh : INVALID_HANDLE_VALUE; ppst->consMode = dwCM; return rv; -#else +# else ppst->pf = pf; ppst->reachesConsole = ( (short)isatty(fileno(pf)) ); return ppst->reachesConsole; -#endif +# endif } -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE /* Define console modes for use with the Windows Console API. */ -# define SHELL_CONI_MODE \ +# define SHELL_CONI_MODE \ (ENABLE_ECHO_INPUT | ENABLE_INSERT_MODE | ENABLE_LINE_INPUT | 0x80 \ | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_PROCESSED_INPUT) -# define SHELL_CONO_MODE (ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT \ +# define SHELL_CONO_MODE (ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT \ | ENABLE_VIRTUAL_TERMINAL_PROCESSING) -#endif +# endif typedef struct ConsoleInfo { PerStreamTags pstSetup[3]; @@ -151,19 +152,19 @@ static ConsoleInfo consoleInfo = { SQLITE_INTERNAL_LINKAGE FILE* invalidFileStream = (FILE *)~0; -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE static void maybeSetupAsConsole(PerStreamTags *ppst, short odir){ if( pstReachesConsole(ppst) ){ DWORD cm = odir? SHELL_CONO_MODE : SHELL_CONI_MODE; SetConsoleMode(ppst->hx, cm); } } -#else -# define maybeSetupAsConsole(ppst,odir) -#endif +# else +# define maybeSetupAsConsole(ppst,odir) +# endif SQLITE_INTERNAL_LINKAGE void consoleRenewSetup(void){ -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE int ix = 0; while( ix < 6 ){ PerStreamTags *ppst = (ix<3)? @@ -171,7 +172,7 @@ SQLITE_INTERNAL_LINKAGE void consoleRenewSetup(void){ maybeSetupAsConsole(ppst, (ix % 3)>0); ++ix; } -#endif +# endif } SQLITE_INTERNAL_LINKAGE StreamsAreConsole @@ -193,7 +194,7 @@ consoleClassifySetup( FILE *pfIn, FILE *pfOut, FILE *pfErr ){ } SQLITE_INTERNAL_LINKAGE void SQLITE_CDECL consoleRestore( void ){ -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE static ConsoleInfo *pci = &consoleInfo; if( pci->sacSetup ){ int ix; @@ -204,10 +205,11 @@ SQLITE_INTERNAL_LINKAGE void SQLITE_CDECL consoleRestore( void ){ } } } -#endif +# endif } +#endif /* !defined(SQLITE_CIO_NO_TRANSLATE) */ -#ifdef CONSIO_INPUT_REDIR +#ifdef SQLITE_CIO_INPUT_REDIR /* Say whether given FILE* is among those known, via either ** consoleClassifySetup() or set{Output,Error}Stream, as ** readable, and return an associated PerStreamTags pointer @@ -225,6 +227,7 @@ static PerStreamTags * isKnownReadable(FILE *pf){ } #endif +#ifndef SQLITE_CIO_NO_TRANSLATE /* Say whether given FILE* is among those known, via either ** consoleClassifySetup() or set{Output,Error}Stream, as ** writable, and return an associated PerStreamTags pointer @@ -259,20 +262,22 @@ static FILE *designateEmitStream(FILE *pf, unsigned chix){ SQLITE_INTERNAL_LINKAGE FILE *setOutputStream(FILE *pf){ return designateEmitStream(pf, 1); } -#ifdef CONSIO_SET_ERROR_STREAM +# ifdef CONSIO_SET_ERROR_STREAM SQLITE_INTERNAL_LINKAGE FILE *setErrorStream(FILE *pf){ return designateEmitStream(pf, 2); } -#endif +# endif +#endif /* !defined(SQLITE_CIO_NO_TRANSLATE) */ -#if SHELL_CON_TRANSLATE +#ifndef SQLITE_CIO_NO_SETMODE +# if CIO_WIN_WC_XLATE static void setModeFlushQ(FILE *pf, short bFlush, int mode){ if( bFlush ) fflush(pf); _setmode(_fileno(pf), mode); } -#else -# define setModeFlushQ(f, b, m) if(b) fflush(f) -#endif +# else +# define setModeFlushQ(f, b, m) if(b) fflush(f) +# endif SQLITE_INTERNAL_LINKAGE void setBinaryMode(FILE *pf, short bFlush){ setModeFlushQ(pf, bFlush, _O_BINARY); @@ -280,9 +285,15 @@ SQLITE_INTERNAL_LINKAGE void setBinaryMode(FILE *pf, short bFlush){ SQLITE_INTERNAL_LINKAGE void setTextMode(FILE *pf, short bFlush){ setModeFlushQ(pf, bFlush, _O_TEXT); } -#undef setModeFlushQ +# undef setModeFlushQ + +#else /* defined(SQLITE_CIO_NO_SETMODE) */ +# define setBinaryMode(f, bFlush) do{ if((bFlush)) fflush(f); }while(0) +# define setTextMode(f, bFlush) do{ if((bFlush)) fflush(f); }while(0) +#endif /* defined(SQLITE_CIO_NO_SETMODE) */ -#if SHELL_CON_TRANSLATE +#ifndef SQLITE_CIO_NO_TRANSLATE +# if CIO_WIN_WC_XLATE /* Write buffer cBuf as output to stream known to reach console, ** limited to ncTake char's. Return ncTake on success, else 0. */ static int conZstrEmit(PerStreamTags *ppst, const char *z, int ncTake){ @@ -315,9 +326,9 @@ static int conioVmPrintf(PerStreamTags *ppst, const char *zFormat, va_list ap){ return rv; }else return 0; } -#endif /* SHELL_CON_TRANSLATE */ +# endif /* CIO_WIN_WC_XLATE */ -#ifdef CONSIO_GET_EMIT_STREAM +# ifdef CONSIO_GET_EMIT_STREAM static PerStreamTags * getDesignatedEmitStream(FILE *pf, unsigned chix, PerStreamTags *ppst){ PerStreamTags *rv = isKnownWritable(pf); @@ -326,7 +337,7 @@ static PerStreamTags * getDesignatedEmitStream(FILE *pf, unsigned chix, streamOfConsole(pf, ppst); return ppst; } -#endif +# endif /* Get stream info, either for designated output or error stream when ** chix equals 1 or 2, or for an arbitrary stream when chix == 0. @@ -366,22 +377,22 @@ SQLITE_INTERNAL_LINKAGE int oPrintfUtf8(const char *zFormat, ...){ int rv; FILE *pfOut; PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */ -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE PerStreamTags *ppst = getEmitStreamInfo(1, &pst, &pfOut); -#else +# else getEmitStreamInfo(1, &pst, &pfOut); -#endif +# endif assert(zFormat!=0); va_start(ap, zFormat); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE if( pstReachesConsole(ppst) ){ rv = conioVmPrintf(ppst, zFormat, ap); }else{ -#endif +# endif rv = vfprintf(pfOut, zFormat, ap); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE } -#endif +# endif va_end(ap); return rv; } @@ -391,22 +402,22 @@ SQLITE_INTERNAL_LINKAGE int ePrintfUtf8(const char *zFormat, ...){ int rv; FILE *pfErr; PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */ -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE PerStreamTags *ppst = getEmitStreamInfo(2, &pst, &pfErr); -#else +# else getEmitStreamInfo(2, &pst, &pfErr); -#endif +# endif assert(zFormat!=0); va_start(ap, zFormat); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE if( pstReachesConsole(ppst) ){ rv = conioVmPrintf(ppst, zFormat, ap); }else{ -#endif +# endif rv = vfprintf(pfErr, zFormat, ap); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE } -#endif +# endif va_end(ap); return rv; } @@ -415,37 +426,37 @@ SQLITE_INTERNAL_LINKAGE int fPrintfUtf8(FILE *pfO, const char *zFormat, ...){ va_list ap; int rv; PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */ -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE PerStreamTags *ppst = getEmitStreamInfo(0, &pst, &pfO); -#else +# else getEmitStreamInfo(0, &pst, &pfO); -#endif +# endif assert(zFormat!=0); va_start(ap, zFormat); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE if( pstReachesConsole(ppst) ){ maybeSetupAsConsole(ppst, 1); rv = conioVmPrintf(ppst, zFormat, ap); if( 0 == isKnownWritable(ppst->pf) ) restoreConsoleArb(ppst); }else{ -#endif +# endif rv = vfprintf(pfO, zFormat, ap); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE } -#endif +# endif va_end(ap); return rv; } SQLITE_INTERNAL_LINKAGE int fPutsUtf8(const char *z, FILE *pfO){ PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */ -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE PerStreamTags *ppst = getEmitStreamInfo(0, &pst, &pfO); -#else +# else getEmitStreamInfo(0, &pst, &pfO); -#endif +# endif assert(z!=0); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE if( pstReachesConsole(ppst) ){ int rv; maybeSetupAsConsole(ppst, 1); @@ -453,62 +464,66 @@ SQLITE_INTERNAL_LINKAGE int fPutsUtf8(const char *z, FILE *pfO){ if( 0 == isKnownWritable(ppst->pf) ) restoreConsoleArb(ppst); return rv; }else { -#endif +# endif return (fputs(z, pfO)<0)? 0 : (int)strlen(z); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE } -#endif +# endif } SQLITE_INTERNAL_LINKAGE int ePutsUtf8(const char *z){ FILE *pfErr; PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */ -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE PerStreamTags *ppst = getEmitStreamInfo(2, &pst, &pfErr); -#else +# else getEmitStreamInfo(2, &pst, &pfErr); -#endif +# endif assert(z!=0); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE if( pstReachesConsole(ppst) ) return conZstrEmit(ppst, z, (int)strlen(z)); else { -#endif +# endif return (fputs(z, pfErr)<0)? 0 : (int)strlen(z); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE } -#endif +# endif } SQLITE_INTERNAL_LINKAGE int oPutsUtf8(const char *z){ FILE *pfOut; PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */ -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE PerStreamTags *ppst = getEmitStreamInfo(1, &pst, &pfOut); -#else +# else getEmitStreamInfo(1, &pst, &pfOut); -#endif +# endif assert(z!=0); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE if( pstReachesConsole(ppst) ) return conZstrEmit(ppst, z, (int)strlen(z)); else { -#endif +# endif return (fputs(z, pfOut)<0)? 0 : (int)strlen(z); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE } -#endif +# endif } +#endif /* !defined(SQLITE_CIO_NO_TRANSLATE) */ + +#if !(defined(SQLITE_CIO_NO_UTF8SCAN) && defined(SQLITE_CIO_NO_TRANSLATE)) /* Skip over as much z[] input char sequence as is valid UTF-8, ** limited per nAccept char's or whole characters and containing ** no char cn such that ((1<=0 => char count, nAccept<0 => character */ -static const char* zSkipValidUtf8(const char *z, int nAccept, long ccm){ +SQLITE_INTERNAL_LINKAGE const char* +zSkipValidUtf8(const char *z, int nAccept, long ccm){ int ng = (nAccept<0)? -nAccept : 0; const char *pcLimit = (nAccept>=0)? z+nAccept : 0; assert(z!=0); - while( (pcLimit)? (z 0) ){ + while( (pcLimit)? (zpf) ) restoreConsoleArb(ppst); return rv; }else { -#endif - return (int)fwrite(cBuf, 1, ncConsume, pfO); -#if SHELL_CON_TRANSLATE +# endif + return (int)fwrite(cBuf, 1, nAccept, pfO); +# if CIO_WIN_WC_XLATE } -#endif +# endif } SQLITE_INTERNAL_LINKAGE int -oPutbUtf8(const char *cBuf, int nAccept, long ctrlMask){ +oPutbUtf8(const char *cBuf, int nAccept){ FILE *pfOut; - const char *zPast = zSkipValidUtf8(cBuf, nAccept, ctrlMask); - int ncConsume = (int)(zPast - cBuf); PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */ -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE PerStreamTags *ppst = getEmitStreamInfo(1, &pst, &pfOut); -#else +# else getEmitStreamInfo(1, &pst, &pfOut); -#endif -#if SHELL_CON_TRANSLATE +# endif +# if CIO_WIN_WC_XLATE if( pstReachesConsole(ppst) ){ - return conZstrEmit(ppst, cBuf, ncConsume); + return conZstrEmit(ppst, cBuf, nAccept); }else { -#endif - return (int)fwrite(cBuf, 1, ncConsume, pfOut); -#if SHELL_CON_TRANSLATE +# endif + return (int)fwrite(cBuf, 1, nAccept, pfOut); +# if CIO_WIN_WC_XLATE } -#endif +# endif } -#ifdef CONSIO_EPUTB +# ifdef CONSIO_EPUTB SQLITE_INTERNAL_LINKAGE int -ePutbUtf8(const char *cBuf, int nAccept, long ctrlMask){ +ePutbUtf8(const char *cBuf, int nAccept){ FILE *pfErr; - const char *zPast = zSkipValidUtf8(cBuf, nAccept, ctrlMask); - int ncConsume = (int)(zPast - cBuf); PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */ PerStreamTags *ppst = getEmitStreamInfo(2, &pst, &pfErr); -# if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE if( pstReachesConsole(ppst) ){ - return conZstrEmit(ppst, cBuf, ncConsume); + return conZstrEmit(ppst, cBuf, nAccept); }else { -# endif - return (int)fwrite(cBuf, 1, ncConsume, pfErr); -# if SHELL_CON_TRANSLATE +# endif + return (int)fwrite(cBuf, 1, nAccept, pfErr); +# if CIO_WIN_WC_XLATE } -# endif +# endif } -#endif /* defined(CONSIO_EPUTB) */ +# endif /* defined(CONSIO_EPUTB) */ SQLITE_INTERNAL_LINKAGE char* fGetsUtf8(char *cBuf, int ncMax, FILE *pfIn){ if( pfIn==0 ) pfIn = stdin; -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE if( pfIn == consoleInfo.pstSetup[0].pf && (consoleInfo.sacSetup & SAC_InConsole)!=0 ){ -# if SHELL_CON_TRANSLATE==1 -# define SHELL_GULP 150 /* Count of WCHARS to be gulped at a time */ +# if CIO_WIN_WC_XLATE==1 +# define SHELL_GULP 150 /* Count of WCHARS to be gulped at a time */ WCHAR wcBuf[SHELL_GULP+1]; int lend = 0, noc = 0; if( ncMax > 0 ) cBuf[0] = 0; while( noc < ncMax-8-1 && !lend ){ /* There is room for at least 2 more characters and a 0-terminator. */ int na = (ncMax > SHELL_GULP*4+1 + noc)? SHELL_GULP : (ncMax-1 - noc)/4; -# undef SHELL_GULP +# undef SHELL_GULP DWORD nbr = 0; BOOL bRC = ReadConsoleW(consoleInfo.pstSetup[0].hx, wcBuf, na, &nbr, 0); if( bRC && nbr>0 && (wcBuf[nbr-1]&0xF800)==0xD800 ){ @@ -652,13 +663,15 @@ SQLITE_INTERNAL_LINKAGE char* fGetsUtf8(char *cBuf, int ncMax, FILE *pfIn){ cBuf[noc] = 0; return cBuf; }else return 0; -# endif +# endif }else{ -#endif +# endif return fgets(cBuf, ncMax, pfIn); -#if SHELL_CON_TRANSLATE +# if CIO_WIN_WC_XLATE } -#endif +# endif } +#endif /* !defined(SQLITE_CIO_NO_TRANSLATE) */ +#undef CIO_WIN_WC_XLATE #undef SHELL_INVALID_FILE_PTR diff --git a/ext/consio/console_io.h b/ext/consio/console_io.h index eabc6148cf..4fb51d24d8 100644 --- a/ext/consio/console_io.h +++ b/ext/consio/console_io.h @@ -35,6 +35,8 @@ # include "sqlite3.h" #endif +#ifndef SQLITE_CIO_NO_CLASSIFY + /* Define enum for use with following function. */ typedef enum StreamsAreConsole { SAC_NoConsole = 0, @@ -91,6 +93,13 @@ SQLITE_INTERNAL_LINKAGE void consoleRenewSetup(void); */ SQLITE_INTERNAL_LINKAGE void SQLITE_CDECL consoleRestore( void ); +#else /* defined(SQLITE_CIO_NO_CLASSIFY) */ +# define consoleClassifySetup(i,o,e) +# define consoleRenewSetup() +# define consoleRestore() +#endif /* defined(SQLITE_CIO_NO_CLASSIFY) */ + +#ifndef SQLITE_CIO_NO_REDIRECT /* ** Set stream to be used for the functions below which write ** to "the designated X stream", where X is Output or Error. @@ -108,10 +117,15 @@ SQLITE_INTERNAL_LINKAGE void SQLITE_CDECL consoleRestore( void ); */ SQLITE_INTERNAL_LINKAGE FILE *invalidFileStream; SQLITE_INTERNAL_LINKAGE FILE *setOutputStream(FILE *pf); -#ifdef CONSIO_SET_ERROR_STREAM +# ifdef CONSIO_SET_ERROR_STREAM SQLITE_INTERNAL_LINKAGE FILE *setErrorStream(FILE *pf); -#endif +# endif +#else +# define setOutputStream(pf) +# define setErrorStream(pf) +#endif /* !defined(SQLITE_CIO_NO_REDIRECT) */ +#ifndef SQLITE_CIO_NO_TRANSLATE /* ** Emit output like fprintf(). If the output is going to the ** console and translation from UTF-8 is necessary, perform @@ -140,38 +154,19 @@ SQLITE_INTERNAL_LINKAGE int ePutsUtf8(const char *z); /* ** Emit output like fPutsUtf8(), except that the length of the -** accepted char or character sequence may be limited by nAccept. -** -** The magnitude and sign of nAccept control what nAccept limits. -** If positive, nAccept limits the number of char's accepted. -** If negative, it limits the number of valid input characters. -** Obtain the behavior of {f,o,e}PutsUtf8 with nAccept==INT_MAX. +** accepted char or character sequence is limited by nAccept. ** ** Returns the number of accepted char values. -** -** When ctrlMask!=0, it specifies a set of control characters not -** accepted as input, so that cBuf[abs(N)] on return will be one -** of the non-accepted characters unless nAccept limited the scan. -** Each bit in ctrlMask, 1<=0 => char count, nAccept<0 => character + */ +SQLITE_INTERNAL_LINKAGE const char* +zSkipValidUtf8(const char *z, int nAccept, long ccm); + +#endif diff --git a/manifest b/manifest index 187de57e5a..4d3bb6ee32 100644 --- a/manifest +++ b/manifest @@ -1,11 +1,11 @@ -C Add\sa\sfew\sasserts\sinto\s*Put*()\sfunctions\sto\scatch\scalls\sthat\smight\scause\san\saddress\sfault. -D 2023-11-14T03:24:43.961 +C Simplify\sand\smake\smore\srational\show\sconsole\sI/O\spackage\sfeatures\sare\sselected.\s(Motivated\sby\sFiddle\sand\sother\scommand-line\sutilities\sto\ssoon\suse\sthe\spackage.)\sNo\ssubstantive\scode-execution\schanges. +D 2023-11-16T18:31:05.379 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F Makefile.in f1ec22cfe53927eb9411ed82e452a0984df0ef88acb7a45024d98c5b6909da12 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6 -F Makefile.msc 59bb36dba001f0b38212be0794fb838f25371008b180929bcf08aa799694c168 +F Makefile.msc f90f75b3b62809e1d13e5362b84a5cce90bc9d6772e4092be52c2b9a6638a7ed F README.md 963d30019abf0cc06b263cd2824bce022893f3f93a531758f6f04ff2194a16a8 F VERSION 73573d4545343f001bf5dc5461173a7c78c203dd046cabcf99153878cf25d3a6 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@ -50,8 +50,8 @@ F ext/README.md fd5f78013b0a2bc6f0067afb19e6ad040e89a10179b4f6f03eee58fac5f169bd F ext/async/README.txt e12275968f6fde133a80e04387d0e839b0c51f91 F ext/async/sqlite3async.c 6f247666b495c477628dd19364d279c78ea48cd90c72d9f9b98ad1aff3294f94 F ext/async/sqlite3async.h 46b47c79357b97ad85d20d2795942c0020dc20c532114a49808287f04aa5309a -F ext/consio/console_io.c baffbeb5e73dcd3191c677bbcd5266c35891c17f87930cd89cf2463b7ec2da09 x -F ext/consio/console_io.h 515d27ca9e5a5d36e12ff2b85977b5931fdeba0ce142f40178d94dc8638b4c81 +F ext/consio/console_io.c 48536ed2f2add0abd8be80f72cae46e19738fa671b69daa88197df53a55da7c4 +F ext/consio/console_io.h b8dce7fa926b51f19b5d1c516219ac91b5c1ccddd467b2510e2557c900830f7d F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3 F ext/expert/expert.c d548d603a4cc9e61f446cc179c120c6713511c413f82a4a32b1e1e69d3f086a4 F ext/expert/expert1.test 0dd5cb096d66bed593e33053a3b364f6ef52ed72064bf5cf298364636dbf3cd6 @@ -728,7 +728,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c d017bad7ba8e778617701a0e986fdeb393d67d6afa84fb28ef4e8b8ad2acf916 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 503331aca8785254a7bf3d74ab338a99118fa297e1184a4dde33b3cdf7a9d341 -F src/shell.c.in 187da23da7601bfb225d0efadf77cbf766d9cee7574323a25a3d42dc29cd27fe +F src/shell.c.in 9bfdb6faaea31e2ff0f940f1234e39f505f263b068ba6736838c7b6ad9d7d8ad F src/sqlite.h.in 4f841d3d117b830ee5ee45e8d89ceff1195f3ebb72d041ace8d116ba4c103b35 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54 @@ -2142,8 +2142,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 29ea2a3aadd34facc45a2e9f9a567bac16fca76beb019b879e2611433c85bbb3 -R 8876fea59629c4e62a560a6743807241 +P 2341f9b6a48634a94e90e849f579afd07d398c3e0304efccf07d18b41a0e40aa +Q +45b8061e7568ccca164fe000f1f0a0d984b1c28fad530bc9fdea35793a0f40bc +Q +957ebaa2be3056371d679f7a00aeba242db34218fb839ffd1d1197cad0c4a510 +R dab16a36061bd95f615790a1ad678bef U larrybr -Z 00b6c0e6cfeef68150271d56dd5abcd0 +Z f345bc7daef2ffd72adafc6ced1c0785 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ca4099ba5e..47eb0416b6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2341f9b6a48634a94e90e849f579afd07d398c3e0304efccf07d18b41a0e40aa \ No newline at end of file +1cde05877b7e47cb2ab9de26edd5245eb5ff1d91e69b94f3b24944fd4f6ccd3e \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index 0435710efa..91d99d336c 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -237,13 +237,23 @@ extern char *sqlite3_win32_unicode_to_utf8(LPCWSTR); extern LPWSTR sqlite3_win32_utf8_to_unicode(const char *zText); #endif +/* Use console I/O package as a direct INCLUDE. */ #define SQLITE_INTERNAL_LINKAGE static +#ifdef SQLITE_SHELL_FIDDLE +/* Deselect most features from the console I/O package for Fiddle. */ +# define SQLITE_CIO_NO_REDIRECT +# define SQLITE_CIO_NO_CLASSIFY +# define SQLITE_CIO_NO_TRANSLATE +# define SQLITE_CIO_NO_SETMODE +#endif INCLUDE ../ext/consio/console_io.h INCLUDE ../ext/consio/console_io.c +#ifndef SQLITE_SHELL_FIDDLE + /* From here onward, fgets() is redirected to the console_io library. */ -#define fgets(b,n,f) fGetsUtf8(b,n,f) +# define fgets(b,n,f) fGetsUtf8(b,n,f) /* * Define macros for emitting output text in various ways: * sputz(s, z) => emit 0-terminated string z to given stream s @@ -252,24 +262,31 @@ INCLUDE ../ext/consio/console_io.c * oputf(f, ...) => emit varargs per format f to default stream * eputz(z) => emit 0-terminated string z to error stream * eputf(f, ...) => emit varargs per format f to error stream - * sputc(s, c) => emit single ASCII character to given stream s - * oputc(c) => emit single ASCII character to default stream - * eputc(c) => emit single ASCII character to error stream + * oputb(b, n) => emit char buffer b[0..n-1] to default stream * * Note that the default stream is whatever has been last set via: * setOutputStream(FILE *pf) * This is normally the stream that CLI normal output goes to. * For the stand-alone CLI, it is stdout with no .output redirect. */ -#define sputz(s,z) fPutsUtf8(z,s) -#define sputf fPrintfUtf8 -#define oputz(z) oPutsUtf8(z) -#define oputf oPrintfUtf8 -#define eputz(z) ePutsUtf8(z) -#define eputf ePrintfUtf8 -#define sputc(f,c) fPutcUtf8(c,f) -#define oputc(c) oPutcUtf8(c) -#define eputc(c) ePutcUtf8(c) +# define sputz(s,z) fPutsUtf8(z,s) +# define sputf fPrintfUtf8 +# define oputz(z) oPutsUtf8(z) +# define oputf oPrintfUtf8 +# define eputz(z) ePutsUtf8(z) +# define eputf ePrintfUtf8 +# define oputb(buf,na) oPutbUtf8(buf,na) + +#else +/* For Fiddle, all console handling and emit redirection is omitted. */ +# define sputz(fp,z) fputs(z,fp) +# define sputf(fp,fmt, ...) fprintf(fp,fmt,__VA_ARGS__) +# define oputz(z) fputs(z,stdout) +# define oputf(fmt, ...) printf(fmt,__VA_ARGS__) +# define eputz(z) fputs(z,stderr) +# define eputf(fmt, ...) fprintf(stderr,fmt,__VA_ARGS__) +# define oputb(buf,na) fwrite(buf,1,na,stdout) +#endif /* True if the timer is enabled */ static int enableTimer = 0; @@ -1722,8 +1739,10 @@ static const char *unused_string( static void output_quoted_string(const char *z){ int i; char c; +#ifndef SQLITE_SHELL_FIDDLE FILE *pfO = setOutputStream(invalidFileStream); setBinaryMode(pfO, 1); +#endif if( z==0 ) return; for(i=0; (c = z[i])!=0 && c!='\''; i++){} if( c==0 ){ @@ -1748,7 +1767,11 @@ static void output_quoted_string(const char *z){ } oputz("'"); } +#ifndef SQLITE_SHELL_FIDDLE setTextMode(pfO, 1); +#else + setTextMode(stdout, 1); +#endif } /* @@ -1763,8 +1786,10 @@ static void output_quoted_string(const char *z){ static void output_quoted_escaped_string(const char *z){ int i; char c; +#ifndef SQLITE_SHELL_FIDDLE FILE *pfO = setOutputStream(invalidFileStream); setBinaryMode(pfO, 1); +#endif for(i=0; (c = z[i])!=0 && c!='\'' && c!='\n' && c!='\r'; i++){} if( c==0 ){ oputf("'%s'",z); @@ -1816,7 +1841,11 @@ static void output_quoted_escaped_string(const char *z){ oputf(",'%s',char(10))", zNL); } } +#ifndef SQLITE_SHELL_FIDDLE setTextMode(pfO, 1); +#else + setTextMode(stdout, 1); +#endif } /* @@ -1849,9 +1878,9 @@ static void output_c_string(const char *z){ oputz(zq); while( *z!=0 ){ const char *pcDQBSRO = anyOfInStr(z, zDQBSRO, ~(size_t)0); - const char *pcPast = z + fPutbUtf8(0, z, INT_MAX, ctrlMask); + const char *pcPast = zSkipValidUtf8(z, INT_MAX, ctrlMask); const char *pcEnd = (pcDQBSRO && pcDQBSRO < pcPast)? pcDQBSRO : pcPast; - if( pcEnd > z ) oPutbUtf8(z, (int)(pcEnd-z), 0); + if( pcEnd > z ) oputb(z, (int)(pcEnd-z)); if( (c = *pcEnd)==0 ) break; ++pcEnd; switch( c ){ @@ -1895,10 +1924,10 @@ static void output_json_string(const char *z, i64 n){ oputz(zq); while( z < pcLimit ){ const char *pcDQBS = anyOfInStr(z, zDQBS, pcLimit-z); - const char *pcPast = z + fPutbUtf8(0, z, (int)(pcLimit-z), ctrlMask); + const char *pcPast = zSkipValidUtf8(z, (int)(pcLimit-z), ctrlMask); const char *pcEnd = (pcDQBS && pcDQBS < pcPast)? pcDQBS : pcPast; if( pcEnd > z ){ - oPutbUtf8(z, (int)(pcEnd-z), 0); + oputb(z, (int)(pcEnd-z)); z = pcEnd; } if( z >= pcLimit ) break; @@ -6092,6 +6121,7 @@ static void tryToClone(ShellState *p, const char *zNewDb){ close_db(newDb); } +#ifndef SQLITE_SHELL_FIDDLE /* ** Change the output stream (file or pipe or console) to something else. */ @@ -6147,6 +6177,10 @@ static void output_reset(ShellState *p){ p->out = stdout; setOutputStream(stdout); } +#else +# define output_redir(SS,pfO) +# define output_reset(SS) +#endif /* ** Run an SQL command and return the single integer result. @@ -9165,7 +9199,7 @@ static int do_meta_command(char *zLine, ShellState *p){ && cli_strcmp(zFile,"on")!=0 && cli_strcmp(zFile,"off")!=0 ){ - sputf(stdout, "cannot set .log to anything other" + sputz(stdout, "cannot set .log to anything other" " than \"on\" or \"off\"\n"); zFile = "off"; } @@ -11852,7 +11886,7 @@ static char *cmdline_option_value(int argc, char **argv, int i){ } static void sayAbnormalExit(void){ - if( seenInterrupt ) eputf("Program interrupted.\n"); + if( seenInterrupt ) eputz("Program interrupted.\n"); } #ifndef SQLITE_SHELL_IS_UTF8