Skip to content

Commit

Permalink
Revert "Make 'echo' raise IOErrors when appropriate (nim-lang#16367)" (
Browse files Browse the repository at this point in the history
…nim-lang#18460)

This reverts commit 23d23ec.
  • Loading branch information
narimiran authored and PMunch committed Mar 28, 2022
1 parent c92834e commit bb0a822
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 30 deletions.
3 changes: 0 additions & 3 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
- Type mismatch errors now show more context, use `-d:nimLegacyTypeMismatch` for previous
behavior.

- `echo` and `debugEcho` will now raise `IOError` if writing to stdout fails. Previous behavior
silently ignored errors. See #16366. Use `-d:nimLegacyEchoNoRaise` for previous behavior.

- `math.round` now is rounded "away from zero" in JS backend which is consistent
with other backends. See #9125. Use `-d:nimLegacyJsRound` for previous behavior.

Expand Down
24 changes: 8 additions & 16 deletions lib/system/io.nim
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,6 @@ when defined(windows):
# But we cannot call printf directly as the string might contain \0.
# So we have to loop over all the sections separated by potential \0s.
var i = c_fprintf(f, "%s", s)
if i < 0:
if doRaise: raiseEIO("cannot write string to file")
return
while i < s.len:
if s[i] == '\0':
let w = c_fputc('\0', f)
Expand Down Expand Up @@ -787,13 +784,6 @@ when declared(stdout):
not defined(nintendoswitch) and not defined(freertos) and
hostOS != "any"

const echoDoRaise = not defined(nimLegacyEchoNoRaise) and not defined(guiapp) # see PR #16366

template checkErrMaybe(succeeded: bool): untyped =
if not succeeded:
when echoDoRaise:
checkErr(stdout)

proc echoBinSafe(args: openArray[string]) {.compilerproc.} =
when defined(androidNDK):
var s = ""
Expand All @@ -806,18 +796,20 @@ when declared(stdout):
proc flockfile(f: File) {.importc, nodecl.}
proc funlockfile(f: File) {.importc, nodecl.}
flockfile(stdout)
defer: funlockfile(stdout)
when defined(windows) and compileOption("threads"):
acquireSys echoLock
defer: releaseSys echoLock
for s in args:
when defined(windows):
writeWindows(stdout, s, doRaise = echoDoRaise)
writeWindows(stdout, s)
else:
checkErrMaybe(c_fwrite(s.cstring, cast[csize_t](s.len), 1, stdout) == s.len)
discard c_fwrite(s.cstring, cast[csize_t](s.len), 1, stdout)
const linefeed = "\n"
checkErrMaybe(c_fwrite(linefeed.cstring, linefeed.len, 1, stdout) == linefeed.len)
checkErrMaybe(c_fflush(stdout) == 0)
discard c_fwrite(linefeed.cstring, linefeed.len, 1, stdout)
discard c_fflush(stdout)
when stdOutLock:
funlockfile(stdout)
when defined(windows) and compileOption("threads"):
releaseSys echoLock


when defined(windows) and not defined(nimscript) and not defined(js):
Expand Down
11 changes: 0 additions & 11 deletions tests/exception/t16366.nim

This file was deleted.

0 comments on commit bb0a822

Please sign in to comment.