![[RTEMS Logo]](/images/logo.png){kind=logo}
Changeset b2709481 in rtems
- Timestamp:
- 01/04/02 18:30:58 (21 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- f8a913da
- Parents:
- a02224e
- Files:
-
- 51 edited
-
c/src/exec/libfs/ChangeLog (modified) (1 diff)
-
c/src/exec/libfs/src/imfs/imfs.h (modified) (1 diff)
-
c/src/exec/libfs/src/imfs/imfs_chown.c (modified) (2 diffs)
-
c/src/exec/libfs/src/imfs/imfs_directory.c (modified) (5 diffs)
-
c/src/exec/libfs/src/imfs/imfs_eval.c (modified) (23 diffs)
-
c/src/exec/libfs/src/imfs/imfs_fchmod.c (modified) (3 diffs)
-
c/src/exec/libfs/src/imfs/imfs_link.c (modified) (3 diffs)
-
c/src/exec/libfs/src/imfs/imfs_mknod.c (modified) (3 diffs)
-
c/src/exec/libfs/src/imfs/imfs_mount.c (modified) (2 diffs)
-
c/src/exec/libfs/src/imfs/imfs_readlink.c (modified) (2 diffs)
-
c/src/exec/libfs/src/imfs/imfs_stat.c (modified) (2 diffs)
-
c/src/exec/libfs/src/imfs/imfs_symlink.c (modified) (2 diffs)
-
c/src/exec/libfs/src/imfs/imfs_unlink.c (modified) (2 diffs)
-
c/src/exec/libfs/src/imfs/imfs_unmount.c (modified) (3 diffs)
-
c/src/exec/libfs/src/imfs/ioman.c (modified) (2 diffs)
-
c/src/exec/libfs/src/imfs/linearfile.c (modified) (3 diffs)
-
c/src/exec/libfs/src/imfs/memfile.c (modified) (14 diffs)
-
c/src/libfs/ChangeLog (modified) (1 diff)
-
c/src/libfs/src/imfs/imfs.h (modified) (1 diff)
-
c/src/libfs/src/imfs/imfs_chown.c (modified) (2 diffs)
-
c/src/libfs/src/imfs/imfs_directory.c (modified) (5 diffs)
-
c/src/libfs/src/imfs/imfs_eval.c (modified) (23 diffs)
-
c/src/libfs/src/imfs/imfs_fchmod.c (modified) (3 diffs)
-
c/src/libfs/src/imfs/imfs_link.c (modified) (3 diffs)
-
c/src/libfs/src/imfs/imfs_mknod.c (modified) (3 diffs)
-
c/src/libfs/src/imfs/imfs_mount.c (modified) (2 diffs)
-
c/src/libfs/src/imfs/imfs_readlink.c (modified) (2 diffs)
-
c/src/libfs/src/imfs/imfs_stat.c (modified) (2 diffs)
-
c/src/libfs/src/imfs/imfs_symlink.c (modified) (2 diffs)
-
c/src/libfs/src/imfs/imfs_unlink.c (modified) (2 diffs)
-
c/src/libfs/src/imfs/imfs_unmount.c (modified) (3 diffs)
-
c/src/libfs/src/imfs/ioman.c (modified) (2 diffs)
-
c/src/libfs/src/imfs/linearfile.c (modified) (3 diffs)
-
c/src/libfs/src/imfs/memfile.c (modified) (14 diffs)
-
cpukit/libfs/ChangeLog (modified) (1 diff)
-
cpukit/libfs/src/imfs/imfs.h (modified) (1 diff)
-
cpukit/libfs/src/imfs/imfs_chown.c (modified) (2 diffs)
-
cpukit/libfs/src/imfs/imfs_directory.c (modified) (5 diffs)
-
cpukit/libfs/src/imfs/imfs_eval.c (modified) (23 diffs)
-
cpukit/libfs/src/imfs/imfs_fchmod.c (modified) (3 diffs)
-
cpukit/libfs/src/imfs/imfs_link.c (modified) (3 diffs)
-
cpukit/libfs/src/imfs/imfs_mknod.c (modified) (3 diffs)
-
cpukit/libfs/src/imfs/imfs_mount.c (modified) (2 diffs)
-
cpukit/libfs/src/imfs/imfs_readlink.c (modified) (2 diffs)
-
cpukit/libfs/src/imfs/imfs_stat.c (modified) (2 diffs)
-
cpukit/libfs/src/imfs/imfs_symlink.c (modified) (2 diffs)
-
cpukit/libfs/src/imfs/imfs_unlink.c (modified) (2 diffs)
-
cpukit/libfs/src/imfs/imfs_unmount.c (modified) (3 diffs)
-
cpukit/libfs/src/imfs/ioman.c (modified) (2 diffs)
-
cpukit/libfs/src/imfs/linearfile.c (modified) (3 diffs)
-
cpukit/libfs/src/imfs/memfile.c (modified) (14 diffs)
Legend:
- Unmodified
- Added
- Removed
-
c/src/exec/libfs/ChangeLog
ra02224e rb2709481 1 2002-01-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 3 * src/imfs/imfs_eval.c: Include <rtems/seterr.h>. 4 Apply rtems_set_errno_and_return_minus_one. 5 * src/imfs/memfile.c: Include <rtems/seterr.h>. 6 Apply rtems_set_errno_and_return_minus_one. 7 * src/imfs/imfs_readlink.c: Include <rtems/seterr.h>. 8 Apply rtems_set_errno_and_return_minus_one. 9 * src/imfs/imfs_unlink.c: Include <rtems/seterr.h>. 10 Apply rtems_set_errno_and_return_minus_one. 11 * src/imfs/imfs_link.c: Include <rtems/seterr.h>. 12 Apply rtems_set_errno_and_return_minus_one. 13 * src/imfs/imfs_chown.c: Include <rtems/seterr.h>. 14 Apply rtems_set_errno_and_return_minus_one. 15 * src/imfs/ioman.c: Include <rtems/seterr.h>. 16 Apply rtems_set_errno_and_return_minus_one. 17 * src/imfs/imfs_mount.c: Include <rtems/seterr.h>. 18 Apply rtems_set_errno_and_return_minus_one. 19 * src/imfs/imfs_directory.c: Include <rtems/seterr.h>. 20 Apply rtems_set_errno_and_return_minus_one. 21 * src/imfs/imfs_stat.c: Include <rtems/seterr.h>. 22 Apply rtems_set_errno_and_return_minus_one. 23 * src/imfs/imfs_fchmod.c: Include <rtems/seterr.h>. 24 Apply rtems_set_errno_and_return_minus_one. 25 * src/imfs/imfs_symlink.c: Include <rtems/seterr.h>. 26 Apply rtems_set_errno_and_return_minus_one. 27 * src/imfs/imfs_mknod.c: Include <rtems/seterr.h>. 28 Apply rtems_set_errno_and_return_minus_one. 29 * src/imfs/linearfile.c: Include <rtems/seterr.h>. 30 Apply rtems_set_errno_and_return_minus_one. 31 * src/imfs/imfs_unmount.c: Include <rtems/seterr.h>. 32 Apply rtems_set_errno_and_return_minus_one. 33 * src/imfs/imfs.h: Apply rtems_set_errno_and_return_minus_one. 34 Comment out increment_and_check_linkcounts. 35 1 36 2001-11-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 37 -
c/src/exec/libfs/src/imfs/imfs.h
ra02224e rb2709481 208 208 } IMFS_fs_info_t; 209 209 210 #if UNUSED 211 /* FIXME: Unused, we might want to remove it */ 210 212 #define increment_and_check_linkcounts( _fs_info ) \ 211 213 ((IMFS_fs_info_t * )_fs_info)->link_counts++; \ 212 214 if ( ((IMFS_fs_info_t * )_fs_info)->link_counts > MAXSYMLINKS ) \ 213 set_errno_and_return_minus_one( ELOOP ) 215 rtems_set_errno_and_return_minus_one( ELOOP ) 216 #endif 214 217 215 218 #define decrement_linkcounts( _fs_info ) \ -
c/src/exec/libfs/src/imfs/imfs_chown.c
ra02224e rb2709481 21 21 #include <errno.h> 22 22 #include <rtems/libio_.h> 23 #include <rtems/seterr.h> 23 24 #include "imfs.h" 24 25 … … 44 45 45 46 if ( ( st_uid != jnode->st_uid ) && ( st_uid != 0 ) ) 46 set_errno_and_return_minus_one( EPERM );47 rtems_set_errno_and_return_minus_one( EPERM ); 47 48 #endif 48 49 -
c/src/exec/libfs/src/imfs/imfs_directory.c
ra02224e rb2709481 29 29 #include "imfs.h" 30 30 #include <rtems/libio_.h> 31 #include <rtems/seterr.h> 31 32 32 33 /* … … 198 199 /* is not a permitted operation */ 199 200 default: 200 set_errno_and_return_minus_one( EINVAL );201 rtems_set_errno_and_return_minus_one( EINVAL ); 201 202 break; 202 203 } … … 294 295 295 296 if ( ! Chain_Is_empty( &the_jnode->info.directory.Entries ) ) 296 set_errno_and_return_minus_one( ENOTEMPTY );297 rtems_set_errno_and_return_minus_one( ENOTEMPTY ); 297 298 298 299 /* … … 301 302 302 303 if ( pathloc->mt_entry->mt_fs_root.node_access == pathloc->node_access ) 303 set_errno_and_return_minus_one( EBUSY );304 rtems_set_errno_and_return_minus_one( EBUSY ); 304 305 305 306 /* … … 308 309 309 310 if ( the_jnode->info.directory.mt_fs != NULL ) 310 set_errno_and_return_minus_one( EBUSY );311 rtems_set_errno_and_return_minus_one( EBUSY ); 311 312 312 313 /* -
c/src/exec/libfs/src/imfs/imfs_eval.c
ra02224e rb2709481 26 26 #include "imfs.h" 27 27 #include <rtems/libio_.h> 28 #include <rtems/seterr.h> 28 29 29 30 #define RTEMS_LIBIO_PERMS_RX (RTEMS_LIBIO_PERMS_SEARCH | RTEMS_LIBIO_PERMS_READ) … … 81 82 if ( !rtems_libio_is_valid_perms( flags ) ) { 82 83 assert( 0 ); 83 set_errno_and_return_minus_one( EIO );84 rtems_set_errno_and_return_minus_one( EIO ); 84 85 } 85 86 … … 151 152 152 153 if ( !IMFS_evaluate_permission( node, flags ) ) 153 set_errno_and_return_minus_one( EACCES );154 rtems_set_errno_and_return_minus_one( EACCES ); 154 155 155 156 return result; … … 213 214 214 215 if ( !IMFS_evaluate_permission( node, flags ) ) 215 set_errno_and_return_minus_one( EACCES );216 rtems_set_errno_and_return_minus_one( EACCES ); 216 217 217 218 return result; … … 242 243 if ( rtems_filesystem_link_counts > MAXSYMLINK ) { 243 244 rtems_filesystem_link_counts = 0; 244 set_errno_and_return_minus_one( ELOOP );245 rtems_set_errno_and_return_minus_one( ELOOP ); 245 246 } 246 247 … … 308 309 309 310 if ( !pathloc->node_access ) 310 set_errno_and_return_minus_one( ENOENT );311 rtems_set_errno_and_return_minus_one( ENOENT ); 311 312 312 313 /* … … 317 318 if ( node->type == IMFS_DIRECTORY ) 318 319 if ( !IMFS_evaluate_permission( pathloc, RTEMS_LIBIO_PERMS_SEARCH ) ) 319 set_errno_and_return_minus_one( EACCES );320 rtems_set_errno_and_return_minus_one( EACCES ); 320 321 321 322 node = pathloc->node_access; … … 353 354 354 355 if ( !node->Parent ) 355 set_errno_and_return_minus_one( ENOENT );356 rtems_set_errno_and_return_minus_one( ENOENT ); 356 357 357 358 node = node->Parent; … … 379 380 node = pathloc->node_access; 380 381 if ( !node ) 381 set_errno_and_return_minus_one( ENOTDIR );382 rtems_set_errno_and_return_minus_one( ENOTDIR ); 382 383 383 384 /* … … 386 387 387 388 if ( node->type != IMFS_DIRECTORY ) 388 set_errno_and_return_minus_one( ENOTDIR );389 rtems_set_errno_and_return_minus_one( ENOTDIR ); 389 390 390 391 /* … … 418 419 419 420 case IMFS_NO_MORE_PATH: 420 set_errno_and_return_minus_one( EEXIST );421 rtems_set_errno_and_return_minus_one( EEXIST ); 421 422 break; 422 423 423 424 case IMFS_INVALID_TOKEN: 424 set_errno_and_return_minus_one( ENAMETOOLONG );425 rtems_set_errno_and_return_minus_one( ENAMETOOLONG ); 425 426 break; 426 427 … … 439 440 for( ; path[i] != '\0'; i++) { 440 441 if ( !IMFS_is_separator( path[ i ] ) ) 441 set_errno_and_return_minus_one( ENOENT );442 rtems_set_errno_and_return_minus_one( ENOENT ); 442 443 } 443 444 … … 453 454 node = pathloc->node_access; 454 455 if ( node->type != IMFS_DIRECTORY ) 455 set_errno_and_return_minus_one( ENOTDIR );456 rtems_set_errno_and_return_minus_one( ENOTDIR ); 456 457 457 458 /* … … 460 461 461 462 if ( !IMFS_evaluate_permission( pathloc, RTEMS_LIBIO_PERMS_WX ) ) 462 set_errno_and_return_minus_one( EACCES );463 rtems_set_errno_and_return_minus_one( EACCES ); 463 464 464 465 return result; … … 490 491 if ( !rtems_libio_is_valid_perms( flags ) ) { 491 492 assert( 0 ); 492 set_errno_and_return_minus_one( EIO );493 rtems_set_errno_and_return_minus_one( EIO ); 493 494 } 494 495 … … 510 511 511 512 if ( !pathloc->node_access ) 512 set_errno_and_return_minus_one( ENOENT );513 rtems_set_errno_and_return_minus_one( ENOENT ); 513 514 514 515 /* … … 518 519 if ( node->type == IMFS_DIRECTORY ) 519 520 if ( !IMFS_evaluate_permission( pathloc, RTEMS_LIBIO_PERMS_SEARCH ) ) 520 set_errno_and_return_minus_one( EACCES );521 rtems_set_errno_and_return_minus_one( EACCES ); 521 522 522 523 node = pathloc->node_access; … … 552 553 553 554 if ( !node->Parent ) 554 set_errno_and_return_minus_one( ENOENT );555 rtems_set_errno_and_return_minus_one( ENOENT ); 555 556 556 557 node = node->Parent; … … 573 574 node = pathloc->node_access; 574 575 if ( !node ) 575 set_errno_and_return_minus_one( ENOTDIR );576 rtems_set_errno_and_return_minus_one( ENOTDIR ); 576 577 577 578 } else if ( node->type == IMFS_SYM_LINK ) { … … 589 590 590 591 if ( node->type != IMFS_DIRECTORY ) 591 set_errno_and_return_minus_one( ENOTDIR );592 rtems_set_errno_and_return_minus_one( ENOTDIR ); 592 593 593 594 /* … … 608 609 node = IMFS_find_match_in_dir( node, token ); 609 610 if ( !node ) 610 set_errno_and_return_minus_one( ENOENT );611 rtems_set_errno_and_return_minus_one( ENOENT ); 611 612 612 613 /* … … 622 623 623 624 case IMFS_INVALID_TOKEN: 624 set_errno_and_return_minus_one( ENAMETOOLONG );625 rtems_set_errno_and_return_minus_one( ENAMETOOLONG ); 625 626 break; 626 627 … … 654 655 655 656 if ( !IMFS_evaluate_permission( pathloc, flags ) ) 656 set_errno_and_return_minus_one( EACCES );657 rtems_set_errno_and_return_minus_one( EACCES ); 657 658 658 659 return result; -
c/src/exec/libfs/src/imfs/imfs_fchmod.c
ra02224e rb2709481 19 19 20 20 #include <rtems/libio_.h> 21 #include <rtems/seterr.h> 21 22 #include "imfs.h" 22 23 … … 40 41 41 42 if ( ( st_uid != jnode->st_uid ) && ( st_uid != 0 ) ) 42 set_errno_and_return_minus_one( EPERM );43 rtems_set_errno_and_return_minus_one( EPERM ); 43 44 #endif 44 45 … … 47 48 */ 48 49 if ( mode & (~ (S_IRWXU | S_IRWXG | S_IRWXO ) ) ) 49 set_errno_and_return_minus_one( EPERM );50 rtems_set_errno_and_return_minus_one( EPERM ); 50 51 51 52 /* -
c/src/exec/libfs/src/imfs/imfs_link.c
ra02224e rb2709481 23 23 #include "imfs.h" 24 24 #include <rtems/libio_.h> 25 #include <rtems/seterr.h> 25 26 26 27 int IMFS_link( … … 41 42 info.hard_link.link_node = to_loc->node_access; 42 43 if ( info.hard_link.link_node->st_nlink >= LINK_MAX ) 43 set_errno_and_return_minus_one( EMLINK );44 rtems_set_errno_and_return_minus_one( EMLINK ); 44 45 45 46 /* … … 62 63 63 64 if ( !new_node ) 64 set_errno_and_return_minus_one( ENOMEM );65 rtems_set_errno_and_return_minus_one( ENOMEM ); 65 66 66 67 /* -
c/src/exec/libfs/src/imfs/imfs_mknod.c
ra02224e rb2709481 27 27 #include "imfs.h" 28 28 #include <rtems/libio_.h> 29 #include <rtems/seterr.h> 29 30 30 31 int IMFS_mknod( … … 55 56 rtems_filesystem_split_dev_t( dev, info.device.major, info.device.minor ); 56 57 } else { 57 set_errno_and_return_minus_one( EINVAL );58 rtems_set_errno_and_return_minus_one( EINVAL ); 58 59 } 59 60 … … 71 72 72 73 if ( !new_node ) 73 set_errno_and_return_minus_one( ENOMEM );74 rtems_set_errno_and_return_minus_one( ENOMEM ); 74 75 75 76 return 0; -
c/src/exec/libfs/src/imfs/imfs_mount.c
ra02224e rb2709481 27 27 #include "imfs.h" 28 28 #include <rtems/libio_.h> 29 #include <rtems/seterr.h> 29 30 30 31 int IMFS_mount( … … 41 42 42 43 if ( node->type != IMFS_DIRECTORY ) 43 set_errno_and_return_minus_one( ENOTDIR );44 rtems_set_errno_and_return_minus_one( ENOTDIR ); 44 45 45 46 /* -
c/src/exec/libfs/src/imfs/imfs_readlink.c
ra02224e rb2709481 22 22 #include "imfs.h" 23 23 #include <rtems/libio_.h> 24 #include <rtems/seterr.h> 24 25 25 26 int IMFS_readlink( … … 35 36 36 37 if ( node->type != IMFS_SYM_LINK ) 37 set_errno_and_return_minus_one( EINVAL );38 rtems_set_errno_and_return_minus_one( EINVAL ); 38 39 39 40 for( i=0; ((i<bufsize) && (node->info.sym_link.name[i] != '\0')); i++ ) -
c/src/exec/libfs/src/imfs/imfs_stat.c
ra02224e rb2709481 21 21 #include "imfs.h" 22 22 #include <rtems/libio_.h> 23 #include <rtems/seterr.h> 23 24 24 25 int IMFS_stat( … … 50 51 51 52 default: 52 set_errno_and_return_minus_one( ENOTSUP );53 rtems_set_errno_and_return_minus_one( ENOTSUP ); 53 54 break; 54 55 } -
c/src/exec/libfs/src/imfs/imfs_symlink.c
ra02224e rb2709481 23 23 #include "imfs.h" 24 24 #include <rtems/libio_.h> 25 #include <rtems/seterr.h> 25 26 26 27 int IMFS_symlink( … … 56 57 57 58 if ( !new_node ) 58 set_errno_and_return_minus_one( ENOMEM );59 rtems_set_errno_and_return_minus_one( ENOMEM ); 59 60 60 61 return 0; -
c/src/exec/libfs/src/imfs/imfs_unlink.c
ra02224e rb2709481 23 23 #include "imfs.h" 24 24 #include <rtems/libio_.h> 25 #include <rtems/seterr.h> 25 26 26 27 int IMFS_unlink( … … 47 48 48 49 if ( !node->info.hard_link.link_node ) 49 set_errno_and_return_minus_one( EINVAL );50 rtems_set_errno_and_return_minus_one( EINVAL ); 50 51 51 52 the_link = *loc; -
c/src/exec/libfs/src/imfs/imfs_unmount.c
ra02224e rb2709481 28 28 #include "imfs.h" 29 29 #include <rtems/libio_.h> 30 #include <rtems/seterr.h> 30 31 31 32 int IMFS_unmount( … … 42 43 43 44 if ( node->type != IMFS_DIRECTORY ) 44 set_errno_and_return_minus_one( ENOTDIR );45 rtems_set_errno_and_return_minus_one( ENOTDIR ); 45 46 46 47 /* … … 49 50 50 51 if ( node->info.directory.mt_fs == NULL ) 51 set_errno_and_return_minus_one( EINVAL ); /* XXX */52 rtems_set_errno_and_return_minus_one( EINVAL ); /* XXX */ 52 53 53 54 /* -
c/src/exec/libfs/src/imfs/ioman.c
ra02224e rb2709481 26 26 #include <rtems.h> 27 27 #include <rtems/libio_.h> 28 #include <rtems/seterr.h> 28 29 #include "imfs.h" 29 30 … … 85 86 if ( !loc.ops->node_type_h ) { 86 87 rtems_filesystem_freenode( &loc ); 87 set_errno_and_return_minus_one( ENOTSUP );88 rtems_set_errno_and_return_minus_one( ENOTSUP ); 88 89 } 89 90 -
c/src/exec/libfs/src/imfs/linearfile.c
ra02224e rb2709481 29 29 #include "imfs.h" 30 30 #include <rtems/libio_.h> 31 #include <rtems/seterr.h> 31 32 32 33 /* … … 56 57 assert( the_jnode ); 57 58 if ( !the_jnode ) 58 set_errno_and_return_minus_one( EIO );59 rtems_set_errno_and_return_minus_one( EIO ); 59 60 60 61 assert( the_jnode->type == IMFS_LINEAR_FILE ); 61 62 if ( the_jnode->type != IMFS_LINEAR_FILE ) 62 set_errno_and_return_minus_one( EIO );63 rtems_set_errno_and_return_minus_one( EIO ); 63 64 64 65 /* … … 69 70 assert( dest ); 70 71 if ( !dest ) 71 set_errno_and_return_minus_one( EINVAL );72 rtems_set_errno_and_return_minus_one( EINVAL ); 72 73 73 74 /* -
c/src/exec/libfs/src/imfs/memfile.c
ra02224e rb2709481 30 30 #include "imfs.h" 31 31 #include <rtems/libio_.h> 32 #include <rtems/seterr.h> 32 33 33 34 #define MEMFILE_STATIC … … 209 210 else { /* Must be a block file (IMFS_MEMORY_FILE). */ 210 211 if (IMFS_memfile_extend( the_jnode, iop->offset )) 211 set_errno_and_return_minus_one( ENOSPC );212 rtems_set_errno_and_return_minus_one( ENOSPC ); 212 213 213 214 iop->size = the_jnode->info.file.size; … … 283 284 assert( the_jnode ); 284 285 if ( !the_jnode ) 285 set_errno_and_return_minus_one( EIO );286 rtems_set_errno_and_return_minus_one( EIO ); 286 287 287 288 assert( the_jnode->type == IMFS_MEMORY_FILE ); 288 289 if ( the_jnode->type != IMFS_MEMORY_FILE ) 289 set_errno_and_return_minus_one( EIO );290 rtems_set_errno_and_return_minus_one( EIO ); 290 291 291 292 if ( new_length >= IMFS_MEMFILE_MAXIMUM_SIZE ) 292 set_errno_and_return_minus_one( EINVAL );293 rtems_set_errno_and_return_minus_one( EINVAL ); 293 294 294 295 if ( new_length <= the_jnode->info.file.size ) … … 311 312 IMFS_memfile_remove_block( the_jnode, block ); 312 313 } 313 set_errno_and_return_minus_one( ENOSPC );314 rtems_set_errno_and_return_minus_one( ENOSPC ); 314 315 } 315 316 } … … 339 340 assert( the_jnode ); 340 341 if ( !the_jnode ) 341 set_errno_and_return_minus_one( EIO );342 rtems_set_errno_and_return_minus_one( EIO ); 342 343 343 344 assert( the_jnode->type == IMFS_MEMORY_FILE ); 344 345 if ( the_jnode->type != IMFS_MEMORY_FILE ) 345 set_errno_and_return_minus_one( EIO );346 rtems_set_errno_and_return_minus_one( EIO ); 346 347 347 348 block_entry_ptr = IMFS_memfile_get_block_pointer( the_jnode, block, 1 ); … … 470 471 assert( the_jnode ); 471 472 if ( !the_jnode ) 472 set_errno_and_return_minus_one( EIO );473 rtems_set_errno_and_return_minus_one( EIO ); 473 474 474 475 assert( the_jnode->type == IMFS_MEMORY_FILE ); 475 476 if ( the_jnode->type != IMFS_MEMORY_FILE ) 476 set_errno_and_return_minus_one( EIO );477 rtems_set_errno_and_return_minus_one( EIO ); 477 478 478 479 /* … … 564 565 assert( the_jnode ); 565 566 if ( !the_jnode ) 566 set_errno_and_return_minus_one( EIO );567 rtems_set_errno_and_return_minus_one( EIO ); 567 568 568 569 assert( the_jnode->type == IMFS_MEMORY_FILE || … … 570 571 if ( the_jnode->type != IMFS_MEMORY_FILE && 571 572 the_jnode->type != IMFS_LINEAR_FILE ) 572 set_errno_and_return_minus_one( EIO );573 rtems_set_errno_and_return_minus_one( EIO ); 573 574 574 575 /* … … 578 579 assert( dest ); 579 580 if ( !dest ) 580 set_errno_and_return_minus_one( EINVAL );581 rtems_set_errno_and_return_minus_one( EINVAL ); 581 582 582 583 /* … … 586 587 my_length = length; 587 588 if ( !my_length ) 588 set_errno_and_return_minus_one( EINVAL );589 rtems_set_errno_and_return_minus_one( EINVAL ); 589 590 590 591 /* … … 715 716 assert( the_jnode ); 716 717 if ( !the_jnode ) 717 set_errno_and_return_minus_one( EIO );718 rtems_set_errno_and_return_minus_one( EIO ); 718 719 719 720 assert( the_jnode->type == IMFS_MEMORY_FILE ); 720 721 if ( the_jnode->type != IMFS_MEMORY_FILE ) 721 set_errno_and_return_minus_one( EIO );722 rtems_set_errno_and_return_minus_one( EIO ); 722 723 723 724 /* … … 727 728 assert( source ); 728 729 if ( !source ) 729 set_errno_and_return_minus_one( EINVAL );730 rtems_set_errno_and_return_minus_one( EINVAL ); 730 731 731 732 … … 736 737 my_length = length; 737 738 if ( !my_length ) 738 set_errno_and_return_minus_one( EINVAL );739 rtems_set_errno_and_return_minus_one( EINVAL ); 739 740 740 741 /* … … 747 748 status = IMFS_memfile_extend( the_jnode, last_byte ); 748 749 if ( status ) 749 set_errno_and_return_minus_one( ENOSPC );750 rtems_set_errno_and_return_minus_one( ENOSPC ); 750 751 } 751 752 -
c/src/libfs/ChangeLog
ra02224e rb2709481 1 2002-01-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 3 * src/imfs/imfs_eval.c: Include <rtems/seterr.h>. 4 Apply rtems_set_errno_and_return_minus_one. 5 * src/imfs/memfile.c: Include <rtems/seterr.h>. 6 Apply rtems_set_errno_and_return_minus_one. 7 * src/imfs/imfs_readlink.c: Include <rtems/seterr.h>. 8 Apply rtems_set_errno_and_return_minus_one. 9 * src/imfs/imfs_unlink.c: Include <rtems/seterr.h>. 10 Apply rtems_set_errno_and_return_minus_one. 11 * src/imfs/imfs_link.c: Include <rtems/seterr.h>. 12 Apply rtems_set_errno_and_return_minus_one. 13 * src/imfs/imfs_chown.c: Include <rtems/seterr.h>. 14 Apply rtems_set_errno_and_return_minus_one. 15 * src/imfs/ioman.c: Include <rtems/seterr.h>. 16 Apply rtems_set_errno_and_return_minus_one. 17 * src/imfs/imfs_mount.c: Include <rtems/seterr.h>. 18 Apply rtems_set_errno_and_return_minus_one. 19 * src/imfs/imfs_directory.c: Include <rtems/seterr.h>. 20 Apply rtems_set_errno_and_return_minus_one. 21 * src/imfs/imfs_stat.c: Include <rtems/seterr.h>. 22 Apply rtems_set_errno_and_return_minus_one. 23 * src/imfs/imfs_fchmod.c: Include <rtems/seterr.h>. 24 Apply rtems_set_errno_and_return_minus_one. 25 * src/imfs/imfs_symlink.c: Include <rtems/seterr.h>. 26 Apply rtems_set_errno_and_return_minus_one. 27 * src/imfs/imfs_mknod.c: Include <rtems/seterr.h>. 28 Apply rtems_set_errno_and_return_minus_one. 29 * src/imfs/linearfile.c: Include <rtems/seterr.h>. 30 Apply rtems_set_errno_and_return_minus_one. 31 * src/imfs/imfs_unmount.c: Include <rtems/seterr.h>. 32 Apply rtems_set_errno_and_return_minus_one. 33 * src/imfs/imfs.h: Apply rtems_set_errno_and_return_minus_one. 34 Comment out increment_and_check_linkcounts. 35 1 36 2001-11-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 37 -
c/src/libfs/src/imfs/imfs.h
ra02224e rb2709481 208 208 } IMFS_fs_info_t; 209 209 210 #if UNUSED 211 /* FIXME: Unused, we might want to remove it */ 210 212 #define increment_and_check_linkcounts( _fs_info ) \ 211 213 ((IMFS_fs_info_t * )_fs_info)->link_counts++; \ 212 214 if ( ((IMFS_fs_info_t * )_fs_info)->link_counts > MAXSYMLINKS ) \ 213 set_errno_and_return_minus_one( ELOOP ) 215 rtems_set_errno_and_return_minus_one( ELOOP ) 216 #endif 214 217 215 218 #define decrement_linkcounts( _fs_info ) \ -
c/src/libfs/src/imfs/imfs_chown.c
ra02224e rb2709481 21 21 #include <errno.h> 22 22 #include <rtems/libio_.h> 23 #include <rtems/seterr.h> 23 24 #include "imfs.h" 24 25 … … 44 45 45 46 if ( ( st_uid != jnode->st_uid ) && ( st_uid != 0 ) ) 46 set_errno_and_return_minus_one( EPERM );47 rtems_set_errno_and_return_minus_one( EPERM ); 47 48 #endif 48 49 -
c/src/libfs/src/imfs/imfs_directory.c
ra02224e rb2709481 29 29 #include "imfs.h" 30 30 #include <rtems/libio_.h> 31 #include <rtems/seterr.h> 31 32 32 33 /* … … 198 199 /* is not a permitted operation */ 199 200 default: 200 set_errno_and_return_minus_one( EINVAL );201 rtems_set_errno_and_return_minus_one( EINVAL ); 201 202 break; 202 203 } … … 294 295 295 296 if ( ! Chain_Is_empty( &the_jnode->info.directory.Entries ) ) 296 set_errno_and_return_minus_one( ENOTEMPTY );297 rtems_set_errno_and_return_minus_one( ENOTEMPTY ); 297 298 298 299 /* … … 301 302 302 303 if ( pathloc->mt_entry->mt_fs_root.node_access == pathloc->node_access ) 303 set_errno_and_return_minus_one( EBUSY );304 rtems_set_errno_and_return_minus_one( EBUSY ); 304 305 305 306 /* … … 308 309 309 310 if ( the_jnode->info.directory.mt_fs != NULL ) 310 set_errno_and_return_minus_one( EBUSY );311 rtems_set_errno_and_return_minus_one( EBUSY ); 311 312 312 313 /* -
c/src/libfs/src/imfs/imfs_eval.c
ra02224e rb2709481 26 26 #include "imfs.h" 27 27 #include <rtems/libio_.h> 28 #include <rtems/seterr.h> 28 29 29 30 #define RTEMS_LIBIO_PERMS_RX (RTEMS_LIBIO_PERMS_SEARCH | RTEMS_LIBIO_PERMS_READ) … … 81 82 if ( !rtems_libio_is_valid_perms( flags ) ) { 82 83 assert( 0 ); 83 set_errno_and_return_minus_one( EIO );84 rtems_set_errno_and_return_minus_one( EIO ); 84 85 } 85 86 … … 151 152 152 153 if ( !IMFS_evaluate_permission( node, flags ) ) 153 set_errno_and_return_minus_one( EACCES );154 rtems_set_errno_and_return_minus_one( EACCES ); 154 155 155 156 return result; … … 213 214 214 215 if ( !IMFS_evaluate_permission( node, flags ) ) 215 set_errno_and_return_minus_one( EACCES );216 rtems_set_errno_and_return_minus_one( EACCES ); 216 217 217 218 return result; … … 242 243 if ( rtems_filesystem_link_counts > MAXSYMLINK ) { 243 244 rtems_filesystem_link_counts = 0; 244 set_errno_and_return_minus_one( ELOOP );245 rtems_set_errno_and_return_minus_one( ELOOP ); 245 246 } 246 247 … … 308 309 309 310 if ( !pathloc->node_access ) 310 set_errno_and_return_minus_one( ENOENT );311 rtems_set_errno_and_return_minus_one( ENOENT ); 311 312 312 313 /* … … 317 318 if ( node->type == IMFS_DIRECTORY ) 318 319 if ( !IMFS_evaluate_permission( pathloc, RTEMS_LIBIO_PERMS_SEARCH ) ) 319 set_errno_and_return_minus_one( EACCES );320 rtems_set_errno_and_return_minus_one( EACCES ); 320 321 321 322 node = pathloc->node_access; … … 353 354 354 355 if ( !node->Parent ) 355 set_errno_and_return_minus_one( ENOENT );356 rtems_set_errno_and_return_minus_one( ENOENT ); 356 357 357 358 node = node->Parent; … … 379 380 node = pathloc->node_access; 380 381 if ( !node ) 381 set_errno_and_return_minus_one( ENOTDIR );382 rtems_set_errno_and_return_minus_one( ENOTDIR ); 382 383 383 384 /* … … 386 387 387 388 if ( node->type != IMFS_DIRECTORY ) 388 set_errno_and_return_minus_one( ENOTDIR );389 rtems_set_errno_and_return_minus_one( ENOTDIR ); 389 390 390 391 /* … … 418 419 419 420 case IMFS_NO_MORE_PATH: 420 set_errno_and_return_minus_one( EEXIST );421 rtems_set_errno_and_return_minus_one( EEXIST ); 421 422 break; 422 423 423 424 case IMFS_INVALID_TOKEN: 424 set_errno_and_return_minus_one( ENAMETOOLONG );425 rtems_set_errno_and_return_minus_one( ENAMETOOLONG ); 425 426 break; 426 427 … … 439 440 for( ; path[i] != '\0'; i++) { 440 441 if ( !IMFS_is_separator( path[ i ] ) ) 441 set_errno_and_return_minus_one( ENOENT );442 rtems_set_errno_and_return_minus_one( ENOENT ); 442 443 } 443 444 … … 453 454 node = pathloc->node_access; 454 455 if ( node->type != IMFS_DIRECTORY ) 455 set_errno_and_return_minus_one( ENOTDIR );456 rtems_set_errno_and_return_minus_one( ENOTDIR ); 456 457 457 458 /* … … 460 461 461 462 if ( !IMFS_evaluate_permission( pathloc, RTEMS_LIBIO_PERMS_WX ) ) 462 set_errno_and_return_minus_one( EACCES );463 rtems_set_errno_and_return_minus_one( EACCES ); 463 464 464 465 return result; … … 490 491 if ( !rtems_libio_is_valid_perms( flags ) ) { 491 492 assert( 0 ); 492 set_errno_and_return_minus_one( EIO );493 rtems_set_errno_and_return_minus_one( EIO ); 493 494 } 494 495 … … 510 511 511 512 if ( !pathloc->node_access ) 512 set_errno_and_return_minus_one( ENOENT );513 rtems_set_errno_and_return_minus_one( ENOENT ); 513 514 514 515 /* … … 518 519 if ( node->type == IMFS_DIRECTORY ) 519 520 if ( !IMFS_evaluate_permission( pathloc, RTEMS_LIBIO_PERMS_SEARCH ) ) 520 set_errno_and_return_minus_one( EACCES );521 rtems_set_errno_and_return_minus_one( EACCES ); 521 522 522 523 node = pathloc->node_access; … … 552 553 553 554 if ( !node->Parent ) 554 set_errno_and_return_minus_one( ENOENT );555 rtems_set_errno_and_return_minus_one( ENOENT ); 555 556 556 557 node = node->Parent; … … 573 574 node = pathloc->node_access; 574 575 if ( !node ) 575 set_errno_and_return_minus_one( ENOTDIR );576 rtems_set_errno_and_return_minus_one( ENOTDIR ); 576 577 577 578 } else if ( node->type == IMFS_SYM_LINK ) { … … 589 590 590 591 if ( node->type != IMFS_DIRECTORY ) 591 set_errno_and_return_minus_one( ENOTDIR );592 rtems_set_errno_and_return_minus_one( ENOTDIR ); 592 593 593 594 /* … … 608 609 node = IMFS_find_match_in_dir( node, token ); 609 610 if ( !node ) 610 set_errno_and_return_minus_one( ENOENT );611 rtems_set_errno_and_return_minus_one( ENOENT ); 611 612 612 613 /* … … 622 623 623 624 case IMFS_INVALID_TOKEN: 624 set_errno_and_return_minus_one( ENAMETOOLONG );625 rtems_set_errno_and_return_minus_one( ENAMETOOLONG ); 625 626 break; 626 627 … … 654 655 655 656 if ( !IMFS_evaluate_permission( pathloc, flags ) ) 656 set_errno_and_return_minus_one( EACCES );657 rtems_set_errno_and_return_minus_one( EACCES ); 657 658 658 659 return result; -
c/src/libfs/src/imfs/imfs_fchmod.c
ra02224e rb2709481 19 19 20 20 #include <rtems/libio_.h> 21 #include <rtems/seterr.h> 21 22 #include "imfs.h" 22 23 … … 40 41 41 42 if ( ( st_uid != jnode->st_uid ) && ( st_uid != 0 ) ) 42 set_errno_and_return_minus_one( EPERM );43 rtems_set_errno_and_return_minus_one( EPERM ); 43 44 #endif 44 45 … … 47 48 */ 48 49 if ( mode & (~ (S_IRWXU | S_IRWXG | S_IRWXO ) ) ) 49 set_errno_and_return_minus_one( EPERM );50 rtems_set_errno_and_return_minus_one( EPERM ); 50 51 51 52 /* -
c/src/libfs/src/imfs/imfs_link.c
ra02224e rb2709481 23 23 #include "imfs.h" 24 24 #include <rtems/libio_.h> 25 #include <rtems/seterr.h> 25 26 26 27 int IMFS_link( … … 41 42 info.hard_link.link_node = to_loc->node_access; 42 43 if ( info.hard_link.link_node->st_nlink >= LINK_MAX ) 43 set_errno_and_return_minus_one( EMLINK );44 rtems_set_errno_and_return_minus_one( EMLINK ); 44 45 45 46 /* … … 62 63 63 64 if ( !new_node ) 64 set_errno_and_return_minus_one( ENOMEM );65 rtems_set_errno_and_return_minus_one( ENOMEM ); 65 66 66 67 /* -
c/src/libfs/src/imfs/imfs_mknod.c
ra02224e rb2709481 27 27 #include "imfs.h" 28 28 #include <rtems/libio_.h> 29 #include <rtems/seterr.h> 29 30 30 31 int IMFS_mknod( … … 55 56 rtems_filesystem_split_dev_t( dev, info.device.major, info.device.minor ); 56 57 } else { 57 set_errno_and_return_minus_one( EINVAL );58 rtems_set_errno_and_return_minus_one( EINVAL ); 58 59 } 59 60 … … 71 72 72 73 if ( !new_node ) 73 set_errno_and_return_minus_one( ENOMEM );74 rtems_set_errno_and_return_minus_one( ENOMEM ); 74 75 75 76 return 0; -
c/src/libfs/src/imfs/imfs_mount.c
ra02224e rb2709481 27 27 #include "imfs.h" 28 28 #include <rtems/libio_.h> 29 #include <rtems/seterr.h> 29 30 30 31 int IMFS_mount( … … 41 42 42 43 if ( node->type != IMFS_DIRECTORY ) 43 set_errno_and_return_minus_one( ENOTDIR );44 rtems_set_errno_and_return_minus_one( ENOTDIR ); 44 45 45 46 /* -
c/src/libfs/src/imfs/imfs_readlink.c
ra02224e rb2709481 22 22 #include "imfs.h" 23 23 #include <rtems/libio_.h> 24 #include <rtems/seterr.h> 24 25 25 26 int IMFS_readlink( … … 35 36 36 37 if ( node->type != IMFS_SYM_LINK ) 37 set_errno_and_return_minus_one( EINVAL );38 rtems_set_errno_and_return_minus_one( EINVAL ); 38 39 39 40 for( i=0; ((i<bufsize) && (node->info.sym_link.name[i] != '\0')); i++ ) -
c/src/libfs/src/imfs/imfs_stat.c
ra02224e rb2709481 21 21 #include "imfs.h" 22 22 #include <rtems/libio_.h> 23 #include <rtems/seterr.h> 23 24 24 25 int IMFS_stat( … … 50 51 51 52 default: 52 set_errno_and_return_minus_one( ENOTSUP );53 rtems_set_errno_and_return_minus_one( ENOTSUP ); 53 54 break; 54 55 } -
c/src/libfs/src/imfs/imfs_symlink.c
ra02224e rb2709481 23 23 #include "imfs.h" 24 24 #include <rtems/libio_.h> 25 #include <rtems/seterr.h> 25 26 26 27 int IMFS_symlink( … … 56 57 57 58 if ( !new_node ) 58 set_errno_and_return_minus_one( ENOMEM );59 rtems_set_errno_and_return_minus_one( ENOMEM ); 59 60 60 61 return 0; -
c/src/libfs/src/imfs/imfs_unlink.c
ra02224e rb2709481 23 23 #include "imfs.h" 24 24 #include <rtems/libio_.h> 25 #include <rtems/seterr.h> 25 26 26 27 int IMFS_unlink( … … 47 48 48 49 if ( !node->info.hard_link.link_node ) 49 set_errno_and_return_minus_one( EINVAL );50 rtems_set_errno_and_return_minus_one( EINVAL ); 50 51 51 52 the_link = *loc; -
c/src/libfs/src/imfs/imfs_unmount.c
ra02224e rb2709481 28 28 #include "imfs.h" 29 29 #include <rtems/libio_.h> 30 #include <rtems/seterr.h> 30 31 31 32 int IMFS_unmount( … … 42 43 43 44 if ( node->type != IMFS_DIRECTORY ) 44 set_errno_and_return_minus_one( ENOTDIR );45 rtems_set_errno_and_return_minus_one( ENOTDIR ); 45 46 46 47 /* … … 49 50 50 51 if ( node->info.directory.mt_fs == NULL ) 51 set_errno_and_return_minus_one( EINVAL ); /* XXX */52 rtems_set_errno_and_return_minus_one( EINVAL ); /* XXX */ 52 53 53 54 /* -
c/src/libfs/src/imfs/ioman.c
ra02224e rb2709481 26 26 #include <rtems.h> 27 27 #include <rtems/libio_.h> 28 #include <rtems/seterr.h> 28 29 #include "imfs.h" 29 30 … … 85 86 if ( !loc.ops->node_type_h ) { 86 87 rtems_filesystem_freenode( &loc ); 87 set_errno_and_return_minus_one( ENOTSUP );88 rtems_set_errno_and_return_minus_one( ENOTSUP ); 88 89 } 89 90 -
c/src/libfs/src/imfs/linearfile.c
ra02224e rb2709481 29 29 #include "imfs.h" 30 30 #include <rtems/libio_.h> 31 #include <rtems/seterr.h> 31 32 32 33 /* … … 56 57 assert( the_jnode ); 57 58 if ( !the_jnode ) 58 set_errno_and_return_minus_one( EIO );59 rtems_set_errno_and_return_minus_one( EIO ); 59 60 60 61 assert( the_jnode->type == IMFS_LINEAR_FILE ); 61 62 if ( the_jnode->type != IMFS_LINEAR_FILE ) 62 set_errno_and_return_minus_one( EIO );63 rtems_set_errno_and_return_minus_one( EIO ); 63 64 64 65 /* … … 69 70 assert( dest ); 70 71 if ( !dest ) 71 set_errno_and_return_minus_one( EINVAL );72 rtems_set_errno_and_return_minus_one( EINVAL ); 72 73 73 74 /* -
c/src/libfs/src/imfs/memfile.c
ra02224e rb2709481 30 30 #include "imfs.h" 31 31 #include <rtems/libio_.h> 32 #include <rtems/seterr.h> 32 33 33 34 #define MEMFILE_STATIC … … 209 210 else { /* Must be a block file (IMFS_MEMORY_FILE). */ 210 211 if (IMFS_memfile_extend( the_jnode, iop->offset )) 211 set_errno_and_return_minus_one( ENOSPC );212 rtems_set_errno_and_return_minus_one( ENOSPC ); 212 213 213 214 iop->size = the_jnode->info.file.size; … … 283 284 assert( the_jnode ); 284 285 if ( !the_jnode ) 285 set_errno_and_return_minus_one( EIO );286 rtems_set_errno_and_return_minus_one( EIO ); 286 287 287 288 assert( the_jnode->type == IMFS_MEMORY_FILE ); 288 289 if ( the_jnode->type != IMFS_MEMORY_FILE ) 289 set_errno_and_return_minus_one( EIO );290 rtems_set_errno_and_return_minus_one( EIO ); 290 291 291 292 if ( new_length >= IMFS_MEMFILE_MAXIMUM_SIZE ) 292 set_errno_and_return_minus_one( EINVAL );293 rtems_set_errno_and_return_minus_one( EINVAL ); 293 294 294 295 if ( new_length <= the_jnode->info.file.size ) … … 311 312 IMFS_memfile_remove_block( the_jnode, block ); 312 313 } 313 set_errno_and_return_minus_one( ENOSPC );314 rtems_set_errno_and_return_minus_one( ENOSPC ); 314 315 } 315 316 } … … 339 340 assert( the_jnode ); 340 341 if ( !the_jnode ) 341 set_errno_and_return_minus_one( EIO );342 rtems_set_errno_and_return_minus_one( EIO ); 342 343 343 344 assert( the_jnode->type == IMFS_MEMORY_FILE ); 344 345 if ( the_jnode->type != IMFS_MEMORY_FILE ) 345 set_errno_and_return_minus_one( EIO );346 rtems_set_errno_and_return_minus_one( EIO ); 346 347 347 348 block_entry_ptr = IMFS_memfile_get_block_pointer( the_jnode, block, 1 ); … … 470 471 assert( the_jnode ); 471 472 if ( !the_jnode ) 472 set_errno_and_return_minus_one( EIO );473 rtems_set_errno_and_return_minus_one( EIO ); 473 474 474 475 assert( the_jnode->type == IMFS_MEMORY_FILE ); 475 476 if ( the_jnode->type != IMFS_MEMORY_FILE ) 476 set_errno_and_return_minus_one( EIO );477 rtems_set_errno_and_return_minus_one( EIO ); 477 478 478 479 /* … … 564 565 assert( the_jnode ); 565 566 if ( !the_jnode ) 566 set_errno_and_return_minus_one( EIO );567 rtems_set_errno_and_return_minus_one( EIO ); 567 568 568 569 assert( the_jnode->type == IMFS_MEMORY_FILE || … … 570 571 if ( the_jnode->type != IMFS_MEMORY_FILE && 571 572 the_jnode->type != IMFS_LINEAR_FILE ) 572 set_errno_and_return_minus_one( EIO );573 rtems_set_errno_and_return_minus_one( EIO ); 573 574 574 575 /* … … 578 579 assert( dest ); 579 580 if ( !dest ) 580 set_errno_and_return_minus_one( EINVAL );581 rtems_set_errno_and_return_minus_one( EINVAL ); 581 582 582 583 /* … … 586 587 my_length = length; 587 588 if ( !my_length ) 588 set_errno_and_return_minus_one( EINVAL );589 rtems_set_errno_and_return_minus_one( EINVAL ); 589 590 590 591 /* … … 715 716 assert( the_jnode ); 716 717 if ( !the_jnode ) 717 set_errno_and_return_minus_one( EIO );718 rtems_set_errno_and_return_minus_one( EIO ); 718 719 719 720 assert( the_jnode->type == IMFS_MEMORY_FILE ); 720 721 if ( the_jnode->type != IMFS_MEMORY_FILE ) 721 set_errno_and_return_minus_one( EIO );722 rtems_set_errno_and_return_minus_one( EIO ); 722 723 723 724 /* … … 727 728 assert( source ); 728 729 if ( !source ) 729 set_errno_and_return_minus_one( EINVAL );730 rtems_set_errno_and_return_minus_one( EINVAL ); 730 731 731 732 … … 736 737 my_length = length; 737 738 if ( !my_length ) 738 set_errno_and_return_minus_one( EINVAL );739 rtems_set_errno_and_return_minus_one( EINVAL ); 739 740 740 741 /* … … 747 748 status = IMFS_memfile_extend( the_jnode, last_byte ); 748 749 if ( status ) 749 set_errno_and_return_minus_one( ENOSPC );750 rtems_set_errno_and_return_minus_one( ENOSPC ); 750 751 } 751 752 -
cpukit/libfs/ChangeLog
ra02224e rb2709481 1 2002-01-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 3 * src/imfs/imfs_eval.c: Include <rtems/seterr.h>. 4 Apply rtems_set_errno_and_return_minus_one. 5 * src/imfs/memfile.c: Include <rtems/seterr.h>. 6 Apply rtems_set_errno_and_return_minus_one. 7 * src/imfs/imfs_readlink.c: Include <rtems/seterr.h>. 8 Apply rtems_set_errno_and_return_minus_one. 9 * src/imfs/imfs_unlink.c: Include <rtems/seterr.h>. 10 Apply rtems_set_errno_and_return_minus_one. 11 * src/imfs/imfs_link.c: Include <rtems/seterr.h>. 12 Apply rtems_set_errno_and_return_minus_one. 13 * src/imfs/imfs_chown.c: Include <rtems/seterr.h>. 14 Apply rtems_set_errno_and_return_minus_one. 15 * src/imfs/ioman.c: Include <rtems/seterr.h>. 16 Apply rtems_set_errno_and_return_minus_one. 17 * src/imfs/imfs_mount.c: Include <rtems/seterr.h>. 18 Apply rtems_set_errno_and_return_minus_one. 19 * src/imfs/imfs_directory.c: Include <rtems/seterr.h>. 20 Apply rtems_set_errno_and_return_minus_one. 21 * src/imfs/imfs_stat.c: Include <rtems/seterr.h>. 22 Apply rtems_set_errno_and_return_minus_one. 23 * src/imfs/imfs_fchmod.c: Include <rtems/seterr.h>. 24 Apply rtems_set_errno_and_return_minus_one. 25 * src/imfs/imfs_symlink.c: Include <rtems/seterr.h>. 26 Apply rtems_set_errno_and_return_minus_one. 27 * src/imfs/imfs_mknod.c: Include <rtems/seterr.h>. 28 Apply rtems_set_errno_and_return_minus_one. 29 * src/imfs/linearfile.c: Include <rtems/seterr.h>. 30 Apply rtems_set_errno_and_return_minus_one. 31 * src/imfs/imfs_unmount.c: Include <rtems/seterr.h>. 32 Apply rtems_set_errno_and_return_minus_one. 33 * src/imfs/imfs.h: Apply rtems_set_errno_and_return_minus_one. 34 Comment out increment_and_check_linkcounts. 35 1 36 2001-11-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 37 -
cpukit/libfs/src/imfs/imfs.h
ra02224e rb2709481 208 208 } IMFS_fs_info_t; 209 209 210 #if UNUSED 211 /* FIXME: Unused, we might want to remove it */ 210 212 #define increment_and_check_linkcounts( _fs_info ) \ 211 213 ((IMFS_fs_info_t * )_fs_info)->link_counts++; \ 212 214 if ( ((IMFS_fs_info_t * )_fs_info)->link_counts > MAXSYMLINKS ) \ 213 set_errno_and_return_minus_one( ELOOP ) 215 rtems_set_errno_and_return_minus_one( ELOOP ) 216 #endif 214 217 215 218 #define decrement_linkcounts( _fs_info ) \ -
cpukit/libfs/src/imfs/imfs_chown.c
ra02224e rb2709481 21 21 #include <errno.h> 22 22 #include <rtems/libio_.h> 23 #include <rtems/seterr.h> 23 24 #include "imfs.h" 24 25 … … 44 45 45 46 if ( ( st_uid != jnode->st_uid ) && ( st_uid != 0 ) ) 46 set_errno_and_return_minus_one( EPERM );47 rtems_set_errno_and_return_minus_one( EPERM ); 47 48 #endif 48 49 -
cpukit/libfs/src/imfs/imfs_directory.c
ra02224e rb2709481 29 29 #include "imfs.h" 30 30 #include <rtems/libio_.h> 31 #include <rtems/seterr.h> 31 32 32 33 /* … … 198 199 /* is not a permitted operation */ 199 200 default: 200 set_errno_and_return_minus_one( EINVAL );201 rtems_set_errno_and_return_minus_one( EINVAL ); 201 202 break; 202 203 } … … 294 295 295 296 if ( ! Chain_Is_empty( &the_jnode->info.directory.Entries ) ) 296 set_errno_and_return_minus_one( ENOTEMPTY );297 rtems_set_errno_and_return_minus_one( ENOTEMPTY ); 297 298 298 299 /* … … 301 302 302 303 if ( pathloc->mt_entry->mt_fs_root.node_access == pathloc->node_access ) 303 set_errno_and_return_minus_one( EBUSY );304 rtems_set_errno_and_return_minus_one( EBUSY ); 304 305 305 306 /* … … 308 309 309 310 if ( the_jnode->info.directory.mt_fs != NULL ) 310 set_errno_and_return_minus_one( EBUSY );311 rtems_set_errno_and_return_minus_one( EBUSY ); 311 312 312 313 /* -
cpukit/libfs/src/imfs/imfs_eval.c
ra02224e rb2709481 26 26 #include "imfs.h" 27 27 #include <rtems/libio_.h> 28 #include <rtems/seterr.h> 28 29 29 30 #define RTEMS_LIBIO_PERMS_RX (RTEMS_LIBIO_PERMS_SEARCH | RTEMS_LIBIO_PERMS_READ) … … 81 82 if ( !rtems_libio_is_valid_perms( flags ) ) { 82 83 assert( 0 ); 83 set_errno_and_return_minus_one( EIO );84 rtems_set_errno_and_return_minus_one( EIO ); 84 85 } 85 86 … … 151 152 152 153 if ( !IMFS_evaluate_permission( node, flags ) ) 153 set_errno_and_return_minus_one( EACCES );154 rtems_set_errno_and_return_minus_one( EACCES ); 154 155 155 156 return result; … … 213 214 214 215 if ( !IMFS_evaluate_permission( node, flags ) ) 215 set_errno_and_return_minus_one( EACCES );216 rtems_set_errno_and_return_minus_one( EACCES ); 216 217 217 218 return result; … … 242 243 if ( rtems_filesystem_link_counts > MAXSYMLINK ) { 243 244 rtems_filesystem_link_counts = 0; 244 set_errno_and_return_minus_one( ELOOP );245 rtems_set_errno_and_return_minus_one( ELOOP ); 245 246 } 246 247 … … 308 309 309 310 if ( !pathloc->node_access ) 310 set_errno_and_return_minus_one( ENOENT );311 rtems_set_errno_and_return_minus_one( ENOENT ); 311 312 312 313 /* … … 317 318 if ( node->type == IMFS_DIRECTORY ) 318 319 if ( !IMFS_evaluate_permission( pathloc, RTEMS_LIBIO_PERMS_SEARCH ) ) 319 set_errno_and_return_minus_one( EACCES );320 rtems_set_errno_and_return_minus_one( EACCES ); 320 321 321 322 node = pathloc->node_access; … … 353 354 354 355 if ( !node->Parent ) 355 set_errno_and_return_minus_one( ENOENT );356 rtems_set_errno_and_return_minus_one( ENOENT ); 356 357 357 358 node = node->Parent; … … 379 380 node = pathloc->node_access; 380 381 if ( !node ) 381 set_errno_and_return_minus_one( ENOTDIR );382 rtems_set_errno_and_return_minus_one( ENOTDIR ); 382 383 383 384 /* … … 386 387 387 388 if ( node->type != IMFS_DIRECTORY ) 388 set_errno_and_return_minus_one( ENOTDIR );389 rtems_set_errno_and_return_minus_one( ENOTDIR ); 389 390 390 391 /* … … 418 419 419 420 case IMFS_NO_MORE_PATH: 420 set_errno_and_return_minus_one( EEXIST );421 rtems_set_errno_and_return_minus_one( EEXIST ); 421 422 break; 422 423 423 424 case IMFS_INVALID_TOKEN: 424 set_errno_and_return_minus_one( ENAMETOOLONG );425 rtems_set_errno_and_return_minus_one( ENAMETOOLONG ); 425 426 break; 426 427 … … 439 440 for( ; path[i] != '\0'; i++) { 440 441 if ( !IMFS_is_separator( path[ i ] ) ) 441 set_errno_and_return_minus_one( ENOENT );442 rtems_set_errno_and_return_minus_one( ENOENT ); 442 443 } 443 444 … … 453 454 node = pathloc->node_access; 454 455 if ( node->type != IMFS_DIRECTORY ) 455 set_errno_and_return_minus_one( ENOTDIR );456 rtems_set_errno_and_return_minus_one( ENOTDIR ); 456 457 457 458 /* … … 460 461 461 462 if ( !IMFS_evaluate_permission( pathloc, RTEMS_LIBIO_PERMS_WX ) ) 462 set_errno_and_return_minus_one( EACCES );463 rtems_set_errno_and_return_minus_one( EACCES ); 463 464 464 465 return result; … … 490 491 if ( !rtems_libio_is_valid_perms( flags ) ) { 491 492 assert( 0 ); 492 set_errno_and_return_minus_one( EIO );493 rtems_set_errno_and_return_minus_one( EIO ); 493 494 } 494 495 … … 510 511 511 512 if ( !pathloc->node_access ) 512 set_errno_and_return_minus_one( ENOENT );513 rtems_set_errno_and_return_minus_one( ENOENT ); 513 514 514 515 /* … … 518 519 if ( node->type == IMFS_DIRECTORY ) 519 520 if ( !IMFS_evaluate_permission( pathloc, RTEMS_LIBIO_PERMS_SEARCH ) ) 520 set_errno_and_return_minus_one( EACCES );521 rtems_set_errno_and_return_minus_one( EACCES ); 521 522 522 523 node = pathloc->node_access; … … 552 553 553 554 if ( !node->Parent ) 554 set_errno_and_return_minus_one( ENOENT );555 rtems_set_errno_and_return_minus_one( ENOENT ); 555 556 556 557 node = node->Parent; … … 573 574 node = pathloc->node_access; 574 575 if ( !node ) 575 set_errno_and_return_minus_one( ENOTDIR );576 rtems_set_errno_and_return_minus_one( ENOTDIR ); 576 577 577 578 } else if ( node->type == IMFS_SYM_LINK ) { … … 589 590 590 591 if ( node->type != IMFS_DIRECTORY ) 591 set_errno_and_return_minus_one( ENOTDIR );592 rtems_set_errno_and_return_minus_one( ENOTDIR ); 592 593 593 594 /* … … 608 609 node = IMFS_find_match_in_dir( node, token ); 609 610 if ( !node ) 610 set_errno_and_return_minus_one( ENOENT );611 rtems_set_errno_and_return_minus_one( ENOENT ); 611 612 612 613 /* … … 622 623 623 624 case IMFS_INVALID_TOKEN: 624 set_errno_and_return_minus_one( ENAMETOOLONG );625 rtems_set_errno_and_return_minus_one( ENAMETOOLONG ); 625 626 break; 626 627 … … 654 655 655 656 if ( !IMFS_evaluate_permission( pathloc, flags ) ) 656 set_errno_and_return_minus_one( EACCES );657 rtems_set_errno_and_return_minus_one( EACCES ); 657 658 658 659 return result; -
cpukit/libfs/src/imfs/imfs_fchmod.c
ra02224e rb2709481 19 19 20 20 #include <rtems/libio_.h> 21 #include <rtems/seterr.h> 21 22 #include "imfs.h" 22 23 … … 40 41 41 42 if ( ( st_uid != jnode->st_uid ) && ( st_uid != 0 ) ) 42 set_errno_and_return_minus_one( EPERM );43 rtems_set_errno_and_return_minus_one( EPERM ); 43 44 #endif 44 45 … … 47 48 */ 48 49 if ( mode & (~ (S_IRWXU | S_IRWXG | S_IRWXO ) ) ) 49 set_errno_and_return_minus_one( EPERM );50 rtems_set_errno_and_return_minus_one( EPERM ); 50 51 51 52 /* -
cpukit/libfs/src/imfs/imfs_link.c
ra02224e rb2709481 23 23 #include "imfs.h" 24 24 #include <rtems/libio_.h> 25 #include <rtems/seterr.h> 25 26 26 27 int IMFS_link( … … 41 42 info.hard_link.link_node = to_loc->node_access; 42 43 if ( info.hard_link.link_node->st_nlink >= LINK_MAX ) 43 set_errno_and_return_minus_one( EMLINK );44 rtems_set_errno_and_return_minus_one( EMLINK ); 44 45 45 46 /* … … 62 63 63 64 if ( !new_node ) 64 set_errno_and_return_minus_one( ENOMEM );65 rtems_set_errno_and_return_minus_one( ENOMEM ); 65 66 66 67 /* -
cpukit/libfs/src/imfs/imfs_mknod.c
ra02224e rb2709481 27 27 #include "imfs.h" 28 28 #include <rtems/libio_.h> 29 #include <rtems/seterr.h> 29 30 30 31 int IMFS_mknod( … … 55 56 rtems_filesystem_split_dev_t( dev, info.device.major, info.device.minor ); 56 57 } else { 57 set_errno_and_return_minus_one( EINVAL );58 rtems_set_errno_and_return_minus_one( EINVAL ); 58 59 } 59 60 … … 71 72 72 73 if ( !new_node ) 73 set_errno_and_return_minus_one( ENOMEM );74 rtems_set_errno_and_return_minus_one( ENOMEM ); 74 75 75 76 return 0; -
cpukit/libfs/src/imfs/imfs_mount.c
ra02224e rb2709481 27 27 #include "imfs.h" 28 28 #include <rtems/libio_.h> 29 #include <rtems/seterr.h> 29 30 30 31 int IMFS_mount( … … 41 42 42 43 if ( node->type != IMFS_DIRECTORY ) 43 set_errno_and_return_minus_one( ENOTDIR );44 rtems_set_errno_and_return_minus_one( ENOTDIR ); 44 45 45 46 /* -
cpukit/libfs/src/imfs/imfs_readlink.c
ra02224e rb2709481 22 22 #include "imfs.h" 23 23 #include <rtems/libio_.h> 24 #include <rtems/seterr.h> 24 25 25 26 int IMFS_readlink( … … 35 36 36 37 if ( node->type != IMFS_SYM_LINK ) 37 set_errno_and_return_minus_one( EINVAL );38 rtems_set_errno_and_return_minus_one( EINVAL ); 38 39 39 40 for( i=0; ((i<bufsize) && (node->info.sym_link.name[i] != '\0')); i++ ) -
cpukit/libfs/src/imfs/imfs_stat.c
ra02224e rb2709481 21 21 #include "imfs.h" 22 22 #include <rtems/libio_.h> 23 #include <rtems/seterr.h> 23 24 24 25 int IMFS_stat( … … 50 51 51 52 default: 52 set_errno_and_return_minus_one( ENOTSUP );53 rtems_set_errno_and_return_minus_one( ENOTSUP ); 53 54 break; 54 55 } -
cpukit/libfs/src/imfs/imfs_symlink.c
ra02224e rb2709481 23 23 #include "imfs.h" 24 24 #include <rtems/libio_.h> 25 #include <rtems/seterr.h> 25 26 26 27 int IMFS_symlink( … … 56 57 57 58 if ( !new_node ) 58 set_errno_and_return_minus_one( ENOMEM );59 rtems_set_errno_and_return_minus_one( ENOMEM ); 59 60 60 61 return 0; -
cpukit/libfs/src/imfs/imfs_unlink.c
ra02224e rb2709481 23 23 #include "imfs.h" 24 24 #include <rtems/libio_.h> 25 #include <rtems/seterr.h> 25 26 26 27 int IMFS_unlink( … … 47 48 48 49 if ( !node->info.hard_link.link_node ) 49 set_errno_and_return_minus_one( EINVAL );50 rtems_set_errno_and_return_minus_one( EINVAL ); 50 51 51 52 the_link = *loc; -
cpukit/libfs/src/imfs/imfs_unmount.c
ra02224e rb2709481 28 28 #include "imfs.h" 29 29 #include <rtems/libio_.h> 30 #include <rtems/seterr.h> 30 31 31 32 int IMFS_unmount( … … 42 43 43 44 if ( node->type != IMFS_DIRECTORY ) 44 set_errno_and_return_minus_one( ENOTDIR );45 rtems_set_errno_and_return_minus_one( ENOTDIR ); 45 46 46 47 /* … … 49 50 50 51 if ( node->info.directory.mt_fs == NULL ) 51 set_errno_and_return_minus_one( EINVAL ); /* XXX */52 rtems_set_errno_and_return_minus_one( EINVAL ); /* XXX */ 52 53 53 54 /* -
cpukit/libfs/src/imfs/ioman.c
ra02224e rb2709481 26 26 #include <rtems.h> 27 27 #include <rtems/libio_.h> 28 #include <rtems/seterr.h> 28 29 #include "imfs.h" 29 30 … … 85 86 if ( !loc.ops->node_type_h ) { 86 87 rtems_filesystem_freenode( &loc ); 87 set_errno_and_return_minus_one( ENOTSUP );88 rtems_set_errno_and_return_minus_one( ENOTSUP ); 88 89 } 89 90 -
cpukit/libfs/src/imfs/linearfile.c
ra02224e rb2709481 29 29 #include "imfs.h" 30 30 #include <rtems/libio_.h> 31 #include <rtems/seterr.h> 31 32 32 33 /* … … 56 57 assert( the_jnode ); 57 58 if ( !the_jnode ) 58 set_errno_and_return_minus_one( EIO );59 rtems_set_errno_and_return_minus_one( EIO ); 59 60 60 61 assert( the_jnode->type == IMFS_LINEAR_FILE ); 61 62 if ( the_jnode->type != IMFS_LINEAR_FILE ) 62 set_errno_and_return_minus_one( EIO );63 rtems_set_errno_and_return_minus_one( EIO ); 63 64 64 65 /* … … 69 70 assert( dest ); 70 71 if ( !dest ) 71 set_errno_and_return_minus_one( EINVAL );72 rtems_set_errno_and_return_minus_one( EINVAL ); 72 73 73 74 /* -
cpukit/libfs/src/imfs/memfile.c
ra02224e rb2709481 30 30 #include "imfs.h" 31 31 #include <rtems/libio_.h> 32 #include <rtems/seterr.h> 32 33 33 34 #define MEMFILE_STATIC … … 209 210 else { /* Must be a block file (IMFS_MEMORY_FILE). */ 210 211 if (IMFS_memfile_extend( the_jnode, iop->offset )) 211 set_errno_and_return_minus_one( ENOSPC );212 rtems_set_errno_and_return_minus_one( ENOSPC ); 212 213 213 214 iop->size = the_jnode->info.file.size; … … 283 284 assert( the_jnode ); 284 285 if ( !the_jnode ) 285 set_errno_and_return_minus_one( EIO );286 rtems_set_errno_and_return_minus_one( EIO ); 286 287 287 288 assert( the_jnode->type == IMFS_MEMORY_FILE ); 288 289 if ( the_jnode->type != IMFS_MEMORY_FILE ) 289 set_errno_and_return_minus_one( EIO );290 rtems_set_errno_and_return_minus_one( EIO ); 290 291 291 292 if ( new_length >= IMFS_MEMFILE_MAXIMUM_SIZE ) 292 set_errno_and_return_minus_one( EINVAL );293 rtems_set_errno_and_return_minus_one( EINVAL ); 293 294 294 295 if ( new_length <= the_jnode->info.file.size ) … … 311 312 IMFS_memfile_remove_block( the_jnode, block ); 312 313 } 313 set_errno_and_return_minus_one( ENOSPC );314 rtems_set_errno_and_return_minus_one( ENOSPC ); 314 315 } 315 316 } … … 339 340 assert( the_jnode ); 340 341 if ( !the_jnode ) 341 set_errno_and_return_minus_one( EIO );342 rtems_set_errno_and_return_minus_one( EIO ); 342 343 343 344 assert( the_jnode->type == IMFS_MEMORY_FILE ); 344 345 if ( the_jnode->type != IMFS_MEMORY_FILE ) 345 set_errno_and_return_minus_one( EIO );346 rtems_set_errno_and_return_minus_one( EIO ); 346 347 347 348 block_entry_ptr = IMFS_memfile_get_block_pointer( the_jnode, block, 1 ); … … 470 471 assert( the_jnode ); 471 472 if ( !the_jnode ) 472 set_errno_and_return_minus_one( EIO );473 rtems_set_errno_and_return_minus_one( EIO ); 473 474 474 475 assert( the_jnode->type == IMFS_MEMORY_FILE ); 475 476 if ( the_jnode->type != IMFS_MEMORY_FILE ) 476 set_errno_and_return_minus_one( EIO );477 rtems_set_errno_and_return_minus_one( EIO ); 477 478 478 479 /* … … 564 565 assert( the_jnode ); 565 566 if ( !the_jnode ) 566 set_errno_and_return_minus_one( EIO );567 rtems_set_errno_and_return_minus_one( EIO ); 567 568 568 569 assert( the_jnode->type == IMFS_MEMORY_FILE || … … 570 571 if ( the_jnode->type != IMFS_MEMORY_FILE && 571 572 the_jnode->type != IMFS_LINEAR_FILE ) 572 set_errno_and_return_minus_one( EIO );573 rtems_set_errno_and_return_minus_one( EIO ); 573 574 574 575 /* … … 578 579 assert( dest ); 579 580 if ( !dest ) 580 set_errno_and_return_minus_one( EINVAL );581 rtems_set_errno_and_return_minus_one( EINVAL ); 581 582 582 583 /* … … 586 587 my_length = length; 587 588 if ( !my_length ) 588 set_errno_and_return_minus_one( EINVAL );589 rtems_set_errno_and_return_minus_one( EINVAL ); 589 590 590 591 /* … … 715 716 assert( the_jnode ); 716 717 if ( !the_jnode ) 717 set_errno_and_return_minus_one( EIO );718 rtems_set_errno_and_return_minus_one( EIO ); 718 719 719 720 assert( the_jnode->type == IMFS_MEMORY_FILE ); 720 721 if ( the_jnode->type != IMFS_MEMORY_FILE ) 721 set_errno_and_return_minus_one( EIO );722 rtems_set_errno_and_return_minus_one( EIO ); 722 723 723 724 /* … … 727 728 assert( source ); 728 729 if ( !source ) 729 set_errno_and_return_minus_one( EINVAL );730 rtems_set_errno_and_return_minus_one( EINVAL ); 730 731 731 732 … … 736 737 my_length = length; 737 738 if ( !my_length ) 738 set_errno_and_return_minus_one( EINVAL );739 rtems_set_errno_and_return_minus_one( EINVAL ); 739 740 740 741 /* … … 747 748 status = IMFS_memfile_extend( the_jnode, last_byte ); 748 749 if ( status ) 749 set_errno_and_return_minus_one( ENOSPC );750 rtems_set_errno_and_return_minus_one( ENOSPC ); 750 751 } 751 752
Note: See TracChangeset
for help on using the changeset viewer.
