Changeset 368ee04 in mainline for uspace/app/untar/main.c
- Timestamp:
- 2017-04-05T18:10:39Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 93ad8166
- Parents:
- 39f892a9 (diff), 2166728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/untar/main.c
r39f892a9 r368ee04 35 35 #include <stdio.h> 36 36 #include <stdlib.h> 37 #include <sys/stat.h>38 37 #include <errno.h> 39 38 #include <str_error.h> 39 #include <vfs/vfs.h> 40 40 #include "tar.h" 41 41 … … 103 103 static int handle_directory(const tar_header_t *header, FILE *tarfile) 104 104 { 105 if (mkdir(header->filename, 0755) != 0) { 106 if (errno != EEXIST) { 105 int rc; 106 107 rc = vfs_link_path(header->filename, KIND_DIRECTORY, NULL); 108 if (rc != EOK) { 109 if (rc != EEXIST) { 107 110 fprintf(stderr, "Failed to create directory %s: %s.\n", 108 header->filename, str_error( errno));109 return errno;111 header->filename, str_error(rc)); 112 return rc; 110 113 } 111 114 }
Note:
See TracChangeset
for help on using the changeset viewer.