emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run through ident, fix comments

Browse Source
This commit is contained in:
Glenn L McGrath
2002-08-22 17:47:09 +00:00
parent 242e3b6bde
commit 99b12543cf
1 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
archival/libunarchive/get_header_tar.c
View File

@@ -20,7 +20,7 @@
#include "unarchive.h"
#include "libbb.h"
file_header_t *get_header_tar(FILE *tar_stream)
file_header_t *get_header_tar(FILE * tar_stream)
{
union {
unsigned char raw[512];
@@ -55,8 +55,7 @@ file_header_t *get_header_tar(FILE *tar_stream)
if (fread(tar.raw, 1, 512, tar_stream) != 512) {
/* Unfortunatly its common for tar files to have all sorts of
* trailing garbage, fail silently */
// error_msg("Couldnt read header");
return(NULL);
return (NULL);
}
archive_offset += 512;
@@ -67,25 +66,25 @@ file_header_t *get_header_tar(FILE *tar_stream)
#ifdef CONFIG_FEATURE_TAR_OLD_FORMAT
if (strncmp(tar.formated.magic, "\0\0\0\0\0", 5) != 0)
#endif
return(NULL);
return (NULL);
}
/* If there is no filename its an empty header, skip it */
if (tar.formated.name[0] == 0) {
return(NULL);
return (NULL);
}
/* Do checksum on headers */
for (i = 0; i < 148 ; i++) {
for (i = 0; i < 148; i++) {
sum += tar.raw[i];
}
sum += ' ' * 8;
for (i = 156; i < 512 ; i++) {
for (i = 156; i < 512; i++) {
sum += tar.raw[i];
}
if (sum != strtol(tar.formated.chksum, NULL, 8)) {
error_msg("Invalid tar header checksum");
return(NULL);
return (NULL);
}
/* convert to type'ed variables */
@@ -93,7 +92,8 @@ file_header_t *get_header_tar(FILE *tar_stream)
if (tar.formated.prefix[0] == 0) {
tar_entry->name = xstrdup(tar.formated.name);
} else {
tar_entry->name = concat_path_file(tar.formated.prefix, tar.formated.name);
tar_entry->name =
concat_path_file(tar.formated.prefix, tar.formated.name);
}
tar_entry->mode = strtol(tar.formated.mode, NULL, 8);
@@ -126,11 +126,11 @@ file_header_t *get_header_tar(FILE *tar_stream)
tar_entry->gid = strtol(tar.formated.gid, NULL, 8);
tar_entry->size = strtol(tar.formated.size, NULL, 8);
tar_entry->mtime = strtol(tar.formated.mtime, NULL, 8);
tar_entry->link_name = strlen(tar.formated.linkname) ?
xstrdup(tar.formated.linkname) : NULL;
tar_entry->device = (strtol(tar.formated.devmajor, NULL, 8) << 8) +
tar_entry->link_name =
strlen(tar.formated.linkname) ? xstrdup(tar.formated.linkname) : NULL;
tar_entry->device =
(strtol(tar.formated.devmajor, NULL, 8) << 8) +
strtol(tar.formated.devminor, NULL, 8);
return(tar_entry);
return (tar_entry);
}