diff options
Diffstat (limited to 'winsup/cygwin/grp.cc')
| -rw-r--r-- | winsup/cygwin/grp.cc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc index 48a74e99c..e4a4afd6c 100644 --- a/winsup/cygwin/grp.cc +++ b/winsup/cygwin/grp.cc @@ -117,6 +117,14 @@ add_grp_line (const char *line) curr_lines++; } +class group_lock +{ + pthread_mutex_t mutex; + public: + group_lock (): mutex ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER) {} + void arm () {pthread_mutex_lock (&mutex); } +}; + /* Cygwin internal */ /* Read in /etc/group and save contents in the group cache */ /* This sets group_in_memory_p to 1 so functions in this file can @@ -132,15 +140,13 @@ read_etc_group () strncpy (group_name, "Administrators", sizeof (group_name)); - static NO_COPY pthread_mutex_t etc_group_mutex = (pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER; - pthread_mutex_lock (&etc_group_mutex); + static NO_COPY group_lock here; + if (cygwin_finished_initializing) + here.arm (); /* if we got blocked by the mutex, then etc_group may have been processed */ if (group_state != uninitialized) - { - pthread_mutex_unlock(&etc_group_mutex); - return; - } + return; if (group_state != initializing) { @@ -193,7 +199,7 @@ read_etc_group () } } - pthread_mutex_unlock(&etc_group_mutex); + return; } extern "C" |