summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorTomoyuki Sahara <[email protected]>2014-05-09 02:33:00 +0900
committerTomoyuki Sahara <[email protected]>2014-05-09 02:33:00 +0900
commit9ee9c271d11fe125421f025b850a105ac3c40bcd (patch)
treedf2ac133a19c1e28c01a11eafb5ebb1fbbb1196e
parent077f39bd38b5d6211d0470430e8d26915a44d92c (diff)
parentdc61ef1c65e425b1c3c9588c8340c472a6842488 (diff)
downloadmruby-9ee9c271d11fe125421f025b850a105ac3c40bcd.tar.gz
mruby-9ee9c271d11fe125421f025b850a105ac3c40bcd.zip
Merge pull request #20 from windwiny/patch-1
compatible 32 bit windows
-rw-r--r--src/file.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/file.c b/src/file.c
index e1db3f960..2c909fb48 100644
--- a/src/file.c
+++ b/src/file.c
@@ -29,7 +29,9 @@
#define GETCWD _getcwd
#define CHMOD(a, b) 0
#define MAXPATHLEN 1024
+ #if !defined(PATH_MAX)
#define PATH_MAX MAX_PATH
+ #endif
#define realpath(N,R) _fullpath((R),(N),_MAX_PATH)
#include <direct.h>
#else
@@ -127,7 +129,7 @@ mrb_file_dirname(mrb_state *mrb, mrb_value klass)
mrb_get_args(mrb, "S", &s);
path = mrb_str_to_cstr(mrb, s);
_splitpath((const char*)path, vname, dname, NULL, NULL);
- sprintf_s(buffer, _MAX_DRIVE + _MAX_DIR, "%s%s", vname, dname);
+ snprintf(buffer, _MAX_DRIVE + _MAX_DIR, "%s%s", vname, dname);
return mrb_str_new_cstr(mrb, buffer);
#else
char *dname, *path;
@@ -154,7 +156,7 @@ mrb_file_basename(mrb_state *mrb, mrb_value klass)
mrb_get_args(mrb, "S", &s);
path = mrb_str_to_cstr(mrb, s);
_splitpath((const char*)path, NULL, NULL, bname, extname);
- sprintf_s(buffer, _MAX_DIR + _MAX_EXT, "%s%s", bname, extname);
+ snprintf(buffer, _MAX_DIR + _MAX_EXT, "%s%s", bname, extname);
return mrb_str_new_cstr(mrb, buffer);
#else
char *bname, *path;