archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 02:23:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 21447:

Browse source 
* 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_8_7@22615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-02-25 05:57:23 +00:00
parent c3e9fe6a3a
commit c7b600687e
3 changed files with 79 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Feb 25 14:57:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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]
Tue Feb 24 02:44:39 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/erb.rb (PercentScanner): remove PercentScanner. fixed % after

8
version.h
View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
#define RUBY_RELEASE_DATE "2009-02-24"
#define RUBY_RELEASE_DATE "2009-02-25"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090224
#define RUBY_PATCHLEVEL 141
#define RUBY_RELEASE_CODE 20090225
#define RUBY_PATCHLEVEL 142
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 24
#define RUBY_RELEASE_DAY 25
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];

95
win32/win32.c
View file

@ -1462,14 +1462,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 scannamespc[PATHLEN];
char *scanname = scannamespc;
struct stat sbuf;
WIN32_FIND_DATA fd;
HANDLE fh;
@ -1487,35 +1517,17 @@ rb_w32_opendir(const char *filename)
return NULL;
}
fh = open_dir_handle(filename, &fd);
if (fh == INVALID_HANDLE_VALUE) {
return NULL;
}
//
// Get us a DIR structure
//
p = xcalloc(sizeof(DIR), 1);
p = calloc(sizeof(DIR), 1);
if (p == NULL)
return NULL;
//
// Create the search pattern
//
strcpy(scanname, filename);
if (index("/\\:", *CharPrev(scanname, scanname + strlen(scanname))) == NULL)
strcat(scanname, "/*");
else
strcat(scanname, "*");
//
// do the FindFirstFile call
//
fh = FindFirstFile(scanname, &fd);
if (fh == INVALID_HANDLE_VALUE) {
errno = map_errno(GetLastError());
free(p);
return NULL;
}
//
// now allocate the first part of the string table for the
@ -3353,6 +3365,17 @@ fileattr_to_unixmode(DWORD attr, const char *path)
return mode;
}
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 stat *st)
{
@ -3383,6 +3406,9 @@ winnt_stat(const char *path, struct stat *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);
}
@ -3392,6 +3418,21 @@ winnt_stat(const char *path, struct stat *st)
return 0;
}
#ifdef WIN95
static int
win95_stat(const char *path, struct stat *st)
{
int ret = stat(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)
{
@ -3427,7 +3468,7 @@ rb_w32_stat(const char *path, struct stat *st)
} else if (*end == '\\' || (buf1 + 1 == end && *end == ':'))
strcat(buf1, ".");
ret = IsWinNT() ? winnt_stat(buf1, st) : stat(buf1, st);
ret = IsWinNT() ? winnt_stat(buf1, st) : win95_stat(buf1, st);
if (ret == 0) {
st->st_mode &= ~(S_IWGRP | S_IWOTH);
}