SQLite: Check-in [231679d6]

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

Overview

Comment:	Move the ZLIB version announcement in the CLI out of the default banner and put it in the ".version" command.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA3-256:	231679d6f8c0c3d957c8daa88b0743449b60b47159e114f4bc073a8612a73b2a
User & Date:	drh 2018-01-16 20:05:27

Context

2018-01-16
20:20		Fix a makefile problem causing -DSQLITE_ENABLE_STMTVTAB builds to fail. check-in: 7f6e5bdf user: dan tags: trunk
20:05		Move the ZLIB version announcement in the CLI out of the default banner and put it in the ".version" command. check-in: 231679d6 user: drh tags: trunk
19:03		Show version of zlib in use when running the shell tool in interactive mode. check-in: a8906b52 user: mistachkin tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/shell.c.in.

  7533   7533       }
  7534   7534     }else
  7535   7535   #endif /* SQLITE_USER_AUTHENTICATION */
  7536   7536   
  7537   7537     if( c=='v' && strncmp(azArg[0], "version", n)==0 ){
  7538   7538       utf8_printf(p->out, "SQLite %s %s\n" /*extra-version-info*/,
  7539   7539           sqlite3_libversion(), sqlite3_sourceid());
         7540  +#if SQLITE_HAVE_ZLIB
         7541  +    utf8_printf(p->out, "zlib version %s\n", zlibVersion());
         7542  +#endif
         7543  +#define CTIMEOPT_VAL_(opt) #opt
         7544  +#define CTIMEOPT_VAL(opt) CTIMEOPT_VAL_(opt)
         7545  +#if defined(__clang__) && defined(__clang_major__)
         7546  +    utf8_printf(p->out, "clang-" CTIMEOPT_VAL(__clang_major__) "."
         7547  +                    CTIMEOPT_VAL(__clang_minor__) "."
         7548  +                    CTIMEOPT_VAL(__clang_patchlevel__) "\n");
         7549  +#elif defined(_MSC_VER)
         7550  +    utf8_printf(p->out, "msvc-" CTIMEOPT_VAL(_MSC_VER) "\n");
         7551  +#elif defined(__GNUC__) && defined(__VERSION__)
         7552  +    utf8_printf(p->out, "gcc-" __VERSION__ "\n");
         7553  +#endif
  7540   7554     }else
  7541   7555   
  7542   7556     if( c=='v' && strncmp(azArg[0], "vfsinfo", n)==0 ){
  7543   7557       const char *zDbName = nArg==2 ? azArg[1] : "main";
  7544   7558       sqlite3_vfs *pVfs = 0;
  7545   7559       if( p->db ){
  7546   7560         sqlite3_file_control(p->db, zDbName, SQLITE_FCNTL_VFS_POINTER, &pVfs);
................................................................................
  8376   8390         char *zHistory = 0;
  8377   8391         int nHistory;
  8378   8392         printf(
  8379   8393           "SQLite version %s %.19s\n" /*extra-version-info*/
  8380   8394           "Enter \".help\" for usage hints.\n",
  8381   8395           sqlite3_libversion(), sqlite3_sourceid()
  8382   8396         );
  8383         -#if SQLITE_HAVE_ZLIB
  8384         -      printf("Using zlib version %s.\n", zlibVersion());
  8385         -#endif
  8386   8397         if( warnInmemoryDb ){
  8387   8398           printf("Connected to a ");
  8388   8399           printBold("transient in-memory database");
  8389   8400           printf(".\nUse \".open FILENAME\" to reopen on a "
  8390   8401                  "persistent database.\n");
  8391   8402         }
  8392   8403         zHome = find_home_dir(0);