aboutsummaryrefslogtreecommitdiff
path: root/archival/libunarchive/get_header_tar.c
diff options
context:
space:
mode:
Diffstat (limited to 'archival/libunarchive/get_header_tar.c')
-rw-r--r--archival/libunarchive/get_header_tar.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index 2cb141ede..365f464dd 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -75,7 +75,7 @@ extern char get_header_tar(archive_handle_t *archive_handle)
75#ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY 75#ifdef CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY
76 if (strncmp(tar.formated.magic, "\0\0\0\0\0", 5) != 0) 76 if (strncmp(tar.formated.magic, "\0\0\0\0\0", 5) != 0)
77#endif 77#endif
78 error_msg_and_die("Invalid tar magic"); 78 bb_error_msg_and_die("Invalid tar magic");
79 } 79 }
80 /* Do checksum on headers */ 80 /* Do checksum on headers */
81 for (i = 0; i < 148 ; i++) { 81 for (i = 0; i < 148 ; i++) {
@@ -86,7 +86,7 @@ extern char get_header_tar(archive_handle_t *archive_handle)
86 sum += tar.raw[i]; 86 sum += tar.raw[i];
87 } 87 }
88 if (sum != strtol(tar.formated.chksum, NULL, 8)) { 88 if (sum != strtol(tar.formated.chksum, NULL, 8)) {
89 error_msg("Invalid tar header checksum"); 89 bb_error_msg("Invalid tar header checksum");
90 return(EXIT_FAILURE); 90 return(EXIT_FAILURE);
91 } 91 }
92 92
@@ -116,7 +116,7 @@ extern char get_header_tar(archive_handle_t *archive_handle)
116 file_header->size = strtol(tar.formated.size, NULL, 8); 116 file_header->size = strtol(tar.formated.size, NULL, 8);
117 file_header->mtime = strtol(tar.formated.mtime, NULL, 8); 117 file_header->mtime = strtol(tar.formated.mtime, NULL, 8);
118 file_header->link_name = (tar.formated.linkname[0] != '\0') ? 118 file_header->link_name = (tar.formated.linkname[0] != '\0') ?
119 xstrdup(tar.formated.linkname) : NULL; 119 bb_xstrdup(tar.formated.linkname) : NULL;
120 file_header->device = (dev_t) ((strtol(tar.formated.devmajor, NULL, 8) << 8) + 120 file_header->device = (dev_t) ((strtol(tar.formated.devmajor, NULL, 8) << 8) +
121 strtol(tar.formated.devminor, NULL, 8)); 121 strtol(tar.formated.devminor, NULL, 8));
122 122
@@ -129,7 +129,7 @@ extern char get_header_tar(archive_handle_t *archive_handle)
129 file_header->mode |= S_IFREG; 129 file_header->mode |= S_IFREG;
130 break; 130 break;
131 case '1': 131 case '1':
132 error_msg("Internal hard link not supported"); 132 bb_error_msg("Internal hard link not supported");
133 break; 133 break;
134 case '2': 134 case '2':
135 file_header->mode |= S_IFLNK; 135 file_header->mode |= S_IFLNK;
@@ -170,7 +170,7 @@ extern char get_header_tar(archive_handle_t *archive_handle)
170 case 'N': 170 case 'N':
171 case 'S': 171 case 'S':
172 case 'V': 172 case 'V':
173 error_msg("Ignoring GNU extension type %c", tar.formated.typeflag); 173 bb_error_msg("Ignoring GNU extension type %c", tar.formated.typeflag);
174# endif 174# endif
175 } 175 }
176#endif 176#endif