diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-08-20 19:52:54 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-08-20 19:52:54 +0000 |
| commit | 6570e194e60822d81d6df31e260985e6a13b0f2a (patch) | |
| tree | 505bc4144874d98bb1a19417ac3e69fe95debae9 /linuxthreads | |
| parent | be7d999a0931203c5541714a255635459ee6dde2 (diff) | |
| download | glibc-6570e194e60822d81d6df31e260985e6a13b0f2a.tar.gz glibc-6570e194e60822d81d6df31e260985e6a13b0f2a.tar.xz glibc-6570e194e60822d81d6df31e260985e6a13b0f2a.zip | |
Update.
* intl/gettextP.h (struct loaded_domain): Add conv element. * intl/dcgettext.c (find_msg): Rename to _nl_find_msg and make public. Instead of returning found message directly convert it using iconv if a conversion was found when opening the file. * intl/loadinfo.h: Protect against multiple inclusion. Declare _nl_find_msg. * intl/loadmsgcat.c (_nl_load_domain): Try to determine charset used in the message file and if necessary find approrpiate conversion to match currently selected charset.
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 6 | ||||
| -rw-r--r-- | linuxthreads/pthread.c | 24 |
2 files changed, 18 insertions, 12 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 14230c1c8d..165b5f70bd 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,9 @@ +1999-08-20 Ulrich Drepper <drepper@cygnus.com> + + * pthread.c (__pthread_reset_main_thread): Undo last change. + (__pthread_kill_other_threads_np): Reset signal handlers for the + signals we used in the thread implementation here. + 1999-08-19 Ulrich Drepper <drepper@cygnus.com> * pthread.c (__pthread_reset_main_thread): Reset signal handlers diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index 7cc6b26866..86f24469de 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -635,7 +635,6 @@ static void pthread_handle_sigdebug(int sig) void __pthread_reset_main_thread() { pthread_descr self = thread_self(); - struct sigaction sa; if (__pthread_manager_request != -1) { /* Free the thread manager stack */ @@ -647,17 +646,6 @@ void __pthread_reset_main_thread() __pthread_manager_request = __pthread_manager_reader = -1; } - /* Reset the signal handlers behaviour for the signals the - implementation uses since this would be passed to the new - process. */ - sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; - sa.sa_handler = SIG_DFL; - __sigaction(__pthread_sig_restart, &sa, NULL); - __sigaction(__pthread_sig_cancel, &sa, NULL); - if (__pthread_sig_debug > 0) - __sigaction(__pthread_sig_debug, &sa, NULL); - /* Update the pid of the main thread */ THREAD_SETMEM(self, p_pid, __getpid()); /* Make the forked thread the main thread */ @@ -673,11 +661,23 @@ void __pthread_reset_main_thread() void __pthread_kill_other_threads_np(void) { + struct sigaction sa; /* Terminate all other threads and thread manager */ pthread_exit_process(0, NULL); /* Make current thread the main thread in case the calling thread changes its mind, does not exec(), and creates new threads instead. */ __pthread_reset_main_thread(); + + /* Reset the signal handlers behaviour for the signals the + implementation uses since this would be passed to the new + process. */ + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + sa.sa_handler = SIG_DFL; + __sigaction(__pthread_sig_restart, &sa, NULL); + __sigaction(__pthread_sig_cancel, &sa, NULL); + if (__pthread_sig_debug > 0) + __sigaction(__pthread_sig_debug, &sa, NULL); } weak_alias (__pthread_kill_other_threads_np, pthread_kill_other_threads_np) |