kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

win32.c: volume serial numbers

Browse source 
* win32/win32.c (different_device_p): compare by volume serial
  numbers, not by path names.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-02-20 08:19:26 +00:00
parent eb7ddaa3a4
commit a75668a202
2 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Feb 20 17:19:23 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (different_device_p): compare by volume serial
numbers, not by path names.
Thu Feb 19 01:58:10 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/file.c (rb_file_expand_path_internal): neither the drive

38
win32/win32.c
View file

@ -4701,29 +4701,29 @@ rb_w32_getenv(const char *name)
return w32_getenv(name, CP_ACP);
}
/* License: Ruby's */
static DWORD
get_volume_serial_number(const WCHAR *path)
{
const DWORD share_mode = FILE_SHARE_READ | FILE_SHARE_WRITE;
const DWORD creation = OPEN_EXISTING;
const DWORD flags = FILE_FLAG_BACKUP_SEMANTICS;
BY_HANDLE_FILE_INFORMATION st = {0};
HANDLE h = CreateFileW(path, 0, share_mode, NULL, creation, flags, NULL);
BOOL ret;
if (h == INVALID_HANDLE_VALUE) return 0;
ret = GetFileInformationByHandle(h, &st);
CloseHandle(h);
if (!ret) return 0;
return st.dwVolumeSerialNumber;
}
/* License: Ruby's */
static int
different_device_p(const WCHAR *oldpath, const WCHAR *newpath)
{
WCHAR oldfullpath[_MAX_PATH], newfullpath[_MAX_PATH];
DWORD oldlen, newlen;
newlen = GetFullPathNameW(newpath, numberof(newfullpath), newfullpath, NULL);
if (newlen <= 1) return 0;
oldlen = GetFullPathNameW(oldpath, numberof(oldfullpath), oldfullpath, NULL);
if (oldlen <= 1) return 0;
if (newfullpath[1] == L':') {
if (oldfullpath[1] != L':') return 1;
return newfullpath[0] != oldfullpath[0];
}
if (newfullpath[0] != L'\\' || newfullpath[1] != L'\\') return 0;
if (oldfullpath[0] != L'\\' || oldfullpath[1] != L'\\') return 0;
if (!(newpath = wcschr(newfullpath+2, L'\\'))) return 0;
if (!(newpath = wcschr(newpath+1, L'\\'))) return 0;
if (!(oldpath = wcschr(oldfullpath+2, L'\\'))) return 0;
if (!(oldpath = wcschr(oldpath+1, L'\\'))) return 0;
if (newpath - newfullpath != oldpath - oldfullpath) return 1;
return wcsncmp(newfullpath, oldfullpath, oldpath - oldfullpath) != 0;
return get_volume_serial_number(oldpath) != get_volume_serial_number(newpath);
}
/* License: Artistic or GPL */