/ Check-in [d8564f70]
Login

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

Overview
Comment:Remove a shell function that is now superfluous.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | expShell
Files: files | file ages | folders
SHA1:d8564f70e6ba1e7c485d6b9a6a6cd81c43b41c98
User & Date: mistachkin 2015-01-19 20:22:33
Context
2015-01-19
21:11
Add comments and improve the new test case. check-in: 4ec2aead user: mistachkin tags: expShell
20:22
Remove a shell function that is now superfluous. check-in: d8564f70 user: mistachkin tags: expShell
20:19
Merge updates from trunk. check-in: d9f4035b user: mistachkin tags: expShell
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/shell.c.

   764    764     UNUSED_PARAMETER(NotUsed);
   765    765     seenInterrupt++;
   766    766     if( seenInterrupt>2 ) exit(1);
   767    767     if( db ) sqlite3_interrupt(db);
   768    768   }
   769    769   #endif
   770    770   
   771         -#if defined(WIN32) || defined(_WIN32)
   772         -/*
   773         -** This routine is used to adjust the file translation mode for the output
   774         -** file.  It is only used on Windows.
   775         -*/
   776         -static void enable_binary_output(
   777         -  ShellState *p,
   778         -  int enable
   779         -){
   780         -  fflush(p->out);
   781         -  _setmode(_fileno(p->out), enable ? _O_BINARY : _O_TEXT);
   782         -}
   783         -#else
   784         -#define enable_binary_output(p,e)
   785         -#endif
   786         -
   787    771   /*
   788    772   ** This is the callback routine that the shell
   789    773   ** invokes for each row of a query result.
   790    774   */
   791    775   static int shell_callback(
   792    776     void *pArg,
   793    777     int nArg,        /* Number of result columns */
................................................................................
  2566   2550         fprintf(stderr, "Usage: .bail on|off\n");
  2567   2551         rc = 1;
  2568   2552       }
  2569   2553     }else
  2570   2554   
  2571   2555     if( c=='b' && n>=3 && strncmp(azArg[0], "binary", n)==0 ){
  2572   2556       if( nArg==2 ){
  2573         -      enable_binary_output(p, booleanValue(azArg[1]));
         2557  +      if( booleanValue(azArg[1]) ){
         2558  +        setBinaryMode(p->out);
         2559  +      }else{
         2560  +        setTextMode(p->out);
         2561  +      }
  2574   2562       }else{
  2575   2563         fprintf(stderr, "Usage: .binary on|off\n");
  2576   2564         rc = 1;
  2577   2565       }
  2578   2566     }else
  2579   2567   
  2580   2568     /* The undocumented ".breakpoint" command causes a call to the no-op