This repository has been archived by the owner on Apr 22, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Windows: ErrnoException shouldn't mix up crt and win32 errors
- Loading branch information
1 parent
189dd8f
commit 6ee73a2
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -605,234 +605,6 @@ static inline const char *errno_string(int errorno) { | |
| ERRNO_CASE(EXDEV); | ||
| #endif | ||
|
|
||
| default: return ""; | ||
| } | ||
| } | ||
|
|
@@ -994,11 +766,7 @@ Local<Value> ErrnoException(int errorno, | |
| Local<Value> e; | ||
| Local<String> estring = String::NewSymbol(errno_string(errorno)); | ||
| if (!msg[0]) { | ||
| msg = strerror(errorno); | ||
| } | ||
| Local<String> message = String::NewSymbol(msg); | ||
|
|
||
|
|
@@ -1031,6 +799,43 @@ Local<Value> ErrnoException(int errorno, | |
| } | ||
|
|
||
|
|
||
| #ifdef _WIN32 | ||
| Local<Value> WinapiErrnoException(int errorno, | ||
| const char *syscall, | ||
| const char *msg, | ||
| const char *path) { | ||
This comment has been minimized.
Sorry, something went wrong. |
||
| Local<Value> e; | ||
| if (!msg[0]) { | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
bnoordhuis
Member
|
||
| msg = winapi_strerror(errorno); | ||
| } | ||
| Local<String> message = String::NewSymbol(msg); | ||
|
|
||
| if (syscall_symbol.IsEmpty()) { | ||
| syscall_symbol = NODE_PSYMBOL("syscall"); | ||
| errno_symbol = NODE_PSYMBOL("errno"); | ||
| errpath_symbol = NODE_PSYMBOL("path"); | ||
| code_symbol = NODE_PSYMBOL("code"); | ||
| } | ||
|
|
||
| if (path) { | ||
| Local<String> cons1 = String::Concat(message, String::NewSymbol(" '")); | ||
| Local<String> cons2 = String::Concat(cons1, String::New(path)); | ||
| Local<String> cons3 = String::Concat(cons2, String::NewSymbol("'")); | ||
| e = Exception::Error(cons3); | ||
| } else { | ||
| e = Exception::Error(message); | ||
| } | ||
|
|
||
| Local<Object> obj = e->ToObject(); | ||
|
|
||
| obj->Set(errno_symbol, Integer::New(errorno)); | ||
| if (path) obj->Set(errpath_symbol, String::New(path)); | ||
| if (syscall) obj->Set(syscall_symbol, String::NewSymbol(syscall)); | ||
| return e; | ||
| } | ||
| #endif | ||
|
|
||
|
|
||
| Handle<Value> FromConstructorTemplate(Persistent<FunctionTemplate>& t, | ||
| const Arguments& args) { | ||
| HandleScope scope; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Style issue:
const char*, notconst char *