Changeset d4548d1 in rtems for c/src/exec/posix/src/mqueuecreatesupp.c

Timestamp:

12/23/99 22:07:11 (24 years ago)

Author:

Jennifer Averett <Jennifer.Averett@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

96d4aea

Parents:

e1786ee3

Message:

+ Made work
+ Added checks for valid attribute maxmsg and msgsize
+ Added check for ENAMETOOLONG

File:

• c/src/exec/posix/src/mqueuecreatesupp.c (modified) (5 diffs)

c/src/exec/posix/src/mqueuecreatesupp.c

@@ -38 +38 @@
   int                            pshared,
   unsigned int                   oflag,
-  struct mq_attr                *attr,
+  struct mq_attr                *attr_ptr,
   POSIX_Message_queue_Control  **message_queue
 )
 {
   POSIX_Message_queue_Control   *the_mq;
- 
+  CORE_message_queue_Attributes *the_mq_attr;
+  struct mq_attr                 attr;
+
   _Thread_Disable_dispatch();
  
-  the_mq = _POSIX_Message_queue_Allocate();
- 
-  if ( !the_mq ) {
-    _Thread_Enable_dispatch();
-    set_errno_and_return_minus_one( ENFILE );
+  if ( attr_ptr == NULL ) {
+    attr.mq_maxmsg  = 0;  /* XXX */
+    attr.mq_msgsize = 0;  /* XXX */
+  } else {
+    if ( attr_ptr->mq_maxmsg < 0 ){
+      _Thread_Enable_dispatch();
+      set_errno_and_return_minus_one( EINVAL );
+    }
+
+    if ( attr_ptr->mq_msgsize < 0 ){
+      _Thread_Enable_dispatch();
+      set_errno_and_return_minus_one( EINVAL );
+    }
+
+    attr = *attr_ptr;
   }
- 
+
 #if defined(RTEMS_MULTIPROCESSING)
   if ( pshared == PTHREAD_PROCESS_SHARED &&
@@ -63 +75 @@
 #endif
  
+  if ( name ) {
+
+    if( strlen(name) > PATH_MAX ) {  /* XXX - Is strlen ok to use here ? */
+      _Thread_Enable_dispatch();
+      set_errno_and_return_minus_one( ENAMETOOLONG );
+    }
+
+    /*
+     * XXX Greater than NAME_MAX while POSIX_NO_TRUNC in effect.
+     * XXX Error description in POSIX book different for mq_open and mq_unlink
+     *     Why???
+     */
+  }
+
+  the_mq = _POSIX_Message_queue_Allocate();
+  if ( !the_mq ) {
+    _Thread_Enable_dispatch();
+    set_errno_and_return_minus_one( ENFILE );
+  }
+ 
   the_mq->process_shared  = pshared;
  
@@ -69 +101 @@
     the_mq->open_count = 1;
     the_mq->linked = TRUE;
+ }
+  else {
+    the_mq->named = FALSE;
+
   }
-  else
-    the_mq->named = FALSE;
- 
+
   if ( oflag & O_NONBLOCK ) 
     the_mq->blocking = FALSE;
@@ -91 +125 @@
   the_mq_attr->waiting_discipline = CORE_MESSAGE_QUEUE_DISCIPLINES_FIFO;
  */
+   
 
   the_mq->Message_queue.Attributes.discipline =
                                          CORE_MESSAGE_QUEUE_DISCIPLINES_FIFO;
- 
+  the_mq_attr = &the_mq->Message_queue.Attributes;
+
   if ( ! _CORE_message_queue_Initialize(
            &the_mq->Message_queue,
            OBJECTS_POSIX_MESSAGE_QUEUES,
-           &the_mq->Message_queue.Attributes,
-           attr->mq_maxmsg,
-           attr->mq_msgsize,
+           the_mq_attr,
+           attr.mq_maxmsg,
+           attr.mq_msgsize,
 #if defined(RTEMS_MULTIPROCESSING)
            _POSIX_Message_queue_MP_Send_extract_proxy
@@ -142 +178 @@
 }
 
+
+
+
+