change log for rtems (2010-06-09)
rtems-vc at rtems.org
rtems-vc at rtems.org
Wed Jun 9 10:11:52 UTC 2010
*sh*:
2010-06-09 Sebastian Huber <sebastian.huber at embedded-brains.de>
* libcsupport/src/mount.c: Fixed NULL pointer access.
M 1.2360 cpukit/ChangeLog
M 1.35 cpukit/libcsupport/src/mount.c
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
@@ -1,3 +1,7 @@
+2010-06-09 Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+ * libcsupport/src/mount.c: Fixed NULL pointer access.
+
2010-06-09 Ralf Corsépius <ralf.corsepius at rtems.org>
* Makefile.am, configure.ac: Remove support for shttpd.
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
@@ -93,30 +93,31 @@
}
static rtems_filesystem_mount_table_entry_t *alloc_mount_table_entry(
- const char *source,
- const char *target,
+ const char *source_or_null,
+ const char *target_or_null,
const char *filesystemtype,
size_t *target_length_ptr
)
{
- const char *target_str = target ? target : "/";
+ const char *target = target_or_null != NULL ? target_or_null : "/";
size_t filesystemtype_size = strlen( filesystemtype ) + 1;
- size_t source_size = source ? strlen( source ) + 1 : 0;
- size_t target_length = strlen( target_str );
+ size_t source_size = source_or_null != NULL ?
+ strlen( source_or_null ) + 1 : 0;
+ size_t target_length = strlen( target );
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 );
- if ( mt_entry ) {
+ if ( mt_entry != NULL ) {
char *str = (char *) mt_entry + sizeof( *mt_entry );
mt_entry->type = str;
strcpy( str, filesystemtype );
- if ( source ) {
+ if ( source_or_null != NULL ) {
str += filesystemtype_size;
mt_entry->dev = str;
- strcpy( str, source );
+ strcpy( str, source_or_null );
}
str += source_size;
*sh*:
2010-06-09 Sebastian Huber <sebastian.huber at embedded-brains.de>
* libcsupport/include/rtems/libio.h, sapi/include/confdefs.h: Added
and use defines for file system types.
M 1.2361 cpukit/ChangeLog
M 1.69 cpukit/libcsupport/include/rtems/libio.h
M 1.138 cpukit/sapi/include/confdefs.h
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
@@ -1,5 +1,10 @@
2010-06-09 Sebastian Huber <sebastian.huber at embedded-brains.de>
+ * libcsupport/include/rtems/libio.h, sapi/include/confdefs.h: Added
+ and use defines for file system types.
+
+2010-06-09 Sebastian Huber <sebastian.huber at embedded-brains.de>
+
* libcsupport/src/mount.c: Fixed NULL pointer access.
2010-06-09 Ralf Corsépius <ralf.corsepius at rtems.org>
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
@@ -56,7 +56,7 @@
typedef _off64_t rtems_off64_t;
/**
- * @name File system node types.
+ * @name File System Node Types
*
* @{
*/
@@ -669,6 +669,23 @@
#define rtems_libio_is_valid_perms( _perm ) \
(~ ((~RTEMS_LIBIO_PERMS_RWX) & _perm ))
+/**
+ * @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"
+
+/** @} */
+
/*
* Prototypes for filesystem
*/
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
@@ -285,7 +285,8 @@
*/
#if !defined(CONFIGURE_FILESYSTEM_ENTRY_miniIMFS) && \
defined(CONFIGURE_FILESYSTEM_miniIMFS)
-#define CONFIGURE_FILESYSTEM_ENTRY_miniIMFS { "mimfs", miniIMFS_initialize }
+ #define CONFIGURE_FILESYSTEM_ENTRY_miniIMFS \
+ { RTEMS_FILESYSTEM_TYPE_MINIIMFS, miniIMFS_initialize }
#endif
/**
@@ -294,9 +295,11 @@
#if !defined(CONFIGURE_FILESYSTEM_ENTRY_IMFS) && \
defined(CONFIGURE_FILESYSTEM_IMFS)
#if defined(CONFIGURE_PIPES_ENABLED)
- #define CONFIGURE_FILESYSTEM_ENTRY_IMFS { "imfs", fifoIMFS_initialize }
+ #define CONFIGURE_FILESYSTEM_ENTRY_IMFS \
+ { RTEMS_FILESYSTEM_TYPE_IMFS, fifoIMFS_initialize }
#else
- #define CONFIGURE_FILESYSTEM_ENTRY_IMFS { "imfs", IMFS_initialize }
+ #define CONFIGURE_FILESYSTEM_ENTRY_IMFS \
+ { RTEMS_FILESYSTEM_TYPE_IMFS, IMFS_initialize }
#endif
#endif
@@ -306,7 +309,8 @@
#if !defined(CONFIGURE_FILESYSTEM_ENTRY_DEVFS) && \
defined(CONFIGURE_FILESYSTEM_DEVFS)
#include <rtems/devfs.h>
-#define CONFIGURE_FILESYSTEM_ENTRY_DEVFS { "devfs", devFS_initialize }
+ #define CONFIGURE_FILESYSTEM_ENTRY_DEVFS \
+ { RTEMS_FILESYSTEM_TYPE_DEVFS, devFS_initialize }
#endif
#ifdef RTEMS_NETWORKING
@@ -316,7 +320,8 @@
#if !defined(CONFIGURE_FILESYSTEM_ENTRY_FTPFS) && \
defined(CONFIGURE_FILESYSTEM_FTPFS)
#include <rtems/ftpfs.h>
- #define CONFIGURE_FILESYSTEM_ENTRY_FTPFS { "ftpfs", rtems_ftpfs_initialize }
+ #define CONFIGURE_FILESYSTEM_ENTRY_FTPFS \
+ { RTEMS_FILESYSTEM_TYPE_FTPFS, rtems_ftpfs_initialize }
#endif
/**
@@ -325,7 +330,8 @@
#if !defined(CONFIGURE_FILESYSTEM_ENTRY_TFTPFS) && \
defined(CONFIGURE_FILESYSTEM_TFTPFS)
#include <rtems/tftp.h>
- #define CONFIGURE_FILESYSTEM_ENTRY_TFTPFS { "tftpfs", rtems_tftpfs_initialize }
+ #define CONFIGURE_FILESYSTEM_ENTRY_TFTPFS \
+ { RTEMS_FILESYSTEM_TYPE_TFTPFS, rtems_tftpfs_initialize }
#endif
/**
@@ -334,7 +340,8 @@
#if !defined(CONFIGURE_FILESYSTEM_ENTRY_NFSFS) && \
defined(CONFIGURE_FILESYSTEM_NFSFS)
#include <librtemsNfs.h>
- #define CONFIGURE_FILESYSTEM_ENTRY_NFSFS { "nfs", rtems_nfsfs_initialize }
+ #define CONFIGURE_FILESYSTEM_ENTRY_NFSFS \
+ { RTEMS_FILESYSTEM_TYPE_NFS, rtems_nfsfs_initialize }
#endif
#endif
@@ -344,7 +351,8 @@
#if !defined(CONFIGURE_FILESYSTEM_ENTRY_DOSFS) && \
defined(CONFIGURE_FILESYSTEM_DOSFS)
#include <rtems/dosfs.h>
- #define CONFIGURE_FILESYSTEM_ENTRY_DOSFS { "dosfs", rtems_dosfs_initialize }
+ #define CONFIGURE_FILESYSTEM_ENTRY_DOSFS \
+ { RTEMS_FILESYSTEM_TYPE_DOSFS, rtems_dosfs_initialize }
#endif
/**
@@ -353,7 +361,8 @@
#if !defined(CONFIGURE_FILESYSTEM_ENTRY_RFS) && \
defined(CONFIGURE_FILESYSTEM_RFS)
#include <rtems/rtems-rfs.h>
- #define CONFIGURE_FILESYSTEM_ENTRY_RFS { "rfs", rtems_rfs_rtems_initialise }
+ #define CONFIGURE_FILESYSTEM_ENTRY_RFS \
+ { RTEMS_FILESYSTEM_TYPE_RFS, rtems_rfs_rtems_initialise }
#endif
#ifdef CONFIGURE_INIT
@@ -435,11 +444,11 @@
#ifndef CONFIGURE_HAS_OWN_MOUNT_TABLE
const rtems_filesystem_mount_table_t configuration_mount_table = {
#if defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM)
- "devfs",
+ RTEMS_FILESYSTEM_TYPE_DEVFS,
#elif defined(CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM)
- "mimfs",
+ RTEMS_FILESYSTEM_TYPE_MINIIMFS,
#else /* using IMFS as base filesystem */
- "imfs",
+ RTEMS_FILESYSTEM_TYPE_IMFS,
#endif
RTEMS_FILESYSTEM_READ_WRITE,
NULL,
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100609/f19b2a9b/attachment-0001.html>
More information about the vc
mailing list