Fossil

Check-in [169a3dab]
Login

Check-in [169a3dab]

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

Overview
Comment:Fix an unused var warning in windows
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | nameofexe-appendvfs-check
Files: files | file ages | folders
SHA3-256: 169a3dabcf4445e5031a21bec61547855a14644945947cfb65643e9e6ed5dcfe
User & Date: mgagnon 2022-03-01 16:21:15
Context
2022-03-01
21:02
Ensure that db_open()'s db-is-an-appendvfs-binary check uses canonicalized filenames to avoid the problem reported in forum post 16880a28aad1a868. ... (check-in: ab7ad234 user: stephan tags: trunk)
16:21
Fix an unused var warning in windows ... (Closed-Leaf check-in: 169a3dab user: mgagnon tags: nameofexe-appendvfs-check)
2022-02-28
21:30
Resolve the bug revealed in forum post 16880a28aad1a868 in which the db_open() appendvfs check can misinteract with g.nameOfExe. This is in a branch until a Windows user can confirm that the g.nameOfExe change in main.c behaves as desired on Windows. This was a collaborative bug fix via /chat, not my own. Edit: test success on Windows reported by Martin G. ... (check-in: ec02acfd user: stephan tags: nameofexe-appendvfs-check)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/main.c.

418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
  unsigned int i, j, k;     /* Loop counters */
  int n;                    /* Number of bytes in one line */
  unsigned int nArg;        /* Number of new arguments */
  char *z;                  /* General use string pointer */
  char **newArgv;           /* New expanded g.argv under construction */
  const char *zFileName;    /* input file name */
  FILE *inFile;             /* input FILE */
#if defined(_WIN32)
  wchar_t buf[MAX_PATH];
#endif

  g.argc = argc;
  g.argv = argv;
  sqlite3_initialize();
#if defined(_WIN32) && defined(BROKEN_MINGW_CMDLINE)
  for(i=0; i<g.argc; i++) g.argv[i] = fossil_mbcs_to_utf8(g.argv[i]);
#else







<
<
<







418
419
420
421
422
423
424



425
426
427
428
429
430
431
  unsigned int i, j, k;     /* Loop counters */
  int n;                    /* Number of bytes in one line */
  unsigned int nArg;        /* Number of new arguments */
  char *z;                  /* General use string pointer */
  char **newArgv;           /* New expanded g.argv under construction */
  const char *zFileName;    /* input file name */
  FILE *inFile;             /* input FILE */




  g.argc = argc;
  g.argv = argv;
  sqlite3_initialize();
#if defined(_WIN32) && defined(BROKEN_MINGW_CMDLINE)
  for(i=0; i<g.argc; i++) g.argv[i] = fossil_mbcs_to_utf8(g.argv[i]);
#else