BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace getOctal with strtol( , NULL, 8) 

saves 100 Bytes
1_00_stable_10817
Glenn L McGrath 2001-04-11 05:01:09 +00:00
parent 7dc8d227a5
commit 48081f81bd
2 changed files with 16 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
archival/tar.c
View File

@ -476,26 +476,6 @@ tarExtractSpecial(TarInfo *header, int extractFlag, int tostdoutFlag)
return( TRUE); return( TRUE);
} }
/* Read an octal value in a field of the specified width, with optional
* spaces on both sides of the number and with an optional null character
* at the end. Returns -1 on an illegal format. */
static long getOctal(const char *cp, int size)
{
long val = 0;
for(;(size > 0) && (*cp == ' '); cp++, size--);
if ((size == 0) || !is_octal(*cp))
return -1;
for(; (size > 0) && is_octal(*cp); size--) {
val = val * 8 + *cp++ - '0';
}
for (;(size > 0) && (*cp == ' '); cp++, size--);
if ((size > 0) && *cp)
return -1;
return val;
}
/* Parse the tar header and fill in the nice struct with the details */ /* Parse the tar header and fill in the nice struct with the details */
static int static int
readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header) readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header)
@ -518,16 +498,16 @@ readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header)
} }
} }
header->mode = getOctal(rawHeader->mode, sizeof(rawHeader->mode)); header->mode = strtol(rawHeader->mode, NULL, 8);
header->uid = getOctal(rawHeader->uid, sizeof(rawHeader->uid)); header->uid = strtol(rawHeader->uid, NULL, 8);
header->gid = getOctal(rawHeader->gid, sizeof(rawHeader->gid)); header->gid = strtol(rawHeader->gid, NULL, 8);
header->size = getOctal(rawHeader->size, sizeof(rawHeader->size)); header->size = strtol(rawHeader->size, NULL, 8);
header->mtime = getOctal(rawHeader->mtime, sizeof(rawHeader->mtime)); header->mtime = strtol(rawHeader->mtime, NULL, 8);
chksum = getOctal(rawHeader->chksum, sizeof(rawHeader->chksum)); chksum = strtol(rawHeader->chksum, NULL, 8);
header->type = rawHeader->typeflag; header->type = rawHeader->typeflag;
header->linkname = rawHeader->linkname; header->linkname = rawHeader->linkname;
header->devmajor = getOctal(rawHeader->devmajor, sizeof(rawHeader->devmajor)); header->devmajor = strtol(rawHeader->devmajor, NULL, 8);
header->devminor = getOctal(rawHeader->devminor, sizeof(rawHeader->devminor)); header->devminor = strtol(rawHeader->devminor, NULL, 8);
/* Check the checksum */ /* Check the checksum */
for (i = sizeof(*rawHeader); i-- != 0;) { for (i = sizeof(*rawHeader); i-- != 0;) {

36
tar.c
View File

@ -476,26 +476,6 @@ tarExtractSpecial(TarInfo *header, int extractFlag, int tostdoutFlag)
return( TRUE); return( TRUE);
} }
/* Read an octal value in a field of the specified width, with optional
* spaces on both sides of the number and with an optional null character
* at the end. Returns -1 on an illegal format. */
static long getOctal(const char *cp, int size)
{
long val = 0;
for(;(size > 0) && (*cp == ' '); cp++, size--);
if ((size == 0) || !is_octal(*cp))
return -1;
for(; (size > 0) && is_octal(*cp); size--) {
val = val * 8 + *cp++ - '0';
}
for (;(size > 0) && (*cp == ' '); cp++, size--);
if ((size > 0) && *cp)
return -1;
return val;
}
/* Parse the tar header and fill in the nice struct with the details */ /* Parse the tar header and fill in the nice struct with the details */
static int static int
readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header) readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header)
@ -518,16 +498,16 @@ readTarHeader(struct TarHeader *rawHeader, struct TarInfo *header)
} }
} }
header->mode = getOctal(rawHeader->mode, sizeof(rawHeader->mode)); header->mode = strtol(rawHeader->mode, NULL, 8);
header->uid = getOctal(rawHeader->uid, sizeof(rawHeader->uid)); header->uid = strtol(rawHeader->uid, NULL, 8);
header->gid = getOctal(rawHeader->gid, sizeof(rawHeader->gid)); header->gid = strtol(rawHeader->gid, NULL, 8);
header->size = getOctal(rawHeader->size, sizeof(rawHeader->size)); header->size = strtol(rawHeader->size, NULL, 8);
header->mtime = getOctal(rawHeader->mtime, sizeof(rawHeader->mtime)); header->mtime = strtol(rawHeader->mtime, NULL, 8);
chksum = getOctal(rawHeader->chksum, sizeof(rawHeader->chksum)); chksum = strtol(rawHeader->chksum, NULL, 8);
header->type = rawHeader->typeflag; header->type = rawHeader->typeflag;
header->linkname = rawHeader->linkname; header->linkname = rawHeader->linkname;
header->devmajor = getOctal(rawHeader->devmajor, sizeof(rawHeader->devmajor)); header->devmajor = strtol(rawHeader->devmajor, NULL, 8);
header->devminor = getOctal(rawHeader->devminor, sizeof(rawHeader->devminor)); header->devminor = strtol(rawHeader->devminor, NULL, 8);
/* Check the checksum */ /* Check the checksum */
for (i = sizeof(*rawHeader); i-- != 0;) { for (i = sizeof(*rawHeader); i-- != 0;) {