<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2010-06-09)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-09 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libcsupport/src/mount.c: Fixed NULL pointer access.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2359&r2=text&tr2=1.2360&diff_format=h">M</a></td><td width='1%'>1.2360</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libcsupport/src/mount.c.diff?r1=text&tr1=1.34&r2=text&tr2=1.35&diff_format=h">M</a></td><td width='1%'>1.35</td><td width='100%'>cpukit/libcsupport/src/mount.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2359 rtems/cpukit/ChangeLog:1.2360
--- rtems/cpukit/ChangeLog:1.2359 Wed Jun 9 03:06:25 2010
+++ rtems/cpukit/ChangeLog Wed Jun 9 04:15:49 2010
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2010-06-09 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * libcsupport/src/mount.c: Fixed NULL pointer access.
+
</font> 2010-06-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am, configure.ac: Remove support for shttpd.
<font color='#006600'>diff -u rtems/cpukit/libcsupport/src/mount.c:1.34 rtems/cpukit/libcsupport/src/mount.c:1.35
--- rtems/cpukit/libcsupport/src/mount.c:1.34 Mon Jun 7 10:35:24 2010
+++ rtems/cpukit/libcsupport/src/mount.c Wed Jun 9 04:15:50 2010
</font><font color='#997700'>@@ -93,30 +93,31 @@
</font> }
static rtems_filesystem_mount_table_entry_t *alloc_mount_table_entry(
<font color='#880000'>- const char *source,
- const char *target,
</font><font color='#000088'>+ const char *source_or_null,
+ const char *target_or_null,
</font> const char *filesystemtype,
size_t *target_length_ptr
)
{
<font color='#880000'>- const char *target_str = target ? target : "/";
</font><font color='#000088'>+ const char *target = target_or_null != NULL ? target_or_null : "/";
</font> size_t filesystemtype_size = strlen( filesystemtype ) + 1;
<font color='#880000'>- size_t source_size = source ? strlen( source ) + 1 : 0;
- size_t target_length = strlen( target_str );
</font><font color='#000088'>+ size_t source_size = source_or_null != NULL ?
+ strlen( source_or_null ) + 1 : 0;
+ size_t target_length = strlen( target );
</font> size_t size = sizeof( rtems_filesystem_mount_table_entry_t )
+ filesystemtype_size + source_size + target_length + 1;
rtems_filesystem_mount_table_entry_t *mt_entry = calloc( 1, size );
<font color='#880000'>- if ( mt_entry ) {
</font><font color='#000088'>+ if ( mt_entry != NULL ) {
</font> char *str = (char *) mt_entry + sizeof( *mt_entry );
mt_entry->type = str;
strcpy( str, filesystemtype );
<font color='#880000'>- if ( source ) {
</font><font color='#000088'>+ if ( source_or_null != NULL ) {
</font> str += filesystemtype_size;
mt_entry->dev = str;
<font color='#880000'>- strcpy( str, source );
</font><font color='#000088'>+ strcpy( str, source_or_null );
</font> }
str += source_size;
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-09 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libcsupport/include/rtems/libio.h, sapi/include/confdefs.h: Added
and use defines for file system types.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2360&r2=text&tr2=1.2361&diff_format=h">M</a></td><td width='1%'>1.2361</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libcsupport/include/rtems/libio.h.diff?r1=text&tr1=1.68&r2=text&tr2=1.69&diff_format=h">M</a></td><td width='1%'>1.69</td><td width='100%'>cpukit/libcsupport/include/rtems/libio.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/sapi/include/confdefs.h.diff?r1=text&tr1=1.137&r2=text&tr2=1.138&diff_format=h">M</a></td><td width='1%'>1.138</td><td width='100%'>cpukit/sapi/include/confdefs.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2360 rtems/cpukit/ChangeLog:1.2361
--- rtems/cpukit/ChangeLog:1.2360 Wed Jun 9 04:15:49 2010
+++ rtems/cpukit/ChangeLog Wed Jun 9 04:38:09 2010
</font><font color='#997700'>@@ -1,5 +1,10 @@
</font> 2010-06-09 Sebastian Huber <sebastian.huber@embedded-brains.de>
<font color='#000088'>+ * libcsupport/include/rtems/libio.h, sapi/include/confdefs.h: Added
+ and use defines for file system types.
+
+2010-06-09 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
</font> * libcsupport/src/mount.c: Fixed NULL pointer access.
2010-06-09 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#006600'>diff -u rtems/cpukit/libcsupport/include/rtems/libio.h:1.68 rtems/cpukit/libcsupport/include/rtems/libio.h:1.69
--- rtems/cpukit/libcsupport/include/rtems/libio.h:1.68 Tue Jun 8 10:40:00 2010
+++ rtems/cpukit/libcsupport/include/rtems/libio.h Wed Jun 9 04:38:09 2010
</font><font color='#997700'>@@ -56,7 +56,7 @@
</font> typedef _off64_t rtems_off64_t;
/**
<font color='#880000'>- * @name File system node types.
</font><font color='#000088'>+ * @name File System Node Types
</font> *
* @{
*/
<font color='#997700'>@@ -669,6 +669,23 @@
</font> #define rtems_libio_is_valid_perms( _perm ) \
(~ ((~RTEMS_LIBIO_PERMS_RWX) & _perm ))
<font color='#000088'>+/**
+ * @name File System Types
+ *
+ * @{
+ */
+
+#define RTEMS_FILESYSTEM_TYPE_IMFS "imfs"
+#define RTEMS_FILESYSTEM_TYPE_MINIIMFS "mimfs"
+#define RTEMS_FILESYSTEM_TYPE_DEVFS "devfs"
+#define RTEMS_FILESYSTEM_TYPE_FTPFS "ftpfs"
+#define RTEMS_FILESYSTEM_TYPE_TFTPFS "tftpfs"
+#define RTEMS_FILESYSTEM_TYPE_NFS "nfs"
+#define RTEMS_FILESYSTEM_TYPE_DOSFS "dosfs"
+#define RTEMS_FILESYSTEM_TYPE_RFS "rfs"
+
+/** @} */
+
</font> /*
* Prototypes for filesystem
*/
<font color='#006600'>diff -u rtems/cpukit/sapi/include/confdefs.h:1.137 rtems/cpukit/sapi/include/confdefs.h:1.138
--- rtems/cpukit/sapi/include/confdefs.h:1.137 Tue Jun 8 05:25:46 2010
+++ rtems/cpukit/sapi/include/confdefs.h Wed Jun 9 04:38:10 2010
</font><font color='#997700'>@@ -285,7 +285,8 @@
</font> */<span style="background-color: #FF0000"> </span>
#if !defined(CONFIGURE_FILESYSTEM_ENTRY_miniIMFS) && \
defined(CONFIGURE_FILESYSTEM_miniIMFS)
<font color='#880000'>-#define CONFIGURE_FILESYSTEM_ENTRY_miniIMFS { "mimfs", miniIMFS_initialize }
</font><font color='#000088'>+ #define CONFIGURE_FILESYSTEM_ENTRY_miniIMFS \
+ { RTEMS_FILESYSTEM_TYPE_MINIIMFS, miniIMFS_initialize }
</font> #endif
/**
<font color='#997700'>@@ -294,9 +295,11 @@
</font> #if !defined(CONFIGURE_FILESYSTEM_ENTRY_IMFS) && \
defined(CONFIGURE_FILESYSTEM_IMFS)
#if defined(CONFIGURE_PIPES_ENABLED)
<font color='#880000'>- #define CONFIGURE_FILESYSTEM_ENTRY_IMFS { "imfs", fifoIMFS_initialize }
</font><font color='#000088'>+ #define CONFIGURE_FILESYSTEM_ENTRY_IMFS \
+ { RTEMS_FILESYSTEM_TYPE_IMFS, fifoIMFS_initialize }
</font> #else
<font color='#880000'>- #define CONFIGURE_FILESYSTEM_ENTRY_IMFS { "imfs", IMFS_initialize }
</font><font color='#000088'>+ #define CONFIGURE_FILESYSTEM_ENTRY_IMFS \
+ { RTEMS_FILESYSTEM_TYPE_IMFS, IMFS_initialize }
</font> #endif
#endif
<font color='#997700'>@@ -306,7 +309,8 @@
</font> #if !defined(CONFIGURE_FILESYSTEM_ENTRY_DEVFS) && \
defined(CONFIGURE_FILESYSTEM_DEVFS)
#include <rtems/devfs.h>
<font color='#880000'>-#define CONFIGURE_FILESYSTEM_ENTRY_DEVFS { "devfs", devFS_initialize }
</font><font color='#000088'>+ #define CONFIGURE_FILESYSTEM_ENTRY_DEVFS \
+ { RTEMS_FILESYSTEM_TYPE_DEVFS, devFS_initialize }
</font> #endif
#ifdef RTEMS_NETWORKING
<font color='#997700'>@@ -316,7 +320,8 @@
</font> #if !defined(CONFIGURE_FILESYSTEM_ENTRY_FTPFS) && \
defined(CONFIGURE_FILESYSTEM_FTPFS)<span style="background-color: #FF0000"> </span>
#include <rtems/ftpfs.h>
<font color='#880000'>- #define CONFIGURE_FILESYSTEM_ENTRY_FTPFS { "ftpfs", rtems_ftpfs_initialize }
</font><font color='#000088'>+ #define CONFIGURE_FILESYSTEM_ENTRY_FTPFS \
+ { RTEMS_FILESYSTEM_TYPE_FTPFS, rtems_ftpfs_initialize }
</font> #endif
/**
<font color='#997700'>@@ -325,7 +330,8 @@
</font> #if !defined(CONFIGURE_FILESYSTEM_ENTRY_TFTPFS) && \
defined(CONFIGURE_FILESYSTEM_TFTPFS)
#include <rtems/tftp.h>
<font color='#880000'>- #define CONFIGURE_FILESYSTEM_ENTRY_TFTPFS { "tftpfs", rtems_tftpfs_initialize }
</font><font color='#000088'>+ #define CONFIGURE_FILESYSTEM_ENTRY_TFTPFS \
+ { RTEMS_FILESYSTEM_TYPE_TFTPFS, rtems_tftpfs_initialize }
</font> #endif
/**
<font color='#997700'>@@ -334,7 +340,8 @@
</font> #if !defined(CONFIGURE_FILESYSTEM_ENTRY_NFSFS) && \
defined(CONFIGURE_FILESYSTEM_NFSFS)
#include <librtemsNfs.h>
<font color='#880000'>- #define CONFIGURE_FILESYSTEM_ENTRY_NFSFS { "nfs", rtems_nfsfs_initialize }
</font><font color='#000088'>+ #define CONFIGURE_FILESYSTEM_ENTRY_NFSFS \
+ { RTEMS_FILESYSTEM_TYPE_NFS, rtems_nfsfs_initialize }
</font> #endif
#endif
<font color='#997700'>@@ -344,7 +351,8 @@
</font> #if !defined(CONFIGURE_FILESYSTEM_ENTRY_DOSFS) && \
defined(CONFIGURE_FILESYSTEM_DOSFS)
#include <rtems/dosfs.h>
<font color='#880000'>- #define CONFIGURE_FILESYSTEM_ENTRY_DOSFS { "dosfs", rtems_dosfs_initialize }
</font><font color='#000088'>+ #define CONFIGURE_FILESYSTEM_ENTRY_DOSFS \
+ { RTEMS_FILESYSTEM_TYPE_DOSFS, rtems_dosfs_initialize }
</font> #endif
/**
<font color='#997700'>@@ -353,7 +361,8 @@
</font> #if !defined(CONFIGURE_FILESYSTEM_ENTRY_RFS) && \
defined(CONFIGURE_FILESYSTEM_RFS)
#include <rtems/rtems-rfs.h>
<font color='#880000'>- #define CONFIGURE_FILESYSTEM_ENTRY_RFS { "rfs", rtems_rfs_rtems_initialise }
</font><font color='#000088'>+ #define CONFIGURE_FILESYSTEM_ENTRY_RFS \
+ { RTEMS_FILESYSTEM_TYPE_RFS, rtems_rfs_rtems_initialise }
</font> #endif
#ifdef CONFIGURE_INIT
<font color='#997700'>@@ -435,11 +444,11 @@
</font> #ifndef CONFIGURE_HAS_OWN_MOUNT_TABLE
const rtems_filesystem_mount_table_t configuration_mount_table = {
#if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
<font color='#880000'>- "devfs",
</font><font color='#000088'>+ RTEMS_FILESYSTEM_TYPE_DEVFS,
</font> #elif defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM)
<font color='#880000'>- "mimfs",
</font><font color='#000088'>+ RTEMS_FILESYSTEM_TYPE_MINIIMFS,
</font> #else /* using IMFS as base filesystem */
<font color='#880000'>- "imfs",
</font><font color='#000088'>+ RTEMS_FILESYSTEM_TYPE_IMFS,
</font> #endif
RTEMS_FILESYSTEM_READ_WRITE,
NULL,
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>