Differences From Artifact [b395caf6be]:

• File src/util.c — part of check-in [6c3d370496] at 2021-08-07 17:28:43 on branch trunk — Improved error message upon timeout. Combine redundant implementations of the function that finds user and kernel CPU usage. (user: drh size: 22453) [more...]

To Artifact [ea2c37550c]:

• File src/util.c — part of check-in [0d8c92882a] at 2021-08-27 11:29:37 on branch trunk — Fix the goofy non-quoting of URL arguments to "start" on windows by including an extra quoted empty term. [forum:/forumpost/9600b10ffd0a7483|Forum post 9600b10ffd0a7483]. (user: drh size: 22458)

831
832
833
834
835
836
837
838
839
840
841
842
843
844
845

/*
** Return the name of a command that will launch a web-browser.
*/
const char *fossil_web_browser(void){
  const char *zBrowser = 0;
#if defined(_WIN32)
  zBrowser = db_get("web-browser", "start");
#elif defined(__DARWIN__) || defined(__APPLE__) || defined(__HAIKU__)
  zBrowser = db_get("web-browser", "open");
#else
  zBrowser = db_get("web-browser", 0);
  if( zBrowser==0 ){
    static const char *const azBrowserProg[] =
        { "xdg-open", "gnome-open", "firefox", "google-chrome" };

|

831
832
833
834
835
836
837
838
839
840
841
842
843
844
845

/*
** Return the name of a command that will launch a web-browser.
*/
const char *fossil_web_browser(void){
  const char *zBrowser = 0;
#if defined(_WIN32)
  zBrowser = db_get("web-browser", "start \"\"");
#elif defined(__DARWIN__) || defined(__APPLE__) || defined(__HAIKU__)
  zBrowser = db_get("web-browser", "open");
#else
  zBrowser = db_get("web-browser", 0);
  if( zBrowser==0 ){
    static const char *const azBrowserProg[] =
        { "xdg-open", "gnome-open", "firefox", "google-chrome" };