luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unix: remove uv_fs_stat windows compat hack

Browse Source 
uv_fs_stat and uv_fs_lstat removed the trailing backslash (if any) from the path
in order to please a test case that was written for Windows. Remove the
compatibility hack and fix the test.
This commit is contained in:
Ben Noordhuis 2012-10-01 22:47:25 +02:00
parent 678e95a443
commit 7320633c4b
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/unix/fs.c
View File

@ -81,16 +81,6 @@
} \
while (0)
#define PATH_STAT_FIXUP \
do { \
size_t len; \
PATH; \
len = strlen((req)->path); \
if (len != 0 && (req)->path[len - 1] == '\\') \
((char*) (req)->path)[len - 1] = '\0'; /* Windows compatibility... */ \
} \
while (0)
#define POST \
do { \
if ((cb) != NULL) \
@ -474,7 +464,7 @@ int uv_fs_futime(uv_loop_t* loop,
int uv_fs_lstat(uv_loop_t* loop, uv_fs_t* req, const char* path, uv_fs_cb cb) {
INIT(LSTAT);
PATH_STAT_FIXUP;
PATH;
POST;
}
@ -589,7 +579,7 @@ int uv_fs_sendfile(uv_loop_t* loop,
int uv_fs_stat(uv_loop_t* loop, uv_fs_t* req, const char* path, uv_fs_cb cb) {
INIT(STAT);
PATH_STAT_FIXUP;
PATH;
POST;
}

4
test/test-fs.c
View File

@ -794,7 +794,7 @@ TEST_IMPL(fs_async_dir) {
ASSERT(r == 0);
uv_run(loop);
r = uv_fs_stat(loop, &stat_req, "test_dir\\", stat_cb);
r = uv_fs_stat(loop, &stat_req, "test_dir/", stat_cb);
ASSERT(r == 0);
uv_run(loop);
@ -802,7 +802,7 @@ TEST_IMPL(fs_async_dir) {
ASSERT(r == 0);
uv_run(loop);
r = uv_fs_lstat(loop, &stat_req, "test_dir\\", stat_cb);
r = uv_fs_lstat(loop, &stat_req, "test_dir/", stat_cb);
ASSERT(r == 0);
uv_run(loop);