2007-12-20 Jennifer Averett <jennifer.averett@OARcorp.com>

	* posix/Makefile.am, posix/src/kill.c, posix/src/killinfo.c: Split file
	and resolved copyright information.
	* posix/src/kill_r.c: New file.

4 files changed, 40 insertions, 22 deletions

diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index bc8ae0b411..aff6cf127e 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -125,7 +125,7 @@ libposix_a_SOURCES += src/pthread.c src/pthreadsetcputime.c \
 
 ## PSIGNAL_C_FILES
 libposix_a_SOURCES += src/psignal.c src/alarm.c src/kill.c src/killinfo.c \
-    src/pause.c src/psignalclearprocesssignals.c \
+    src/kill_r.c src/pause.c src/psignalclearprocesssignals.c \
     src/psignalsetprocesssignals.c src/psignalchecksignal.c \
     src/psignalclearsignals.c src/psignalunblockthread.c src/pthreadkill.c \
     src/pthreadsigmask.c src/sigaction.c src/sigaddset.c src/sigdelset.c \
diff --git a/cpukit/posix/src/kill.c b/cpukit/posix/src/kill.c
index b601ee1d01..34ea487806 100644
--- a/cpukit/posix/src/kill.c
+++ b/cpukit/posix/src/kill.c
@@ -1,7 +1,7 @@
 /*
  *  3.3.2 Send a Signal to a Process, P1003.1b-1993, p. 68
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -30,22 +30,3 @@ int kill(
   return killinfo( pid, sig, NULL );
 }
 
-/*
- *  _kill_r
- *
- *  This is the Newlib dependent reentrant version of kill().
- */
-
-#if defined(RTEMS_NEWLIB)
-
-#include <reent.h>
-
-int _kill_r(
-  struct _reent *ptr,
-  pid_t          pid,
-  int            sig
-)
-{
-  return kill( pid, sig );
-}
-#endif
diff --git a/cpukit/posix/src/kill_r.c b/cpukit/posix/src/kill_r.c
new file mode 100644
index 0000000000..2da710f799
--- /dev/null
+++ b/cpukit/posix/src/kill_r.c
@@ -0,0 +1,37 @@
+/*
+ *  3.3.2 Send a Signal to a Process, P1003.1b-1993, p. 68
+ *
+ *  COPYRIGHT (c) 1989-2007.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <pthread.h>
+#include <errno.h>
+
+#include <rtems/system.h>
+#include <rtems/posix/pthread.h>
+#include <rtems/posix/psignal.h>
+
+#if defined(RTEMS_NEWLIB)
+
+#include <reent.h>
+
+int _kill_r(
+  struct _reent *ptr,
+  pid_t          pid,
+  int            sig
+)
+{
+  return killinfo( pid, sig, NULL );
+}
+#endif
diff --git a/cpukit/posix/src/killinfo.c b/cpukit/posix/src/killinfo.c
index b275a0b764..bd9ce7a459 100644
--- a/cpukit/posix/src/killinfo.c
+++ b/cpukit/posix/src/killinfo.c
@@ -1,7 +1,7 @@
 /*
  *  kill() support routine
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be