Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Bump microtar to pull in bugfixes from upstream

Browse Source 
The change is necessary for an upcoming change to CMakeLists
This commit is contained in:
Dennis Luxen 2019-11-14 15:54:45 +01:00
parent 0b139ff05d
commit 14746fc7c4
2 changed files with 35 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
third_party/microtar/src/microtar.c vendored
View File

@ -41,7 +41,7 @@ typedef struct {
} mtar_raw_header_t; } mtar_raw_header_t;
static mtar_size_t round_up(mtar_size_t n, unsigned incr) { static unsigned round_up(unsigned n, unsigned incr) {
return n + (incr - n % incr) % incr; return n + (incr - n % incr) % incr;
} }
@ -60,14 +60,14 @@ static unsigned checksum(const mtar_raw_header_t* rh) {
} }
static int tread(mtar_t *tar, void *data, mtar_size_t size) { static int tread(mtar_t *tar, void *data, unsigned size) {
int err = tar->read(tar, data, size); int err = tar->read(tar, data, size);
tar->pos += size; tar->pos += size;
return err; return err;
} }
static int twrite(mtar_t *tar, const void *data, mtar_size_t size) { static int twrite(mtar_t *tar, const void *data, unsigned size) {
int err = tar->write(tar, data, size); int err = tar->write(tar, data, size);
tar->pos += size; tar->pos += size;
return err; return err;
@ -89,7 +89,6 @@ static int write_null_bytes(mtar_t *tar, int n) {
static int raw_to_header(mtar_header_t *h, const mtar_raw_header_t *rh) { static int raw_to_header(mtar_header_t *h, const mtar_raw_header_t *rh) {
unsigned chksum1, chksum2; unsigned chksum1, chksum2;
mtar_size_t filesize;
/* If the checksum starts with a null byte we assume the record is NULL */ /* If the checksum starts with a null byte we assume the record is NULL */
if (*rh->checksum == '\0') { if (*rh->checksum == '\0') {
@ -106,68 +105,24 @@ static int raw_to_header(mtar_header_t *h, const mtar_raw_header_t *rh) {
/* Load raw header into header */ /* Load raw header into header */
sscanf(rh->mode, "%o", &h->mode); sscanf(rh->mode, "%o", &h->mode);
sscanf(rh->owner, "%o", &h->owner); sscanf(rh->owner, "%o", &h->owner);
sscanf(rh->size, "%o", &h->size);
sscanf(rh->mtime, "%o", &h->mtime); sscanf(rh->mtime, "%o", &h->mtime);
h->type = rh->type; h->type = rh->type;
strcpy(h->name, rh->name); strcpy(h->name, rh->name);
strcpy(h->linkname, rh->linkname); strcpy(h->linkname, rh->linkname);
/* Load size field */
if ((rh->size[0] & 0x80) == 0) {
#ifdef _MSC_VER
sscanf(rh->size, "%12llo", &h->size);
#else
sscanf(rh->size, "%12lo", &h->size);
#endif
} else {
h->size = (rh->size[0] & 0x7f) | (rh->size[0] & 0x40 ? 0x80 : 0);
uint8_t *p8 = (uint8_t *)&rh->size + 1;
while (p8 != (uint8_t *)&rh->size + sizeof(rh->size)) {
if (h->size >= ((mtar_size_t)1 << (sizeof(h->size) - 1) * 8)) {
return MTAR_EFAILURE;
}
h->size = ((mtar_size_t)h->size << 8) + *p8++;
}
}
return MTAR_ESUCCESS; return MTAR_ESUCCESS;
} }
static int header_to_raw(mtar_raw_header_t *rh, const mtar_header_t *h) { static int header_to_raw(mtar_raw_header_t *rh, const mtar_header_t *h) {
unsigned chksum; unsigned chksum;
mtar_size_t filesize = h->size;
/* Load header into raw header */ /* Load header into raw header */
memset(rh, 0, sizeof(*rh)); memset(rh, 0, sizeof(*rh));
/* Store size in ASCII octal digits or base-256 formats */
if (sizeof(mtar_size_t) <= 4 || filesize <= (mtar_size_t)077777777777LL) {
#ifdef _MSC_VER
sprintf(rh->size, "%llo", h->size);
#else
sprintf(rh->size, "%lo", h->size);
#endif
} else if (sizeof(filesize) < sizeof(rh->size)) {
/* GNU tar uses "base-256 encoding" for very large numbers.
* Encoding is binary, with highest bit always set as a marker
* and sign in next-highest bit:
* 80 00 .. 00 - zero
* bf ff .. ff - largest positive number
* ff ff .. ff - minus 1
* c0 00 .. 00 - smallest negative number
*/
uint8_t *p8 = (uint8_t *)&rh->size + sizeof(rh->size);
do {
*--p8 = (uint8_t)filesize;
filesize >>= 8;
} while (p8 != (uint8_t *)&rh->size);
*p8 |= 0x80;
} else {
return MTAR_EFAILURE;
}
sprintf(rh->mode, "%o", h->mode); sprintf(rh->mode, "%o", h->mode);
sprintf(rh->owner, "%o", h->owner); sprintf(rh->owner, "%o", h->owner);
sprintf(rh->size, "%o", h->size);
sprintf(rh->mtime, "%o", h->mtime); sprintf(rh->mtime, "%o", h->mtime);
rh->type = h->type ? h->type : MTAR_TREG; rh->type = h->type ? h->type : MTAR_TREG;
strcpy(rh->name, h->name); strcpy(rh->name, h->name);
@ -198,17 +153,17 @@ const char* mtar_strerror(int err) {
} }
static int file_write(mtar_t *tar, const void *data, mtar_size_t size) { static int file_write(mtar_t *tar, const void *data, unsigned size) {
mtar_size_t res = fwrite(data, 1, size, tar->stream); unsigned res = fwrite(data, 1, size, tar->stream);
return (res == size) ? MTAR_ESUCCESS : MTAR_EWRITEFAIL; return (res == size) ? MTAR_ESUCCESS : MTAR_EWRITEFAIL;
} }
static int file_read(mtar_t *tar, void *data, mtar_size_t size) { static int file_read(mtar_t *tar, void *data, unsigned size) {
mtar_size_t res = fread(data, 1, size, tar->stream); unsigned res = fread(data, 1, size, tar->stream);
return (res == size) ? MTAR_ESUCCESS : MTAR_EREADFAIL; return (res == size) ? MTAR_ESUCCESS : MTAR_EREADFAIL;
} }
static int file_seek(mtar_t *tar, mtar_size_t offset) { static int file_seek(mtar_t *tar, unsigned offset) {
int res = fseek(tar->stream, offset, SEEK_SET); int res = fseek(tar->stream, offset, SEEK_SET);
return (res == 0) ? MTAR_ESUCCESS : MTAR_ESEEKFAIL; return (res == 0) ? MTAR_ESUCCESS : MTAR_ESEEKFAIL;
} }
@ -232,7 +187,7 @@ int mtar_open(mtar_t *tar, const char *filename, const char *mode) {
/* Assure mode is always binary */ /* Assure mode is always binary */
if ( strchr(mode, 'r') ) mode = "rb"; if ( strchr(mode, 'r') ) mode = "rb";
if ( strchr(mode, 'w') ) mode = "w+b"; if ( strchr(mode, 'w') ) mode = "wb";
if ( strchr(mode, 'a') ) mode = "ab"; if ( strchr(mode, 'a') ) mode = "ab";
/* Open file */ /* Open file */
tar->stream = fopen(filename, mode); tar->stream = fopen(filename, mode);
@ -258,7 +213,7 @@ int mtar_close(mtar_t *tar) {
} }
int mtar_seek(mtar_t *tar, mtar_size_t pos) { int mtar_seek(mtar_t *tar, unsigned pos) {
int err = tar->seek(tar, pos); int err = tar->seek(tar, pos);
tar->pos = pos; tar->pos = pos;
return err; return err;
@ -273,8 +228,7 @@ int mtar_rewind(mtar_t *tar) {
int mtar_next(mtar_t *tar) { int mtar_next(mtar_t *tar) {
mtar_size_t n; int err, n;
int err;
mtar_header_t h; mtar_header_t h;
/* Load header */ /* Load header */
err = mtar_read_header(tar, &h); err = mtar_read_header(tar, &h);
@ -333,7 +287,7 @@ int mtar_read_header(mtar_t *tar, mtar_header_t *h) {
} }
int mtar_read_data(mtar_t *tar, void *ptr, mtar_size_t size) { int mtar_read_data(mtar_t *tar, void *ptr, unsigned size) {
int err; int err;
/* If we have no remaining data then this is the first read, we get the size, /* If we have no remaining data then this is the first read, we get the size,
* set the remaining data and seek to the beginning of the data */ * set the remaining data and seek to the beginning of the data */
@ -375,7 +329,7 @@ int mtar_write_header(mtar_t *tar, const mtar_header_t *h) {
} }
int mtar_write_file_header(mtar_t *tar, const char *name, mtar_size_t size) { int mtar_write_file_header(mtar_t *tar, const char *name, unsigned size) {
mtar_header_t h; mtar_header_t h;
/* Build header */ /* Build header */
memset(&h, 0, sizeof(h)); memset(&h, 0, sizeof(h));
@ -400,7 +354,7 @@ int mtar_write_dir_header(mtar_t *tar, const char *name) {
} }
int mtar_write_data(mtar_t *tar, const void *data, mtar_size_t size) { int mtar_write_data(mtar_t *tar, const void *data, unsigned size) {
int err; int err;
/* Write data */ /* Write data */
err = twrite(tar, data, size); err = twrite(tar, data, size);

33
third_party/microtar/src/microtar.h vendored
View File

@ -8,14 +8,16 @@
#ifndef MICROTAR_H #ifndef MICROTAR_H
#define MICROTAR_H #define MICROTAR_H
#ifdef __cplusplus
extern "C"
{
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h>
#define MTAR_VERSION "0.1.0" #define MTAR_VERSION "0.1.0"
typedef size_t mtar_size_t;
enum { enum {
MTAR_ESUCCESS = 0, MTAR_ESUCCESS = 0,
MTAR_EFAILURE = -1, MTAR_EFAILURE = -1,
@ -41,7 +43,7 @@ enum {
typedef struct { typedef struct {
unsigned mode; unsigned mode;
unsigned owner; unsigned owner;
mtar_size_t size; unsigned size;
unsigned mtime; unsigned mtime;
unsigned type; unsigned type;
char name[100]; char name[100];
@ -52,14 +54,14 @@ typedef struct {
typedef struct mtar_t mtar_t; typedef struct mtar_t mtar_t;
struct mtar_t { struct mtar_t {
int (*read)(mtar_t *tar, void *data, mtar_size_t size); int (*read)(mtar_t *tar, void *data, unsigned size);
int (*write)(mtar_t *tar, const void *data, mtar_size_t size); int (*write)(mtar_t *tar, const void *data, unsigned size);
int (*seek)(mtar_t *tar, mtar_size_t pos); int (*seek)(mtar_t *tar, unsigned pos);
int (*close)(mtar_t *tar); int (*close)(mtar_t *tar);
void *stream; void *stream;
mtar_size_t pos; unsigned pos;
mtar_size_t remaining_data; unsigned remaining_data;
mtar_size_t last_header; unsigned last_header;
}; };
@ -68,18 +70,21 @@ const char* mtar_strerror(int err);
int mtar_open(mtar_t *tar, const char *filename, const char *mode); int mtar_open(mtar_t *tar, const char *filename, const char *mode);
int mtar_close(mtar_t *tar); int mtar_close(mtar_t *tar);
int mtar_seek(mtar_t *tar, mtar_size_t pos); int mtar_seek(mtar_t *tar, unsigned pos);
int mtar_rewind(mtar_t *tar); int mtar_rewind(mtar_t *tar);
int mtar_next(mtar_t *tar); int mtar_next(mtar_t *tar);
int mtar_find(mtar_t *tar, const char *name, mtar_header_t *h); int mtar_find(mtar_t *tar, const char *name, mtar_header_t *h);
int mtar_read_header(mtar_t *tar, mtar_header_t *h); int mtar_read_header(mtar_t *tar, mtar_header_t *h);
int mtar_read_data(mtar_t *tar, void *ptr, mtar_size_t size); int mtar_read_data(mtar_t *tar, void *ptr, unsigned size);
int mtar_write_header(mtar_t *tar, const mtar_header_t *h); int mtar_write_header(mtar_t *tar, const mtar_header_t *h);
int mtar_write_file_header(mtar_t *tar, const char *name, mtar_size_t size); int mtar_write_file_header(mtar_t *tar, const char *name, unsigned size);
int mtar_write_dir_header(mtar_t *tar, const char *name); int mtar_write_dir_header(mtar_t *tar, const char *name);
int mtar_write_data(mtar_t *tar, const void *data, mtar_size_t size); int mtar_write_data(mtar_t *tar, const void *data, unsigned size);
int mtar_finalize(mtar_t *tar); int mtar_finalize(mtar_t *tar);
#ifdef __cplusplus
}
#endif
#endif #endif