src/usr.bin/file/file.c - diff

Return to file.c CVS log

Up to [local] / src / usr.bin / file

Diff for /src/usr.bin/file/file.c between version 1.41 and 1.42

version 1.41, 2015/05/29 11:03:37

version 1.42, 2015/05/29 11:59:01

Line 371

}

static void *

fill_buffer(struct input_file *inf)

fill_buffer(int fd, size_t size, size_t *used)

{

static void *buffer;

ssize_t got;

Line 382

buffer = xmalloc(FILE_READ_SIZE);

next = buffer;

left = inf->size;

left = size;

while (left != 0) {

got = read(inf->fd, next, left);

got = read(fd, next, left);

if (got == -1) {

if (errno == EINTR)

continue;

Line 395

next = (char *)next + got;

left -= got;

}

inf->size -= left;

*used = size - left;

return buffer;

}

static int

load_file(struct input_file *inf)

{

size_t used;

inf->size = inf->msg->sb.st_size;

if (inf->size > FILE_READ_SIZE)

inf->size = FILE_READ_SIZE;

Line 414

Line 416

inf->base = mmap(NULL, inf->size, PROT_READ, MAP_PRIVATE, inf->fd, 0);

if (inf->base == MAP_FAILED) {

inf->base = fill_buffer(inf);

inf->base = fill_buffer(inf->fd, inf->size, &used);

if (inf->base == NULL) {

xasprintf(&inf->result, "cannot read '%s' (%s)",

inf->path, strerror(errno));

return (1);

}

inf->size = used;

} else

inf->mapped = 1;

return (0);