From bef3e5824991b1d853e65d20862d94c483524719 Mon Sep 17 00:00:00 2001 From: corinna Date: Fri, 21 Jun 2002 15:01:18 +0000 Subject: [PATCH] * syscalls.cc (stat64_to_stat32): Correctly evaluate st_rdev. (fstat64): Set st_rdev to same value as st_dev. (stat_worker): Ditto. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/syscalls.cc | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index afcfcece72..8118019157 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 2002-06-21 Corinna Vinschen + * syscalls.cc (stat64_to_stat32): Correctly evaluate st_rdev. + (fstat64): Set st_rdev to same value as st_dev. + (stat_worker): Ditto. + +2002-06-21 Corinna Vinschen + * security.cc (alloc_sd): Carefully check owner_sid again after trying SIDs from cygheap. diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index da42ee42b1..a788c604be 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -998,7 +998,7 @@ stat64_to_stat32 (struct __stat64 *src, struct __stat32 *dst) dst->st_nlink = src->st_nlink; dst->st_uid = src->st_uid; dst->st_gid = src->st_gid; - dst->st_rdev = src->st_rdev; + dst->st_rdev = ((src->st_rdev >> 8) & 0xff00) | (src->st_rdev & 0xff); dst->st_size = src->st_size; dst->st_atim = src->st_atim; dst->st_mtim = src->st_mtim; @@ -1027,6 +1027,8 @@ fstat64 (int fd, struct __stat64 *buf) buf->st_ino = hash_path_name (0, cfd->get_win32_name ()); if (!buf->st_dev) buf->st_dev = (cfd->get_device () << 16) | cfd->get_unit (); + if (!buf->st_rdev) + buf->st_rdev = buf->st_dev; } } @@ -1115,6 +1117,8 @@ stat_worker (const char *name, struct __stat64 *buf, int nofollow, buf->st_ino = hash_path_name (0, fh->get_win32_name ()); if (!buf->st_dev) buf->st_dev = (fh->get_device () << 16) | fh->get_unit (); + if (!buf->st_rdev) + buf->st_rdev = buf->st_dev; } } -- 2.11.0