diff options
| author | Pavel Pisa <pisa@cmp.felk.cvut.cz> | 2015-11-23 10:09:06 +0100 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2015-11-23 10:40:15 -0500 |
| commit | 9394aa5ed7ef6db28045e0103a6a174d9540d6c2 (patch) | |
| tree | ff22baff66da45a5cbdd0c01f2789af00a78b4b4 /cpukit/libfs/src/imfs | |
| parent | bsp/tms570: unite code duplication in pinmux and clean SCI close per review r... (diff) | |
| download | rtems-9394aa5ed7ef6db28045e0103a6a174d9540d6c2.tar.bz2 | |
untar: do not exit with error when created directory already exists.
The problem exists for both RTEMS untar implementations and their
variants: Untar_FromMemory(), Untar_FromFile() and rtems_tarfs_load().
If filesystem object already exists at extracted directory path
then if it is directory, creation is ignored. Attempt
to delete/unlink object and make directory is tried for other cases.
This simple approach problem reported in ticket fixes #2413.
Behavior follows GNU tar and BSD tar practice for directories
but much more work is required to achieve full semantics
of the full featured tar implementation still.
Diffstat (limited to 'cpukit/libfs/src/imfs')
| -rw-r--r-- | cpukit/libfs/src/imfs/imfs_load_tar.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/cpukit/libfs/src/imfs/imfs_load_tar.c b/cpukit/libfs/src/imfs/imfs_load_tar.c index 7228978094..adc91dd054 100644 --- a/cpukit/libfs/src/imfs/imfs_load_tar.c +++ b/cpukit/libfs/src/imfs/imfs_load_tar.c @@ -103,8 +103,24 @@ int rtems_tarfs_load( strcat(full_filename, "/"); ++len; strncat(full_filename, filename, 256-len-1); - rv = mkdir(full_filename, S_IRWXU | S_IRWXG | S_IRWXO); + if ( mkdir(full_filename, S_IRWXU | S_IRWXG | S_IRWXO) != 0 ) { + if (errno == EEXIST) { + struct stat stat_buf; + if ( stat(full_filename, &stat_buf) == 0 ) { + if ( S_ISDIR(stat_buf.st_mode) ) { + continue; + } else { + if ( unlink(full_filename) != -1 ) { + if ( mkdir(full_filename, S_IRWXU | S_IRWXG | S_IRWXO) == 0 ) + continue; + } + } + } + } + rv = -1; + } } + /* * Create a LINEAR_FILE node */ |