libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* fhandler.h (fhandler_base::stat_fixup): Rename from 

fhandler_base::set_ino_and_dev.
	* syscalls.cc (fhandler_base::stat_fixup): Ditto. Accommodate name
	change throughout.  Fixup link count of console devices.
This commit is contained in:
Corinna Vinschen 2012-04-02 16:19:29 +00:00
parent f7c8c4540a
commit 467e17b9af
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2012-04-02 Corinna Vinschen <corinna@vinschen.de>
* fhandler.h (fhandler_base::stat_fixup): Rename from
fhandler_base::set_ino_and_dev.
* syscalls.cc (fhandler_base::stat_fixup): Ditto. Accommodate name
change throughout. Fixup link count of console devices.
2012-04-02 Corinna Vinschen <corinna@vinschen.de> 2012-04-02 Corinna Vinschen <corinna@vinschen.de>
* devices.h (FH_CYGDRIVE): Define as DEV_VIRTFS_MAJOR class device. * devices.h (FH_CYGDRIVE): Define as DEV_VIRTFS_MAJOR class device.

2
winsup/cygwin/fhandler.h
View File

@ -328,7 +328,7 @@ class fhandler_base
# define archetype_usecount(n) _archetype_usecount (__PRETTY_FUNCTION__, __LINE__, (n)) # define archetype_usecount(n) _archetype_usecount (__PRETTY_FUNCTION__, __LINE__, (n))
int close_fs () { return fhandler_base::close (); } int close_fs () { return fhandler_base::close (); }
virtual int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2))); virtual int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
void set_ino_and_dev (struct __stat64 *buf) __attribute__ ((regparm (2))); void stat_fixup (struct __stat64 *buf) __attribute__ ((regparm (2)));
int __stdcall fstat_fs (struct __stat64 *buf) __attribute__ ((regparm (2))); int __stdcall fstat_fs (struct __stat64 *buf) __attribute__ ((regparm (2)));
private: private:
int __stdcall fstat_helper (struct __stat64 *buf, int __stdcall fstat_helper (struct __stat64 *buf,

14
winsup/cygwin/syscalls.cc
View File

@ -1589,7 +1589,7 @@ static struct __stat64 dev_st;
static bool dev_st_inited; static bool dev_st_inited;
void void
fhandler_base::set_ino_and_dev (struct __stat64 *buf) fhandler_base::stat_fixup (struct __stat64 *buf)
{ {
if (!buf->st_ino) if (!buf->st_ino)
buf->st_ino = get_ino (); buf->st_ino = get_ino ();
@ -1613,7 +1613,13 @@ fhandler_base::set_ino_and_dev (struct __stat64 *buf)
} }
/* Only set st_rdev if it's a device. */ /* Only set st_rdev if it's a device. */
if (!buf->st_rdev && get_major () != DEV_VIRTFS_MAJOR) if (!buf->st_rdev && get_major () != DEV_VIRTFS_MAJOR)
buf->st_rdev = get_device (); {
buf->st_rdev = get_device ();
/* consX, console, conin, and conout point to the same device.
make sure the link count is correct. */
if (buf->st_rdev == (dev_t) myself->ctty && iscons_dev (myself->ctty))
buf->st_nlink = 4;
}
} }
extern "C" int extern "C" int
@ -1629,7 +1635,7 @@ fstat64 (int fd, struct __stat64 *buf)
memset (buf, 0, sizeof (struct __stat64)); memset (buf, 0, sizeof (struct __stat64));
res = cfd->fstat (buf); res = cfd->fstat (buf);
if (!res) if (!res)
cfd->set_ino_and_dev (buf); cfd->stat_fixup (buf);
} }
syscall_printf ("%R = fstat(%d, %p)", res, fd, buf); syscall_printf ("%R = fstat(%d, %p)", res, fd, buf);
@ -1768,7 +1774,7 @@ stat_worker (path_conv &pc, struct __stat64 *buf)
memset (buf, 0, sizeof (*buf)); memset (buf, 0, sizeof (*buf));
res = fh->fstat (buf); res = fh->fstat (buf);
if (!res) if (!res)
fh->set_ino_and_dev (buf); fh->stat_fixup (buf);
delete fh; delete fh;
} }
else else