Skip to content

Commit

Permalink
enforce browsers.nim only handles URLs [backport] (#15045)
Browse files Browse the repository at this point in the history
(cherry picked from commit 925dd92)
  • Loading branch information
Araq authored and narimiran committed Jul 23, 2020
1 parent 170f5b6 commit d0a2857
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions lib/pure/browsers.nim
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ include "system/inclrtl"

when defined(windows):
import winlean
from os import absolutePath
else:
import os, osproc

Expand All @@ -25,16 +26,21 @@ const osOpenCmd* =
## Alias for the operating system specific *"open"* command,
## ``"open"`` on OSX, MacOS and Windows, ``"xdg-open"`` on Linux, BSD, etc.

proc prepare(s: string): string =
if s.contains("://"):
result = s
else:
result = "file://" & absolutePath(s)

template openDefaultBrowserImpl(url: string) =
proc openDefaultBrowserImpl(url: string) =
when defined(windows):
var o = newWideCString(osOpenCmd)
var u = newWideCString(url)
var u = newWideCString(prepare url)
discard shellExecuteW(0'i32, o, u, nil, nil, SW_SHOWNORMAL)
elif defined(macosx):
discard execShellCmd(osOpenCmd & " " & quoteShell(url))
discard execShellCmd(osOpenCmd & " " & quoteShell(prepare url))
else:
var u = quoteShell(url)
var u = quoteShell(prepare url)
if execShellCmd(osOpenCmd & " " & u) == 0: return
for b in getEnv("BROWSER").string.split(PathSep):
try:
Expand Down

0 comments on commit d0a2857

Please sign in to comment.