Changeset cfc43898 in rtems

Timestamp:

05/21/04 20:16:39 (19 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Children:

01c96bfb

Parents:

0732eb4

Message:

2004-05-21 Joel Sherrill <joel@…>

PR 628/rtems

• src/killinfo.c, src/pthreadkill.c, src/ptimer1.c, src/sigaction.c, src/sigaddset.c, src/sigsuspend.c: Signal set of 0 is supposed to return EINVAL. In addition timer_create needed to return an error if the clock was not CLOCK_REALTIME.

Location:

cpukit/posix

Files:

• ChangeLog (modified) (1 diff)
• src/killinfo.c (modified) (2 diffs)
• src/pthreadkill.c (modified) (1 diff)
• src/ptimer1.c (modified) (2 diffs)
• src/sigaction.c (modified) (1 diff)
• src/sigaddset.c (modified) (1 diff)
• src/sigsuspend.c (modified) (3 diffs)

cpukit/posix/ChangeLog

@@ +1 @@
+2004-05-21  Joel Sherrill <joel@OARcorp.com>
+
+        PR 628/rtems
+        * src/killinfo.c, src/pthreadkill.c, src/ptimer1.c, src/sigaction.c,
+        src/sigaddset.c, src/sigsuspend.c: Signal set of 0 is supposed to
+        return EINVAL.  In addition timer_create needed to return an error
+        if the clock was not CLOCK_REALTIME.
+
 2004-05-21  Joel Sherrill <joel@OARcorp.com>
 

cpukit/posix/src/killinfo.c

@@ -67 +67 @@
 
   /*
-   *  Validate the signal passed if not 0.
+   *  Validate the signal passed.
    */
  
-  if ( sig && !is_valid_signo(sig) ) {
+  if ( !sig )
     rtems_set_errno_and_return_minus_one( EINVAL );
+
+  if ( !is_valid_signo(sig) ) {
+    rtems_set_errno_and_return_minus_one( EINVAL );
   }
 
@@ -78 +81 @@
    */
 
-  if ( !sig || _POSIX_signals_Vectors[ sig ].sa_handler == SIG_IGN ) {
+  if ( _POSIX_signals_Vectors[ sig ].sa_handler == SIG_IGN ) {
     return 0;
   }

cpukit/posix/src/pthreadkill.c

@@ -35 +35 @@
   Objects_Locations  location;
 
-  if ( sig && !is_valid_signo(sig) )
+  if ( !sig )
+    rtems_set_errno_and_return_minus_one( EINVAL );
+
+  if ( !is_valid_signo(sig) )
     rtems_set_errno_and_return_minus_one( EINVAL );
 

cpukit/posix/src/ptimer1.c

@@ -272 +272 @@
   int               timer_pos; /* Position in the table of timers  */
 
+  if ( clock_id != CLOCK_REALTIME )
+    rtems_set_errno_and_return_minus_one( EINVAL );
+
  /* 
   *  The data of the structure evp are checked in order to verify if they
@@ -284 +287 @@
        rtems_set_errno_and_return_minus_one( EINVAL );
      }
-  }
- 
- /*
-  *  A timer is created using the primitive rtems_timer_create
-  */
+
+     if ( !evp->sigev_signo )
+       rtems_set_errno_and_return_minus_one( EINVAL );
+
+     if ( !is_valid_signo(evp->sigev_signo) )
+       rtems_set_errno_and_return_minus_one( EINVAL );
+  }
+ 
+  /*
+   *  A timer is created using the primitive rtems_timer_create
+   */
 
   return_v = rtems_timer_create ( clock_id, &timer_id );

cpukit/posix/src/sigaction.c

@@ -44 +44 @@
 
   if ( !sig )
-    return 0;
+    rtems_set_errno_and_return_minus_one( EINVAL );
 
   if ( !is_valid_signo(sig) )

cpukit/posix/src/sigaddset.c

@@ -33 +33 @@
 
   if ( !signo )
-    return 0;
+    rtems_set_errno_and_return_minus_one( EINVAL );
 
   if ( !is_valid_signo(signo) )

cpukit/posix/src/sigsuspend.c

@@ -2 +2 @@
  *  3.3.7 Wait for a Signal, P1003.1b-1993, p. 75
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2004.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -22 +22 @@
 #include <rtems/posix/pthread.h>
 #include <rtems/posix/psignal.h>
+#include <rtems/seterr.h>
 
 int sigsuspend(
@@ -42 +43 @@
   (void) sigprocmask( SIG_SETMASK, &saved_signals_blocked, NULL );
 
+  /*
+   * sigtimedwait() returns the signal number while sigsuspend()
+   * is supposed to return -1 and EINTR when a signal is caught.
+   */
+  if ( status != -1 )
+    rtems_set_errno_and_return_minus_one( EINTR );
+
   return status;
 }