RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Corrected bug where pointer to doubly linked blocks was being incorrectly

Browse Source 
calculated.
This commit is contained in:
Joel Sherrill
1999-03-08 21:39:39 +00:00
parent 3195d9c0a5
commit b10f6e12e0
4 changed files with 136 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
c/src/exec/libfs/src/imfs/memfile.c
View File

@@ -734,6 +734,9 @@ MEMFILE_STATIC int IMFS_memfile_write(
assert( block_ptr ); assert( block_ptr );
if ( !block_ptr ) if ( !block_ptr )
return copied; return copied;
#if 0
printf( "write %d at %d in %d: %*s\n", to_copy, start_offset, block, to_copy, src );
#endif
memcpy( &(*block_ptr)[ start_offset ], src, to_copy ); memcpy( &(*block_ptr)[ start_offset ], src, to_copy );
src += to_copy; src += to_copy;
block++; block++;
@@ -751,6 +754,9 @@ MEMFILE_STATIC int IMFS_memfile_write(
assert( block_ptr ); assert( block_ptr );
if ( !block_ptr ) if ( !block_ptr )
return copied; return copied;
#if 0
printf( "write %d in %d: %*s\n", to_copy, block, to_copy, src );
#endif
memcpy( &(*block_ptr)[ 0 ], src, to_copy ); memcpy( &(*block_ptr)[ 0 ], src, to_copy );
src += to_copy; src += to_copy;
block++; block++;
@@ -770,6 +776,9 @@ MEMFILE_STATIC int IMFS_memfile_write(
assert( block_ptr ); assert( block_ptr );
if ( !block_ptr ) if ( !block_ptr )
return copied; return copied;
#if 0
printf( "write %d in %d: %*s\n", to_copy, block, to_copy, src );
#endif
memcpy( &(*block_ptr)[ 0 ], src, my_length ); memcpy( &(*block_ptr)[ 0 ], src, my_length );
my_length = 0; my_length = 0;
copied += to_copy; copied += to_copy;
@@ -788,11 +797,34 @@ MEMFILE_STATIC int IMFS_memfile_write(
* TRUE, then the block is allocated. Otherwise, it is an error. * TRUE, then the block is allocated. Otherwise, it is an error.
*/ */
#if 0
block_p *IMFS_memfile_get_block_pointer_DEBUG(
IMFS_jnode_t *the_jnode,
unsigned int block,
int malloc_it
);
block_p *IMFS_memfile_get_block_pointer( block_p *IMFS_memfile_get_block_pointer(
IMFS_jnode_t *the_jnode, IMFS_jnode_t *the_jnode,
unsigned int block, unsigned int block,
int malloc_it int malloc_it
) )
{
block_p *p;
p = IMFS_memfile_get_block_pointer_DEBUG( the_jnode, block, malloc_it );
printf( "(%d -> %p) ", block, p );
return p;
}
block_p *IMFS_memfile_get_block_pointer_DEBUG(
#else
block_p *IMFS_memfile_get_block_pointer(
#endif
IMFS_jnode_t *the_jnode,
unsigned int block,
int malloc_it
)
{ {
unsigned int my_block; unsigned int my_block;
IMFS_memfile_t *info; IMFS_memfile_t *info;
@@ -880,7 +912,7 @@ fflush(stdout);
p[ doubly ] = (block_p) p1; p[ doubly ] = (block_p) p1;
} }
return (block_p *)&p[ singly ]; return (block_p *)&p1[ singly ];
} }
if ( !p ) if ( !p )
@@ -987,7 +1019,7 @@ void *memfile_alloc_block(void)
} }
/* /*
* memfile_free_blocK * memfile_free_block
* *
* Free a block from an in-memory file. * Free a block from an in-memory file.
*/ */

36
c/src/lib/libc/memfile.c
View File

@@ -734,6 +734,9 @@ MEMFILE_STATIC int IMFS_memfile_write(
assert( block_ptr ); assert( block_ptr );
if ( !block_ptr ) if ( !block_ptr )
return copied; return copied;
#if 0
printf( "write %d at %d in %d: %*s\n", to_copy, start_offset, block, to_copy, src );
#endif
memcpy( &(*block_ptr)[ start_offset ], src, to_copy ); memcpy( &(*block_ptr)[ start_offset ], src, to_copy );
src += to_copy; src += to_copy;
block++; block++;
@@ -751,6 +754,9 @@ MEMFILE_STATIC int IMFS_memfile_write(
assert( block_ptr ); assert( block_ptr );
if ( !block_ptr ) if ( !block_ptr )
return copied; return copied;
#if 0
printf( "write %d in %d: %*s\n", to_copy, block, to_copy, src );
#endif
memcpy( &(*block_ptr)[ 0 ], src, to_copy ); memcpy( &(*block_ptr)[ 0 ], src, to_copy );
src += to_copy; src += to_copy;
block++; block++;
@@ -770,6 +776,9 @@ MEMFILE_STATIC int IMFS_memfile_write(
assert( block_ptr ); assert( block_ptr );
if ( !block_ptr ) if ( !block_ptr )
return copied; return copied;
#if 0
printf( "write %d in %d: %*s\n", to_copy, block, to_copy, src );
#endif
memcpy( &(*block_ptr)[ 0 ], src, my_length ); memcpy( &(*block_ptr)[ 0 ], src, my_length );
my_length = 0; my_length = 0;
copied += to_copy; copied += to_copy;
@@ -788,11 +797,34 @@ MEMFILE_STATIC int IMFS_memfile_write(
* TRUE, then the block is allocated. Otherwise, it is an error. * TRUE, then the block is allocated. Otherwise, it is an error.
*/ */
#if 0
block_p *IMFS_memfile_get_block_pointer_DEBUG(
IMFS_jnode_t *the_jnode,
unsigned int block,
int malloc_it
);
block_p *IMFS_memfile_get_block_pointer( block_p *IMFS_memfile_get_block_pointer(
IMFS_jnode_t *the_jnode, IMFS_jnode_t *the_jnode,
unsigned int block, unsigned int block,
int malloc_it int malloc_it
) )
{
block_p *p;
p = IMFS_memfile_get_block_pointer_DEBUG( the_jnode, block, malloc_it );
printf( "(%d -> %p) ", block, p );
return p;
}
block_p *IMFS_memfile_get_block_pointer_DEBUG(
#else
block_p *IMFS_memfile_get_block_pointer(
#endif
IMFS_jnode_t *the_jnode,
unsigned int block,
int malloc_it
)
{ {
unsigned int my_block; unsigned int my_block;
IMFS_memfile_t *info; IMFS_memfile_t *info;
@@ -880,7 +912,7 @@ fflush(stdout);
p[ doubly ] = (block_p) p1; p[ doubly ] = (block_p) p1;
} }
return (block_p *)&p[ singly ]; return (block_p *)&p1[ singly ];
} }
if ( !p ) if ( !p )
@@ -987,7 +1019,7 @@ void *memfile_alloc_block(void)
} }
/* /*
* memfile_free_blocK * memfile_free_block
* *
* Free a block from an in-memory file. * Free a block from an in-memory file.
*/ */

36
c/src/libfs/src/imfs/memfile.c
View File

@@ -734,6 +734,9 @@ MEMFILE_STATIC int IMFS_memfile_write(
assert( block_ptr ); assert( block_ptr );
if ( !block_ptr ) if ( !block_ptr )
return copied; return copied;
#if 0
printf( "write %d at %d in %d: %*s\n", to_copy, start_offset, block, to_copy, src );
#endif
memcpy( &(*block_ptr)[ start_offset ], src, to_copy ); memcpy( &(*block_ptr)[ start_offset ], src, to_copy );
src += to_copy; src += to_copy;
block++; block++;
@@ -751,6 +754,9 @@ MEMFILE_STATIC int IMFS_memfile_write(
assert( block_ptr ); assert( block_ptr );
if ( !block_ptr ) if ( !block_ptr )
return copied; return copied;
#if 0
printf( "write %d in %d: %*s\n", to_copy, block, to_copy, src );
#endif
memcpy( &(*block_ptr)[ 0 ], src, to_copy ); memcpy( &(*block_ptr)[ 0 ], src, to_copy );
src += to_copy; src += to_copy;
block++; block++;
@@ -770,6 +776,9 @@ MEMFILE_STATIC int IMFS_memfile_write(
assert( block_ptr ); assert( block_ptr );
if ( !block_ptr ) if ( !block_ptr )
return copied; return copied;
#if 0
printf( "write %d in %d: %*s\n", to_copy, block, to_copy, src );
#endif
memcpy( &(*block_ptr)[ 0 ], src, my_length ); memcpy( &(*block_ptr)[ 0 ], src, my_length );
my_length = 0; my_length = 0;
copied += to_copy; copied += to_copy;
@@ -788,11 +797,34 @@ MEMFILE_STATIC int IMFS_memfile_write(
* TRUE, then the block is allocated. Otherwise, it is an error. * TRUE, then the block is allocated. Otherwise, it is an error.
*/ */
#if 0
block_p *IMFS_memfile_get_block_pointer_DEBUG(
IMFS_jnode_t *the_jnode,
unsigned int block,
int malloc_it
);
block_p *IMFS_memfile_get_block_pointer( block_p *IMFS_memfile_get_block_pointer(
IMFS_jnode_t *the_jnode, IMFS_jnode_t *the_jnode,
unsigned int block, unsigned int block,
int malloc_it int malloc_it
) )
{
block_p *p;
p = IMFS_memfile_get_block_pointer_DEBUG( the_jnode, block, malloc_it );
printf( "(%d -> %p) ", block, p );
return p;
}
block_p *IMFS_memfile_get_block_pointer_DEBUG(
#else
block_p *IMFS_memfile_get_block_pointer(
#endif
IMFS_jnode_t *the_jnode,
unsigned int block,
int malloc_it
)
{ {
unsigned int my_block; unsigned int my_block;
IMFS_memfile_t *info; IMFS_memfile_t *info;
@@ -880,7 +912,7 @@ fflush(stdout);
p[ doubly ] = (block_p) p1; p[ doubly ] = (block_p) p1;
} }
return (block_p *)&p[ singly ]; return (block_p *)&p1[ singly ];
} }
if ( !p ) if ( !p )
@@ -987,7 +1019,7 @@ void *memfile_alloc_block(void)
} }
/* /*
* memfile_free_blocK * memfile_free_block
* *
* Free a block from an in-memory file. * Free a block from an in-memory file.
*/ */

36
cpukit/libfs/src/imfs/memfile.c
View File

@@ -734,6 +734,9 @@ MEMFILE_STATIC int IMFS_memfile_write(
assert( block_ptr ); assert( block_ptr );
if ( !block_ptr ) if ( !block_ptr )
return copied; return copied;
#if 0
printf( "write %d at %d in %d: %*s\n", to_copy, start_offset, block, to_copy, src );
#endif
memcpy( &(*block_ptr)[ start_offset ], src, to_copy ); memcpy( &(*block_ptr)[ start_offset ], src, to_copy );
src += to_copy; src += to_copy;
block++; block++;
@@ -751,6 +754,9 @@ MEMFILE_STATIC int IMFS_memfile_write(
assert( block_ptr ); assert( block_ptr );
if ( !block_ptr ) if ( !block_ptr )
return copied; return copied;
#if 0
printf( "write %d in %d: %*s\n", to_copy, block, to_copy, src );
#endif
memcpy( &(*block_ptr)[ 0 ], src, to_copy ); memcpy( &(*block_ptr)[ 0 ], src, to_copy );
src += to_copy; src += to_copy;
block++; block++;
@@ -770,6 +776,9 @@ MEMFILE_STATIC int IMFS_memfile_write(
assert( block_ptr ); assert( block_ptr );
if ( !block_ptr ) if ( !block_ptr )
return copied; return copied;
#if 0
printf( "write %d in %d: %*s\n", to_copy, block, to_copy, src );
#endif
memcpy( &(*block_ptr)[ 0 ], src, my_length ); memcpy( &(*block_ptr)[ 0 ], src, my_length );
my_length = 0; my_length = 0;
copied += to_copy; copied += to_copy;
@@ -788,11 +797,34 @@ MEMFILE_STATIC int IMFS_memfile_write(
* TRUE, then the block is allocated. Otherwise, it is an error. * TRUE, then the block is allocated. Otherwise, it is an error.
*/ */
#if 0
block_p *IMFS_memfile_get_block_pointer_DEBUG(
IMFS_jnode_t *the_jnode,
unsigned int block,
int malloc_it
);
block_p *IMFS_memfile_get_block_pointer( block_p *IMFS_memfile_get_block_pointer(
IMFS_jnode_t *the_jnode, IMFS_jnode_t *the_jnode,
unsigned int block, unsigned int block,
int malloc_it int malloc_it
) )
{
block_p *p;
p = IMFS_memfile_get_block_pointer_DEBUG( the_jnode, block, malloc_it );
printf( "(%d -> %p) ", block, p );
return p;
}
block_p *IMFS_memfile_get_block_pointer_DEBUG(
#else
block_p *IMFS_memfile_get_block_pointer(
#endif
IMFS_jnode_t *the_jnode,
unsigned int block,
int malloc_it
)
{ {
unsigned int my_block; unsigned int my_block;
IMFS_memfile_t *info; IMFS_memfile_t *info;
@@ -880,7 +912,7 @@ fflush(stdout);
p[ doubly ] = (block_p) p1; p[ doubly ] = (block_p) p1;
} }
return (block_p *)&p[ singly ]; return (block_p *)&p1[ singly ];
} }
if ( !p ) if ( !p )
@@ -987,7 +1019,7 @@ void *memfile_alloc_block(void)
} }
/* /*
* memfile_free_blocK * memfile_free_block
* *
* Free a block from an in-memory file. * Free a block from an in-memory file.
*/ */