Commit de36ea7

committed

Fix yhirose#1933 on Linux and macOS

1 parent 9f8db2c commit de36ea7Copy full SHA for de36ea7

File tree

1 file changed

-17

lines changed

httplib.h

1 file changed

-17

lines changed

`‎httplib.h`

Lines changed: 9 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -2470,12 +2470,12 @@ class mmap {`
`2470`	`2470`	`#if defined(_WIN32)`
`2471`	`2471`	`HANDLE hFile_ = NULL;`
`2472`	`2472`	`HANDLE hMapping_ = NULL;`
`2473`		`- bool is_open_empty_file_on_windows_ = false;`
`2474`	`2473`	`#else`
`2475`	`2474`	`int fd_ = -1;`
`2476`	`2475`	`#endif`
`2477`	`2476`	`size_t size_ = 0;`
`2478`	`2477`	`void *addr_ = nullptr;`
	`2478`	`+ bool is_open_empty_file = false;`
`2479`	`2479`	`};`
`2480`	`2480`
`2481`	`2481`	`} // namespace detail`
`@@ -2940,10 +2940,10 @@ inline bool mmap::open(const char *path) {`
`2940`	`2940`	`hMapping_ = ::CreateFileMappingW(hFile_, NULL, PAGE_READONLY, 0, 0, NULL);`
`2941`	`2941`	`#endif`
`2942`	`2942`
`2943`		`- // TODO: Special treatment for an empty file on Windows... (#1933)`
	`2943`	`+ // Special treatment for an empty file...`
`2944`	`2944`	`if (hMapping_ == NULL && size_ == 0) {`
`2945`	`2945`	`close();`
`2946`		`- is_open_empty_file_on_windows_ = true;`
	`2946`	`+ is_open_empty_file = true;`
`2947`	`2947`	`return true;`
`2948`	`2948`	`}`
`2949`	`2949`
`@@ -2975,8 +2975,10 @@ inline bool mmap::open(const char *path) {`
`2975`	`2975`
`2976`	`2976`	`addr_ = ::mmap(NULL, size_, PROT_READ, MAP_PRIVATE, fd_, 0);`
`2977`	`2977`
`2978`		`- if (addr_ == MAP_FAILED) {`
	`2978`	`+ // Special treatment for an empty file...`
	`2979`	`+ if (addr_ == MAP_FAILED && size_ == 0) {`
`2979`	`2980`	`close();`
	`2981`	`+ is_open_empty_file = true;`
`2980`	`2982`	`return false;`
`2981`	`2983`	`}`
`2982`	`2984`	`#endif`
`@@ -2985,23 +2987,13 @@ inline bool mmap::open(const char *path) {`
`2985`	`2987`	`}`
`2986`	`2988`
`2987`	`2989`	`inline bool mmap::is_open() const {`
`2988`		`-#if defined(_WIN32)`
`2989`		`- if (is_open_empty_file_on_windows_) {`
`2990`		`- return true;`
`2991`		`- }`
`2992`		`-#endif`
`2993`		`- return addr_ != nullptr;`
	`2990`	`+ return is_open_empty_file ? true : addr_ != nullptr;`
`2994`	`2991`	`}`
`2995`	`2992`
`2996`	`2993`	`inline size_t mmap::size() const { return size_; }`
`2997`	`2994`
`2998`	`2995`	`inline const char *mmap::data() const {`
`2999`		`-#if defined(_WIN32)`
`3000`		`- if (is_open_empty_file_on_windows_) {`
`3001`		`- return "";`
`3002`		`- }`
`3003`		`-#endif`
`3004`		`- return static_cast<const char *>(addr_);`
	`2996`	`+ return is_open_empty_file ? "" : static_cast<const char *>(addr_);`
`3005`	`2997`	`}`
`3006`	`2998`
`3007`	`2999`	`inline void mmap::close() {`
`@@ -3021,7 +3013,7 @@ inline void mmap::close() {`
`3021`	`3013`	`hFile_ = INVALID_HANDLE_VALUE;`
`3022`	`3014`	`}`
`3023`	`3015`
`3024`		`- is_open_empty_file_on_windows_ = false;`
	`3016`	`+ is_open_empty_file = false;`
`3025`	`3017`	`#else`
`3026`	`3018`	`if (addr_ != nullptr) {`
`3027`	`3019`	`munmap(addr_, size_);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit de36ea7

File tree

1 file changed

1 file changed

`‎httplib.h`

0 commit comments