summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-12 13:33:08 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-12 13:33:08 +0000
commit1fbaa2a5af038bb20b58652b3ec51b19b0f118d8 (patch)
tree6199da5ab84010b80fe90cd1b1d8db07b38870f7 /win32
parentde694df00d9447afa4ad8b640d81da799be0144c (diff)
merges r21447 from trunk into ruby_1_9_1.
* win32/win32.c (open_dir_handle): extracted from rb_w32_opendir. * win32/win32.c (winnt_stat): gets rid of strange behavior of GetFileAttributes(). [ruby-core:21269] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c95
1 files changed, 67 insertions, 28 deletions
diff --git a/win32/win32.c b/win32/win32.c
index e518e935d0..27e55bcae9 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1412,13 +1412,44 @@ rb_w32_cmdvector(const char *cmd, char ***vec)
#define BitOfIsRep(n) ((n) * 2 + 1)
#define DIRENT_PER_CHAR (CHAR_BIT / 2)
+static HANDLE
+open_dir_handle(const char *filename, WIN32_FIND_DATA *fd)
+{
+ HANDLE fh;
+ static const char wildcard[] = "/*";
+ long len = strlen(filename);
+ char *scanname = malloc(len + sizeof(wildcard));
+
+ //
+ // Create the search pattern
+ //
+ if (!scanname) {
+ return INVALID_HANDLE_VALUE;
+ }
+ memcpy(scanname, filename, len + 1);
+
+ if (index("/\\:", *CharPrev(scanname, scanname + len)) == NULL)
+ memcpy(scanname + len, wildcard, sizeof(wildcard));
+ else
+ memcpy(scanname + len, wildcard + 1, sizeof(wildcard) - 1);
+
+ //
+ // do the FindFirstFile call
+ //
+ fh = FindFirstFile(scanname, fd);
+ free(scanname);
+ if (fh == INVALID_HANDLE_VALUE) {
+ errno = map_errno(GetLastError());
+ }
+ return fh;
+}
+
DIR *
rb_w32_opendir(const char *filename)
{
DIR *p;
long len;
long idx;
- char *scanname;
char *tmp;
struct stati64 sbuf;
WIN32_FIND_DATA fd;
@@ -1436,38 +1467,17 @@ rb_w32_opendir(const char *filename)
return NULL;
}
- //
- // Get us a DIR structure
- //
- p = calloc(sizeof(DIR), 1);
- if (p == NULL)
- return NULL;
-
- //
- // Create the search pattern
- //
- len = strlen(filename) + 2 + 1;
- if (!(scanname = malloc(len))) {
- free(p);
+ fh = open_dir_handle(filename, &fd);
+ if (fh == INVALID_HANDLE_VALUE) {
return NULL;
}
- strlcpy(scanname, filename, len);
-
- if (index("/\\:", *CharPrev(scanname, scanname + strlen(scanname))) == NULL)
- strlcat(scanname, "/*", len);
- else
- strlcat(scanname, "*", len);
//
- // do the FindFirstFile call
+ // Get us a DIR structure
//
- fh = FindFirstFile(scanname, &fd);
- free(scanname);
- if (fh == INVALID_HANDLE_VALUE) {
- errno = map_errno(GetLastError());
- free(p);
+ p = calloc(sizeof(DIR), 1);
+ if (p == NULL)
return NULL;
- }
idx = 0;
@@ -3467,6 +3477,17 @@ fileattr_to_unixmode(DWORD attr, const char *path)
}
static int
+check_valid_dir(const char *path)
+{
+ WIN32_FIND_DATA fd;
+ HANDLE fh = open_dir_handle(path, &fd);
+ if (fh == INVALID_HANDLE_VALUE)
+ return -1;
+ FindClose(fh);
+ return 0;
+}
+
+static int
winnt_stat(const char *path, struct stati64 *st)
{
HANDLE h;
@@ -3496,6 +3517,9 @@ winnt_stat(const char *path, struct stati64 *st)
errno = map_errno(GetLastError());
return -1;
}
+ if (attr & FILE_ATTRIBUTE_DIRECTORY) {
+ if (check_valid_dir(path)) return -1;
+ }
st->st_mode = fileattr_to_unixmode(attr, path);
}
@@ -3505,6 +3529,21 @@ winnt_stat(const char *path, struct stati64 *st)
return 0;
}
+#ifdef WIN95
+static int
+win95_stat(const char *path, struct stati64 *st)
+{
+ int ret = stati64(path, st);
+ if (ret) return ret;
+ if (st->st_mode & S_IFDIR) {
+ return check_valid_dir(path);
+ }
+ return 0;
+}
+#else
+#define win95_stat(path, st) -1
+#endif
+
int
rb_w32_stat(const char *path, struct stat *st)
{
@@ -3552,7 +3591,7 @@ rb_w32_stati64(const char *path, struct stati64 *st)
else if (*end == '\\' || (buf1 + 1 == end && *end == ':'))
strlcat(buf1, ".", size);
- ret = IsWinNT() ? winnt_stat(buf1, st) : stati64(buf1, st);
+ ret = IsWinNT() ? winnt_stat(buf1, st) : win95_stat(buf1, st);
if (ret == 0) {
st->st_mode &= ~(S_IWGRP | S_IWOTH);
}