diff options
| author | kitsunyan | 2019-12-20 04:35:07 +0000 |
|---|---|---|
| committer | kitsunyan | 2019-12-20 04:35:07 +0000 |
| commit | 90d4c4be3bc15b2f594a0046c07b6f8654659ad5 (patch) | |
| tree | 89a79ffa58b086e5211473bb8633f5344e39000f /src/utils.nim | |
| parent | a25e544b717edab821779b4e7d978e8bf24debcb (diff) | |
Add Nim 1.0 support
Diffstat (limited to 'src/utils.nim')
| -rw-r--r-- | src/utils.nim | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/utils.nim b/src/utils.nim index 748e1e8..8ca68d4 100644 --- a/src/utils.nim +++ b/src/utils.nim @@ -1,5 +1,5 @@ import - future, hashes, options, os, osproc, posix, sequtils, strutils, tables + hashes, options, os, posix, sequtils, strutils, sugar, tables type HaltError* = object of Exception @@ -219,12 +219,12 @@ proc getUser(uid: int): User = var pw = getpwent() if pw == nil: endpwent() - raise newException(SystemError, "") + raise newException(CatchableError, "") if pw.pw_uid.int == uid: var groups: array[100, cint] var ngroups: cint = 100 if getgrouplist(pw.pw_name, pw.pw_gid, addr(groups[0]), ngroups) < 0: - raise newException(SystemError, "") + raise newException(CatchableError, "") else: let groupsSeq = groups[0 .. ngroups - 1].map(x => x.int) let res = ($pw.pw_name, pw.pw_uid.int, pw.pw_gid.int, groupsSeq, @@ -287,7 +287,7 @@ proc dropPrivileges*(): bool = proc checkExec(file: string): bool = var statv: Stat - stat(file, statv) == 0 and (statv.st_mode and S_IXUSR) == S_IXUSR + stat(file, statv) == 0 and (statv.st_mode.cint and S_IXUSR) == S_IXUSR let sudoPrefix*: seq[string] = if checkExec(sudoCmd): @[sudoCmd] @@ -343,7 +343,7 @@ proc bashEscape*(s: string): string = elif c == "\n"[0]: result &= "$'\\n'" elif c.cuint < 0x20.cuint or c.cuint > 0x80.cuint: - result &= "$'\\0x" & c.toHex & "'" + result &= "$'\\0x" & c.uint8.toHex & "'" else: result &= c |