Merged some stuff from `stub_suid'.

1 files changed, 18 insertions, 40 deletions

diff --git a/sysdeps/freebsd/procsignal.c b/sysdeps/freebsd/procsignal.c
index 9d3aa408..63b9ccad 100644
--- a/sysdeps/freebsd/procsignal.c
+++ b/sysdeps/freebsd/procsignal.c
@@ -2,7 +2,7 @@
 
 /* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    This file is part of the Gnome Top Library.
-   Contributed by Joshua Sled <jsled@xcf.berkeley.edu>, July 1998.
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
    The Gnome Top Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -19,51 +19,29 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <config.h>
+#include <glibtop.h>
+#include <glibtop/error.h>
 #include <glibtop/procsignal.h>
 
-static const unsigned long _glibtop_sysdeps_proc_signal =
-(1 << GLIBTOP_PROC_SIGNAL_SIGNAL) +
-(1 << GLIBTOP_PROC_SIGNAL_BLOCKED) +
-(1 << GLIBTOP_PROC_SIGNAL_SIGIGNORE) +
-(1 << GLIBTOP_PROC_SIGNAL_SIGCATCH);
+#include <glibtop_suid.h>
 
-/* Provides detailed information about a process. */
+static const unsigned long _glibtop_sysdeps_proc_signal = 0;
+
+/* Init function. */
 
 void
-glibtop_get_proc_signal_s (glibtop *server,
-			   glibtop_proc_signal *buf,
-			   pid_t pid)
+glibtop_init_proc_signal_p (glibtop *server)
 {
-  glibtop_init_r(&server, 0, 0);
-
-  memset (buf, 0, sizeof (glibtop_proc_signal));
-
-  if (pid == 0) {
-    /* Client is only interested in the flags. */
-    buf->flags = _glibtop_sysdeps_proc_signal;
-    return;
-  }
-
-  /* signal: mask of pending signals.
-     pinfo[0].kp_proc.p_siglist
-   */
-  buf->signal = pinfo[0].kp_proc.p_siglist;
-
-  /* blocked: mask of blocked signals.
-     pinfo[0].kp_proc.p_sigmask
-   */
-  buf->blocked = pinfo[0].kp_proc.p_sigmask;
-
-  /* sigignore: mask of ignored signals.
-     pinfo[0].kp_proc.p_sigignore
-   */
-  buf->sigignore = pinfo[0].kp_proc.p_sigignore;
-
-  /* sigcatch: mask of caught signals.
-     pinfo[0].kp_proc.p_sigcatch
-   */
-  buf->sigcatch = pinfo[0].kp_proc.p_sigcatch;
+	server->sysdeps.proc_signal = _glibtop_sysdeps_proc_signal;
+}
 
+/* Provides detailed information about a process. */
 
+void
+glibtop_get_proc_signal_p (glibtop *server, glibtop_proc_signal *buf,
+			   pid_t pid)
+{
+	glibtop_init_p (server, GLIBTOP_SYSDEPS_PROC_SIGNAL, 0);
+	
+	memset (buf, 0, sizeof (glibtop_proc_signal));
 }