Page MenuHomeFreeBSD
Files F170910108

D1044.id2174.diff
No OneTemporary
Actions

D1044.id2174.diff
View Options

Index: sys/compat/linux/linux_signal.h
===================================================================
--- sys/compat/linux/linux_signal.h
+++ sys/compat/linux/linux_signal.h
@@ -40,6 +40,7 @@
void bsd_to_linux_sigset(sigset_t *, l_sigset_t *);
int linux_do_sigaction(struct thread *, int, l_sigaction_t *, l_sigaction_t *);
void ksiginfo_to_lsiginfo(ksiginfo_t *ksi, l_siginfo_t *lsi, l_int sig);
+void siginfo_to_lsiginfo(siginfo_t *si, l_siginfo_t *lsi, l_int sig);
#define LINUX_SIG_VALID(sig) ((sig) <= LINUX_NSIG && (sig) > 0)
Index: sys/compat/linux/linux_signal.c
===================================================================
--- sys/compat/linux/linux_signal.c
+++ sys/compat/linux/linux_signal.c
@@ -644,33 +644,40 @@
ksiginfo_to_lsiginfo(ksiginfo_t *ksi, l_siginfo_t *lsi, l_int sig)
{
+ siginfo_to_lsiginfo(&ksi->ksi_info, lsi, sig);
+}
+
+void
+siginfo_to_lsiginfo(siginfo_t *si, l_siginfo_t *lsi, l_int sig)
+{
+
lsi->lsi_signo = sig;
- lsi->lsi_code = ksi->ksi_code;
+ lsi->lsi_code = si->si_code;
switch (sig) {
case LINUX_SIGPOLL:
/* XXX si_fd? */
- lsi->lsi_band = ksi->ksi_band;
+ lsi->lsi_band = si->si_band;
break;
case LINUX_SIGCHLD:
- lsi->lsi_pid = ksi->ksi_pid;
- lsi->lsi_uid = ksi->ksi_uid;
- lsi->lsi_status = ksi->ksi_status;
+ lsi->lsi_pid = si->si_pid;
+ lsi->lsi_uid = si->si_uid;
+ lsi->lsi_status = si->si_status;
break;
case LINUX_SIGBUS:
case LINUX_SIGILL:
case LINUX_SIGFPE:
case LINUX_SIGSEGV:
- lsi->lsi_addr = PTROUT(ksi->ksi_addr);
+ lsi->lsi_addr = PTROUT(si->si_addr);
break;
default:
/* XXX SI_TIMER etc... */
- lsi->lsi_pid = ksi->ksi_pid;
- lsi->lsi_uid = ksi->ksi_uid;
+ lsi->lsi_pid = si->si_pid;
+ lsi->lsi_uid = si->si_uid;
break;
}
if (sig >= LINUX_SIGRTMIN) {
- lsi->lsi_int = ksi->ksi_info.si_value.sival_int;
- lsi->lsi_ptr = PTROUT(ksi->ksi_info.si_value.sival_ptr);
+ lsi->lsi_int = si->si_value.sival_int;
+ lsi->lsi_ptr = PTROUT(si->si_value.sival_ptr);
}
}

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 8, 12:35 PM (9 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38516713
Default Alt Text
D1044.id2174.diff (1 KB)

Event Timeline