Changeset a5bdcd98 in rtems

Timestamp:

04/20/01 13:37:05 (22 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

80526fa

Parents:

53462762

Message:

2001-04-20 Joel Sherrill <joel@…>

• devnull/devnull.c (null_initialize): Added check to ensure that the driver is only initialized once. Otherwise, it will abort when the device /dev/null is present. (null_write): Do not dereference a NULL pointer.

Files:

• c/src/libmisc/ChangeLog (modified) (1 diff)
• c/src/libmisc/devnull/devnull.c (modified) (3 diffs)
• cpukit/libmisc/ChangeLog (modified) (1 diff)
• cpukit/libmisc/devnull/devnull.c (modified) (3 diffs)

c/src/libmisc/ChangeLog

@@ +1 @@
+2001-04-20      Joel Sherrill <joel@OARcorp.com>
+
+        * devnull/devnull.c (null_initialize): Added check to 
+        ensure that the driver is only initialized once.  Otherwise,
+        it will abort when the device /dev/null is present.
+        (null_write): Do not dereference a NULL pointer.
+
 2001-02-06      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

c/src/libmisc/devnull/devnull.c

@@ -33 +33 @@
 
 rtems_unsigned32 NULL_major;
+static initialized;
 
 rtems_device_driver null_initialize(
@@ -40 +41 @@
 )
 {
-  rtems_device_driver status ;
+  rtems_device_driver status;
   
-  status = rtems_io_register_name(
-    "/dev/null",
-    major,
-    (rtems_device_minor_number) 0
+  if ( !initialized ) {
+    initialized = 1;
+
+    status = rtems_io_register_name(
+      "/dev/null",
+      major,
+      (rtems_device_minor_number) 0
     );
 
-  if (status != RTEMS_SUCCESSFUL)
-    rtems_fatal_error_occurred(status);
+    if (status != RTEMS_SUCCESSFUL)
+      rtems_fatal_error_occurred(status);
       
-  NULL_major = major;
+    NULL_major = major;
+  }
   
   return RTEMS_SUCCESSFUL;
@@ -144 +149 @@
 )
 {
-  rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *) pargp ;
+  rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *) pargp;
   
-  rw_args->bytes_moved = rw_args->count ;
+  if ( rw_args )
+    rw_args->bytes_moved = rw_args->count;
   
   return NULL_SUCCESSFUL;

cpukit/libmisc/ChangeLog

@@ +1 @@
+2001-04-20      Joel Sherrill <joel@OARcorp.com>
+
+        * devnull/devnull.c (null_initialize): Added check to 
+        ensure that the driver is only initialized once.  Otherwise,
+        it will abort when the device /dev/null is present.
+        (null_write): Do not dereference a NULL pointer.
+
 2001-02-06      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

cpukit/libmisc/devnull/devnull.c

@@ -33 +33 @@
 
 rtems_unsigned32 NULL_major;
+static initialized;
 
 rtems_device_driver null_initialize(
@@ -40 +41 @@
 )
 {
-  rtems_device_driver status ;
+  rtems_device_driver status;
   
-  status = rtems_io_register_name(
-    "/dev/null",
-    major,
-    (rtems_device_minor_number) 0
+  if ( !initialized ) {
+    initialized = 1;
+
+    status = rtems_io_register_name(
+      "/dev/null",
+      major,
+      (rtems_device_minor_number) 0
     );
 
-  if (status != RTEMS_SUCCESSFUL)
-    rtems_fatal_error_occurred(status);
+    if (status != RTEMS_SUCCESSFUL)
+      rtems_fatal_error_occurred(status);
       
-  NULL_major = major;
+    NULL_major = major;
+  }
   
   return RTEMS_SUCCESSFUL;
@@ -144 +149 @@
 )
 {
-  rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *) pargp ;
+  rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *) pargp;
   
-  rw_args->bytes_moved = rw_args->count ;
+  if ( rw_args )
+    rw_args->bytes_moved = rw_args->count;
   
   return NULL_SUCCESSFUL;