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

Return to magic-load.c CVS log

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

Diff for /src/usr.bin/file/magic-load.c between version 1.25 and 1.26

version 1.25, 2017/07/01 14:34:29

version 1.26, 2017/07/02 10:58:15

Line 19

#include <sys/types.h>

#include <ctype.h>

#include <err.h>

#include <errno.h>

#include <limits.h>

#include <regex.h>

Line 1071

Line 1072

struct magic_line *ml = NULL, *parent, *parent0;

char *line, *tmp;

size_t size;

ssize_t slen;

u_int at, level, n, i;

m = xcalloc(1, sizeof *m);

Line 1084

Line 1086

at = 0;

tmp = NULL;

while ((line = fgetln(f, &size))) {

size = 0;

if (line[size - 1] == '\n')

while ((slen = getline(&tmp, &size, f)) != -1) {

line[size - 1] = '\0';

line = tmp;

else {

if (line[slen - 1] == '\n')

tmp = xmalloc(size + 1);

line[slen - 1] = '\0';

memcpy(tmp, line, size);

tmp[size] = '\0';

line = tmp;

}

at++;

while (isspace((u_char)*line))

Line 1168

Line 1167

parent0 = ml;

}

free(tmp);

if (ferror(f))

err(1, "%s", path);

return (m);

}