Fossil

Check-in [c72c6df4]
Login

Check-in [c72c6df4]

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

Overview
Comment:Attempt to fix quoting issues with the browser launch command on windows.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: c72c6df46527511b8d05542dc5f860db2b6419b7f93eb0bd13ab745ff857a8ba
User & Date: drh 2021-08-27 07:54:19
Context
2021-08-27
11:29
Fix the goofy non-quoting of URL arguments to "start" on windows by including an extra quoted empty term. Forum post 9600b10ffd0a7483. ... (check-in: 0d8c9288 user: drh tags: trunk)
07:54
Attempt to fix quoting issues with the browser launch command on windows. ... (check-in: c72c6df4 user: drh tags: trunk)
05:57
/chat: when submitting a message, trim trailing whitespace from all input lines in order to keep pasted-in text from consoles, especially wide ones, from forcing horizontal scrollbars on all clients to due long runs of blanks at the end of each line. Sidebar: this is incompatible with markdown-formatted text which makes use of lines ending with whitespace for continuation of multi-paragraph list entries. ... (check-in: afaffb66 user: stephan tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diffcmd.c.

︙︙
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334

    if( diffFlags & DIFF_SIDEBYSIDE ){
      const unsigned char *zJs = builtin_file("sbsdiff.js", 0);
      fossil_print("<script>\n%s</script>\n", zJs);
    }
    fossil_print("%s", zWebpageEnd);
  }
  if( (diffFlags & DIFF_BROWSER)!=0 && nErr==0 ){
    char *zCmd = mprintf("%$ %$", fossil_web_browser(), tempDiffFilename);
    fclose(diffOut);
    diffOut = freopen(NULL_DEVICE, "wb", stdout);
    fossil_system(zCmd);
    fossil_free(zCmd);
    diffOut = 0;
    sqlite3_sleep(FOSSIL_BROWSER_DIFF_DELAY);
    file_delete(tempDiffFilename);








|








320
321
322
323
324
325
326
327
328
329
330
331
332
333
334

    if( diffFlags & DIFF_SIDEBYSIDE ){
      const unsigned char *zJs = builtin_file("sbsdiff.js", 0);
      fossil_print("<script>\n%s</script>\n", zJs);
    }
    fossil_print("%s", zWebpageEnd);
  }
  if( (diffFlags & DIFF_BROWSER)!=0 && nErr==0 ){
    char *zCmd = mprintf("%s %$", fossil_web_browser(), tempDiffFilename);
    fclose(diffOut);
    diffOut = freopen(NULL_DEVICE, "wb", stdout);
    fossil_system(zCmd);
    fossil_free(zCmd);
    diffOut = 0;
    sqlite3_sleep(FOSSIL_BROWSER_DIFF_DELAY);
    file_delete(tempDiffFilename);
︙︙

Changes to src/main.c.

︙︙
3071
3072
3073
3074
3075
3076
3077



3078
3079
3080
3081
3082
3083
3084

      zBrowserArg = mprintf("http://localhost:%%d/%s", zInitPage);
    }else if( strchr(zIpAddr,':') ){
      zBrowserArg = mprintf("http://[%s]:%%d/%s", zIpAddr, zInitPage);
    }else{
      zBrowserArg = mprintf("http://%s:%%d/%s", zIpAddr, zInitPage);
    }
#ifdef _WIN32



    zBrowserCmd = mprintf("%s %s &", zBrowser, zBrowserArg);
#else
    zBrowserCmd = mprintf("%s %!$ &", zBrowser, zBrowserArg);
#endif
    fossil_free(zBrowserArg);
  }
  if( zRemote ){








>
>
>








3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087

      zBrowserArg = mprintf("http://localhost:%%d/%s", zInitPage);
    }else if( strchr(zIpAddr,':') ){
      zBrowserArg = mprintf("http://[%s]:%%d/%s", zIpAddr, zInitPage);
    }else{
      zBrowserArg = mprintf("http://%s:%%d/%s", zIpAddr, zInitPage);
    }
#ifdef _WIN32
    /* The "start" command on windows does not allow a URL to be quoted.
    ** So we have to depend on the fact that the URL is contructed in such
    ** a way that no quoting is needed. */
    zBrowserCmd = mprintf("%s %s &", zBrowser, zBrowserArg);
#else
    zBrowserCmd = mprintf("%s %!$ &", zBrowser, zBrowserArg);
#endif
    fossil_free(zBrowserArg);
  }
  if( zRemote ){
︙︙