d6
/
xz-analysis-mirror
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xz: Rename a variable to avoid a namespace collision on Solaris. 

I don't know the details but I have an impression that there's
no problem in practice if using GCC since people have built xz
with GCC (without patching xz), but renaming the variable cannot
hurt either.

Thanks to Mark Ashley.
This commit is contained in:
Lasse Collin 2014-04-09 17:26:10 +03:00
parent cc41bcaf77
commit b9f0584e3e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xz/signals.c
View File

@ -77,17 +77,19 @@ signals_init(void)
sigaddset(&hooked_signals, message_progress_sigs[i]); sigaddset(&hooked_signals, message_progress_sigs[i]);
#endif #endif
struct sigaction sa; // Using "my_sa" because "sa" may conflict with a sockaddr variable
// from system headers on Solaris.
struct sigaction my_sa;
// All the signals that we handle we also blocked while the signal // All the signals that we handle we also blocked while the signal
// handler runs. // handler runs.
sa.sa_mask = hooked_signals; my_sa.sa_mask = hooked_signals;
// Don't set SA_RESTART, because we want EINTR so that we can check // Don't set SA_RESTART, because we want EINTR so that we can check
// for user_abort and cleanup before exiting. We block the signals // for user_abort and cleanup before exiting. We block the signals
// for which we have established a handler when we don't want EINTR. // for which we have established a handler when we don't want EINTR.
sa.sa_flags = 0; my_sa.sa_flags = 0;
sa.sa_handler = &signal_handler; my_sa.sa_handler = &signal_handler;
for (size_t i = 0; i < ARRAY_SIZE(sigs); ++i) { for (size_t i = 0; i < ARRAY_SIZE(sigs); ++i) {
// If the parent process has left some signals ignored, // If the parent process has left some signals ignored,
@ -98,7 +100,7 @@ signals_init(void)
continue; continue;
// Establish the signal handler. // Establish the signal handler.
if (sigaction(sigs[i], &sa, NULL)) if (sigaction(sigs[i], &my_sa, NULL))
message_signal_handler(); message_signal_handler();
} }