[uClibc-cvs] CVS update of uClibc/libc/sysdeps/linux/mips (Makefile sigaction.c)

[Erik Andersen]

    Date: Friday, July 16, 2004 @ 18:39:15
  Author: andersen
    Path: /var/cvs/uClibc/libc/sysdeps/linux/mips

   Added: sigaction.c (1.1)
Modified: Makefile (1.40 -> 1.41)

Add sigaction for mips


Index: uClibc/libc/sysdeps/linux/mips/Makefile
diff -u uClibc/libc/sysdeps/linux/mips/Makefile:1.40 uClibc/libc/sysdeps/linux/mips/Makefile:1.41
--- uClibc/libc/sysdeps/linux/mips/Makefile:1.40	Sun Feb 15 03:35:42 2004
+++ uClibc/libc/sysdeps/linux/mips/Makefile	Fri Jul 16 18:39:14 2004
@@ -28,7 +28,7 @@
 SOBJS=$(patsubst %.S,%.o, $(SSRC))
 
 CSRC=__longjmp.c  brk.c setjmp_aux.c mmap.c __syscall_error.c \
-	cacheflush.c pread_write.c sysmips.c _test_and_set.c
+	cacheflush.c pread_write.c sysmips.c _test_and_set.c sigaction.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(MOBJ) $(COBJS)
Index: uClibc/libc/sysdeps/linux/mips/sigaction.c
diff -u /dev/null uClibc/libc/sysdeps/linux/mips/sigaction.c:1.1
--- /dev/null	Fri Jul 16 18:39:15 2004
+++ uClibc/libc/sysdeps/linux/mips/sigaction.c	Fri Jul 16 18:39:14 2004
@@ -0,0 +1,123 @@
+/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  
+
+   Totally hacked up for uClibc by Erik Andersen <andersen at codepoet.org>
+   */
+
+#include <errno.h>
+#include <signal.h>
+#include <string.h>
+#include <sys/syscall.h>
+#include <bits/kernel_sigaction.h>
+
+#define SA_RESTORER	0x04000000
+
+
+#if defined __NR_rt_sigaction
+
+/* If ACT is not NULL, change the action for SIG to *ACT.
+   If OACT is not NULL, put the old action for SIG in *OACT.  */
+int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
+{
+    int result;
+    struct kernel_sigaction kact, koact;
+
+#ifdef SIGCANCEL
+    if (sig == SIGCANCEL) {
+	__set_errno (EINVAL);
+	return -1;
+    }
+#endif
+
+    if (act) {
+	kact.k_sa_handler = act->sa_handler;
+	memcpy (&kact.sa_mask, &act->sa_mask, sizeof (kact.sa_mask));
+	kact.sa_flags = act->sa_flags;
+
+	kact.sa_flags = act->sa_flags | SA_RESTORER;
+#ifdef HAVE_SA_RESTORER
+	kact.sa_restorer = act->sa_restorer;
+#endif
+    }
+
+    /* XXX The size argument hopefully will have to be changed to the
+       real size of the user-level sigset_t.  */
+    result = __syscall_rt_sigaction(sig, act ? __ptrvalue (&kact) : NULL,
+	    oact ? __ptrvalue (&koact) : NULL, _NSIG / 8);
+
+    if (oact && result >= 0) {
+	oact->sa_handler = koact.k_sa_handler;
+	memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (oact->sa_mask));
+	oact->sa_flags = koact.sa_flags;
+#ifdef HAVE_SA_RESTORER
+	oact->sa_restorer = koact.sa_restorer;
+#endif
+    }
+    return result;
+}
+
+
+#else
+#warning "Yes there is a warning here.  Don't worry about it."
+static void restore (void) asm ("__restore");
+
+/* If ACT is not NULL, change the action for SIG to *ACT.
+   If OACT is not NULL, put the old action for SIG in *OACT.  */
+int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
+{
+    int result;
+    struct old_kernel_sigaction kact, koact;
+
+#ifdef SIGCANCEL
+    if (sig == SIGCANCEL) {
+	__set_errno (EINVAL);
+	return -1;
+    }
+#endif
+
+    if (act) {
+	kact.k_sa_handler = act->sa_handler;
+	kact.sa_mask = act->sa_mask.__val[0];
+	kact.sa_flags = act->sa_flags | SA_RESTORER;
+#ifdef HAVE_SA_RESTORER
+	kact.sa_restorer = act->sa_restorer;
+#endif
+    }
+
+    result = __syscall_sigaction(sig, act ? __ptrvalue (&kact) : NULL,
+	    oact ? __ptrvalue (&koact) : NULL);
+
+    if (result < 0) {
+	__set_errno(-result);
+	return -1;
+    }
+
+    if (oact) {
+	oact->sa_handler = koact.k_sa_handler;
+	oact->sa_mask.__val[0] = koact.sa_mask;
+	oact->sa_flags = koact.sa_flags;
+#ifdef HAVE_SA_RESTORER
+	oact->sa_restorer = koact.sa_restorer;
+#endif
+    }
+    return result;
+}
+
+#endif
+weak_alias (__libc_sigaction, sigaction)
+