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

untar.c: Coverity ID 26151 and reformat

Browse Source 
The Coverity issue was an ignored return value from a read()
in a loop which should have been a seek() since the data
read was ignored.

The file itself needed reformatting to conform to RTEMS style.
This commit is contained in:
Joel Sherrill
2014-12-14 17:30:23 -06:00
parent 1ae7baf2d8
commit 09220c8129
1 changed files with 242 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,19 +1,19 @@
/**
* @file
*
* @brief Untar an Image
* @ingroup libmisc_untar_img Untar Image
*
* FIXME:
* 1. Symbolic links are not created.
* 2. Untar_FromMemory uses FILE *fp.
* 3. How to determine end of archive?
*
*/
/*
* Written by: Jake Janovetz <janovetz@tempest.ece.uiuc.edu>
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rtems.org/license/LICENSE.
@@ -34,9 +34,9 @@
#include <rtems/bspIo.h>
/**************************************************************************
/*
* TAR file format:
*
* Offset Length Contents
* 0 100 bytes File name ('\0' terminated, 99 maxmum length)
* 100 8 bytes File mode (in octal ascii)
@@ -63,14 +63,14 @@
* sum = 0;
* for(i = 0; i < 512; i++)
* sum += 0xFF & header[i];
*************************************************************************/
*/
#define MAX_NAME_FIELD_SIZE 99
/**************************************************************************
/*
* This converts octal ASCII number representations into an
* unsigned long. Only support 32-bit numbers for now.
*************************************************************************/
*/
unsigned long
_rtems_octal2ulong(
const char *octascii,
@@ -81,10 +81,8 @@ _rtems_octal2ulong(
unsigned long num;
num = 0;
for (i=0; i < len; i++)
{
if ((octascii[i] < '0') || (octascii[i] > '9'))
{
for (i=0; i < len; i++) {
if ((octascii[i] < '0') || (octascii[i] > '9')) {
continue;
}
num = num * 8 + ((unsigned long)(octascii[i] - '0'));
@@ -92,29 +90,28 @@ _rtems_octal2ulong(
return(num);
}
/**************************************************************************
* Function: Untar_FromMemory *
**************************************************************************
* Description: *
* *
* This is a simple subroutine used to rip links, directories, and *
* files out of a block of memory. *
* *
* *
* Inputs: *
* *
* void * tar_buf - Pointer to TAR buffer. *
* size_t size - Length of TAR buffer. *
* *
* *
* Output: *
* *
* int - UNTAR_SUCCESSFUL (0) on successful completion. *
* UNTAR_INVALID_CHECKSUM for an invalid header checksum. *
* UNTAR_INVALID_HEADER for an invalid header. *
* *
**************************************************************************/
/*
* Function: Untar_FromMemory
*
* Description:
*
* This is a simple subroutine used to rip links, directories, and
* files out of a block of memory.
*
*
* Inputs:
*
* void * tar_buf - Pointer to TAR buffer.
* size_t size - Length of TAR buffer.
*
*
* Output:
*
* int - UNTAR_SUCCESSFUL (0) on successful completion.
* UNTAR_INVALID_CHECKSUM for an invalid header checksum.
* UNTAR_INVALID_HEADER for an invalid header.
*
*/
int
Untar_FromMemory(
void *tar_buf,
@@ -136,12 +133,9 @@ Untar_FromMemory(
unsigned long file_size;
unsigned char linkflag;
ptr = 0;
while (1)
{
if (ptr + 512 > size)
{
while (1) {
if (ptr + 512 > size) {
retval = UNTAR_SUCCESSFUL;
break;
}
@@ -149,8 +143,7 @@ Untar_FromMemory(
/* Read the header */
bufr = &tar_ptr[ptr];
ptr += 512;
if (strncmp(&bufr[257], "ustar", 5))
{
if (strncmp(&bufr[257], "ustar", 5)) {
retval = UNTAR_SUCCESSFUL;
break;
}
@@ -161,54 +154,44 @@ Untar_FromMemory(
linkflag = bufr[156];
file_size = _rtems_octal2ulong(&bufr[124], 12);
/******************************************************************
/*
* Compute the TAR checksum and check with the value in
* the archive. The checksum is computed over the entire
* header, but the checksum field is substituted with blanks.
******************************************************************/
*/
hdr_chksum = _rtems_octal2ulong(&bufr[148], 8);
sum = _rtems_tar_header_checksum(bufr);
if (sum != hdr_chksum)
{
if (sum != hdr_chksum) {
retval = UNTAR_INVALID_CHECKSUM;
break;
}
/******************************************************************
/*
* We've decoded the header, now figure out what it contains and
* do something with it.
*****************************************************************/
if (linkflag == SYMTYPE)
{
*/
if (linkflag == SYMTYPE) {
strncpy(linkname, &bufr[157], MAX_NAME_FIELD_SIZE);
linkname[MAX_NAME_FIELD_SIZE] = '\0';
symlink(linkname, fname);
}
else if (linkflag == REGTYPE)
{
} else if (linkflag == REGTYPE) {
nblocks = (((file_size) + 511) & ~511) / 512;
if ((fp = fopen(fname, "w")) == NULL)
{
if ((fp = fopen(fname, "w")) == NULL) {
printk("Untar: failed to create file %s\n", fname);
ptr += 512 * nblocks;
}
else
{
} else {
unsigned long sizeToGo = file_size;
size_t len;
/***************************************************************
/*
* Read out the data. There are nblocks of data where nblocks
* is the file_size rounded to the nearest 512-byte boundary.
**************************************************************/
for (i=0; i<nblocks; i++)
{
*/
for (i=0; i<nblocks; i++) {
len = ((sizeToGo < 512L)?(sizeToGo):(512L));
n = fwrite(&tar_ptr[ptr], 1, len, fp);
if (n != len)
{
if (n != len) {
printk("untar: Error during write\n");
retval = UNTAR_FAIL;
break;
@@ -218,9 +201,7 @@ Untar_FromMemory(
}
fclose(fp);
}
}
else if (linkflag == DIRTYPE)
{
} else if (linkflag == DIRTYPE) {
if ( mkdir(fname, S_IRWXU | S_IRWXG | S_IRWXO) != 0 ) {
printk("Untar: failed to create directory %s\n", fname);
retval = UNTAR_FAIL;
@@ -232,31 +213,24 @@ Untar_FromMemory(
return(retval);
}
/**************************************************************************
* Function: Untar_FromFile *
**************************************************************************
* Description: *
* *
* This is a simple subroutine used to rip links, directories, and *
* files out of a TAR file. *
* *
* *
* Inputs: *
* *
* const char *tar_name - TAR filename. *
* *
* *
* Output: *
* *
* int - UNTAR_SUCCESSFUL (0) on successful completion. *
* UNTAR_INVALID_CHECKSUM for an invalid header checksum. *
* UNTAR_INVALID_HEADER for an invalid header. *
* *
**************************************************************************
* Change History: *
* 12/30/1998 - Creation (JWJ) *
*************************************************************************/
/*
* Function: Untar_FromFile
*
* Description:
*
* This is a simple subroutine used to rip links, directories, and
* files out of a TAR file.
*
* Inputs:
*
* const char *tar_name - TAR filename.
*
* Output:
*
* int - UNTAR_SUCCESSFUL (0) on successful completion.
* UNTAR_INVALID_CHECKSUM for an invalid header checksum.
* UNTAR_INVALID_HEADER for an invalid header.
*/
int
Untar_FromFile(
const char *tar_name
@@ -287,18 +261,14 @@ Untar_FromFile(
return(UNTAR_FAIL);
}
while (1)
{
while (1) {
/* Read the header */
/* If the header read fails, we just consider it the end
of the tarfile. */
if ((n = read(fd, bufr, 512)) != 512)
{
/* If the header read fails, we just consider it the end of the tarfile. */
if ((n = read(fd, bufr, 512)) != 512) {
break;
}
if (strncmp(&bufr[257], "ustar", 5))
{
if (strncmp(&bufr[257], "ustar", 5)) {
break;
}
@@ -308,61 +278,48 @@ Untar_FromFile(
linkflag = bufr[156];
size = _rtems_octal2ulong(&bufr[124], 12);
/******************************************************************
/*
* Compute the TAR checksum and check with the value in
* the archive. The checksum is computed over the entire
* header, but the checksum field is substituted with blanks.
******************************************************************/
*/
hdr_chksum = _rtems_octal2ulong(&bufr[148], 8);
sum = _rtems_tar_header_checksum(bufr);
if (sum != hdr_chksum)
{
if (sum != hdr_chksum) {
retval = UNTAR_INVALID_CHECKSUM;
break;
}
/******************************************************************
/*
* We've decoded the header, now figure out what it contains and
* do something with it.
*****************************************************************/
if (linkflag == SYMTYPE)
{
*/
if (linkflag == SYMTYPE) {
strncpy(linkname, &bufr[157], MAX_NAME_FIELD_SIZE);
linkname[MAX_NAME_FIELD_SIZE] = '\0';
symlink(linkname,fname);
}
else if (linkflag == REGTYPE)
{
} else if (linkflag == REGTYPE) {
int out_fd;
/******************************************************************
/*
* Read out the data. There are nblocks of data where nblocks
* is the size rounded to the nearest 512-byte boundary.
*****************************************************************/
*/
nblocks = (((size) + 511) & ~511) / 512;
if ((out_fd = creat(fname, 0644)) == -1)
{
for (i=0; i<nblocks; i++)
{
n = read(fd, bufr, 512);
}
}
else
{
for (i=0; i<nblocks; i++)
{
if ((out_fd = creat(fname, 0644)) == -1) {
(void) lseek(fd, SEEK_CUR, 512 * nblocks);
} else {
for (i=0; i<nblocks; i++) {
n = read(fd, bufr, 512);
n = MIN(n, size - i*512);
write(out_fd, bufr, n);
(void) write(out_fd, bufr, n);
}
close(out_fd);
}
}
else if (linkflag == DIRTYPE)
{
mkdir(fname, S_IRWXU | S_IRWXG | S_IRWXO);
} else if (linkflag == DIRTYPE) {
(void) mkdir(fname, S_IRWXU | S_IRWXG | S_IRWXO);
}
}
free(bufr);
@@ -371,11 +328,11 @@ Untar_FromFile(
return(retval);
}
/************************************************************************
/*
* Compute the TAR checksum and check with the value in
* the archive. The checksum is computed over the entire
* header, but the checksum field is substituted with blanks.
************************************************************************/
*/
int
_rtems_tar_header_checksum(
const char *bufr
@@ -384,8 +341,7 @@ _rtems_tar_header_checksum(
int i, sum;
sum = 0;
for (i=0; i<512; i++)
{
for (i=0; i<512; i++) {
if ((i >= 148) && (i < 156))
sum += 0xff & ' ';
else