1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

64bit offsets for fs calls

Browse Source
This commit is contained in:
Igor Zinkovsky 2012-04-19 11:58:35 -07:00
parent 4e290e48b2
commit 6f82b9f482
1 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/node_file.cc
View File

@ -69,42 +69,20 @@ static Persistent<String> buf_symbol;
static Persistent<String> oncomplete_sym; static Persistent<String> oncomplete_sym;
#ifndef _LARGEFILE_SOURCE #define ASSERT_OFFSET(a) \
typedef off_t node_off_t; if (!(a)->IsUndefined() && !(a)->IsNull() && !IsInt64((a)->NumberValue())) { \
# define ASSERT_OFFSET(a) \ return ThrowException(Exception::TypeError(String::New("Not an integer"))); \
STATIC_ASSERT(sizeof(node_off_t) * CHAR_BIT >= 32); \
if (!(a)->IsUndefined() && !(a)->IsNull() && !(a)->IsInt32()) { \
return ThrowException(Exception::TypeError(String::New("Not an integer"))); \
}
# define ASSERT_TRUNCATE_LENGTH(a) \
if (!(a)->IsUndefined() && !(a)->IsNull() && !(a)->IsUint32()) { \
return ThrowException(Exception::TypeError(String::New("Not an integer"))); \
}
# define GET_OFFSET(a) ((a)->IsNumber() ? (a)->Int32Value() : -1)
# define GET_TRUNCATE_LENGTH(a) ((a)->Uint32Value())
#else
# ifdef _WIN32
# define NODE_USE_64BIT_UV_FS_API
typedef int64_t node_off_t;
# else
typedef off_t node_off_t;
# endif
# define ASSERT_OFFSET(a) \
STATIC_ASSERT(sizeof(node_off_t) * CHAR_BIT >= 64); \
if (!(a)->IsUndefined() && !(a)->IsNull() && !IsInt64((a)->NumberValue())) { \
return ThrowException(Exception::TypeError(String::New("Not an integer"))); \
}
# define ASSERT_TRUNCATE_LENGTH(a) \
if (!(a)->IsUndefined() && !(a)->IsNull() && !IsInt64((a)->NumberValue())) { \
return ThrowException(Exception::TypeError(String::New("Not an integer"))); \
}
# define GET_OFFSET(a) ((a)->IsNumber() ? (a)->IntegerValue() : -1)
# define GET_TRUNCATE_LENGTH(a) ((a)->IntegerValue())
static inline int IsInt64(double x) {
return x == static_cast<double>(static_cast<int64_t>(x));
} }
#endif #define ASSERT_TRUNCATE_LENGTH(a) \
if (!(a)->IsUndefined() && !(a)->IsNull() && !IsInt64((a)->NumberValue())) { \
return ThrowException(Exception::TypeError(String::New("Not an integer"))); \
}
#define GET_OFFSET(a) ((a)->IsNumber() ? (a)->IntegerValue() : -1)
#define GET_TRUNCATE_LENGTH(a) ((a)->IntegerValue())
static inline int IsInt64(double x) {
return x == static_cast<double>(static_cast<int64_t>(x));
}
static void After(uv_fs_t *req) { static void After(uv_fs_t *req) {
@ -515,7 +493,7 @@ static Handle<Value> Truncate(const Arguments& args) {
int fd = args[0]->Int32Value(); int fd = args[0]->Int32Value();
ASSERT_TRUNCATE_LENGTH(args[1]); ASSERT_TRUNCATE_LENGTH(args[1]);
node_off_t len = GET_TRUNCATE_LENGTH(args[1]); int64_t len = GET_TRUNCATE_LENGTH(args[1]);
if (args[2]->IsFunction()) { if (args[2]->IsFunction()) {
#ifdef NODE_USE_64BIT_UV_FS_API #ifdef NODE_USE_64BIT_UV_FS_API
@ -738,7 +716,7 @@ static Handle<Value> Write(const Arguments& args) {
} }
ASSERT_OFFSET(args[4]); ASSERT_OFFSET(args[4]);
node_off_t pos = GET_OFFSET(args[4]); int64_t pos = GET_OFFSET(args[4]);
char * buf = (char*)buffer_data + off; char * buf = (char*)buffer_data + off;
Local<Value> cb = args[5]; Local<Value> cb = args[5];
@ -783,7 +761,7 @@ static Handle<Value> Read(const Arguments& args) {
Local<Value> cb; Local<Value> cb;
size_t len; size_t len;
node_off_t pos; int64_t pos;
char * buf = NULL; char * buf = NULL;