diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-09-19 03:30:20 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-09-19 03:30:20 +0000 |
| commit | 5bf785a017482da9b87a141e91f91a07a4d433d0 (patch) | |
| tree | e0be3c2626e648fa0aabb41d593c4abaef433316 /winsup/cygwin/grp.cc | |
| parent | 57dfd574a784bd6dbf0bc7c67b28a8283dff6149 (diff) | |
| download | cygnal-5bf785a017482da9b87a141e91f91a07a4d433d0.tar.gz cygnal-5bf785a017482da9b87a141e91f91a07a4d433d0.tar.bz2 cygnal-5bf785a017482da9b87a141e91f91a07a4d433d0.zip | |
* cygthread.cc (cygthread::initialized): Avoid copying on fork or some threads
may not end up in the pool.
(cygthread::new): Avoid race when checking for initialized. Add debugging
code.
* fhandler.cc (fhandler_base::raw_read): Add case for ERROR_INVALID_HANDLE due
to Win95 directories.
(fhandler_base::open): Handle errors due to Win95 directories.
(fhandler_base::close): Add get_nohandle () test.
(fhandler_base::set_close_on_exec): Ditto.
(fhandler_base::fork_fixup): Ditto.
(fhandler_base::lock): Change error code to Posix EINVAL.
(fhandler_base::dup): If get_nohandle (), set new value to INVALID_HANDLE_VALUE
instead of NULL.
* fhandler_disk_file.cc (fhandler_disk_file::fstat): Call fstat_by_name if
get_nohandle (). Remove extraneous element from strpbrk.
(fhandler_disk_file::open): Remove test for Win95 directory.
* fhandler_random.cc (fhandler_dev_random::open): Add set_nohandle ().
* fhandler_clipboard.cc (fhandler_dev_clipboard::open): Ditto.
* fhandler_zero.cc (fhandler_dev_zero::open): Ditto.
(fhandler_dev_zero::close): Delete.
* fhandler.h (class fhandler_dev_zero): Ditto.
Diffstat (limited to 'winsup/cygwin/grp.cc')
| -rw-r--r-- | winsup/cygwin/grp.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc index 31f577a94..11b6953aa 100644 --- a/winsup/cygwin/grp.cc +++ b/winsup/cygwin/grp.cc @@ -187,10 +187,10 @@ read_etc_group () { char strbuf[100]; snprintf (linebuf, sizeof (linebuf), "%s:%s:%lu:", - group_name, + group_name, tg.string (strbuf), *GetSidSubAuthority(tg, - *GetSidSubAuthorityCount(tg) - 1)); + *GetSidSubAuthorityCount(tg) - 1)); debug_printf ("Emulating /etc/group: %s", linebuf); add_grp_line (linebuf); group_state = emulated; @@ -365,7 +365,7 @@ getgroups32 (int gidsetsize, __gid32_t *grouplist, __gid32_t gid, for (int gidx = 0; (gr = internal_getgrent (gidx)); ++gidx) if (sid.getfromgr (gr)) for (DWORD pg = 0; pg < groups->GroupCount; ++pg) - if (sid == groups->Groups[pg].Sid && + if (sid == groups->Groups[pg].Sid && sid != well_known_world_sid) { if (cnt < gidsetsize) @@ -516,7 +516,7 @@ setgroups (int ngroups, const __gid16_t *grouplist) if (grouplist32 == NULL) return -1; for (int i = 0; i < ngroups; i++) - grouplist32[i] = grouplist[i]; + grouplist32[i] = grouplist[i]; } return setgroups32 (ngroups, grouplist32); } |