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

Fix untar mkdir when the directory exists.

Browse Source
This commit is contained in:
Chris Johns
2016-11-18 09:10:20 +11:00
parent bb5d97f3eb
commit 3a30c6fa5c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cpukit/libmisc/untar/untar.c
View File

@@ -189,7 +189,7 @@ Make_Path(const rtems_printer *printer, const char* filename, bool end_is_dir)
if (!path_end) { if (!path_end) {
r = mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO); r = mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO);
if (r < 0) { if (r < 0) {
Print_Error(printer, "mkdir", path); Print_Error(printer, "mkdir (unlink)", path);
free(copy); free(copy);
return -1; return -1;
} }
@@ -310,7 +310,7 @@ Untar_ProcessHeader(
} }
} else if (*linkflag == DIRTYPE) { } else if (*linkflag == DIRTYPE) {
int r; int r;
rtems_printf(printer, "untar: dir: %s\n", fname); rtems_printf(printer, "untar: dir: %s\n", fname);
if (Make_Path(printer, fname, true) < 0) { if (Make_Path(printer, fname, true) < 0) {
retval = UNTAR_FAIL; retval = UNTAR_FAIL;
} }
@@ -319,7 +319,9 @@ Untar_ProcessHeader(
if (errno == EEXIST) { if (errno == EEXIST) {
struct stat stat_buf; struct stat stat_buf;
if (stat(fname, &stat_buf) == 0) { if (stat(fname, &stat_buf) == 0) {
if (!S_ISDIR(stat_buf.st_mode)) { if (S_ISDIR(stat_buf.st_mode)) {
r = 0;
} else {
r = unlink(fname); r = unlink(fname);
if (r == 0) { if (r == 0) {
r = mkdir(fname, *mode); r = mkdir(fname, *mode);