version 1.19, 2015/11/15 22:11:18 |
version 1.20, 2016/05/01 08:48:39 |
|
|
else { |
else { |
switch (ml->type) { |
switch (ml->type) { |
case MAGIC_TYPE_NONE: |
case MAGIC_TYPE_NONE: |
case MAGIC_TYPE_DEFAULT: |
|
case MAGIC_TYPE_BESTRING16: |
case MAGIC_TYPE_BESTRING16: |
case MAGIC_TYPE_LESTRING16: |
case MAGIC_TYPE_LESTRING16: |
return (0); /* don't use result */ |
return (0); /* don't use result */ |
|
|
case MAGIC_TYPE_PSTRING: |
case MAGIC_TYPE_PSTRING: |
case MAGIC_TYPE_REGEX: |
case MAGIC_TYPE_REGEX: |
case MAGIC_TYPE_SEARCH: |
case MAGIC_TYPE_SEARCH: |
|
case MAGIC_TYPE_DEFAULT: |
|
case MAGIC_TYPE_CLEAR: |
re = &ml->root->format_string; |
re = &ml->root->format_string; |
break; |
break; |
} |
} |
|
|
case MAGIC_TYPE_NONE: |
case MAGIC_TYPE_NONE: |
case MAGIC_TYPE_DEFAULT: |
case MAGIC_TYPE_DEFAULT: |
return (0); |
return (0); |
|
case MAGIC_TYPE_CLEAR: |
|
break; |
case MAGIC_TYPE_BYTE: |
case MAGIC_TYPE_BYTE: |
case MAGIC_TYPE_UBYTE: |
case MAGIC_TYPE_UBYTE: |
n += 1 * MAGIC_STRENGTH_MULTIPLIER; |
n += 1 * MAGIC_STRENGTH_MULTIPLIER; |
|
|
ml->type = MAGIC_TYPE_MELDATE; |
ml->type = MAGIC_TYPE_MELDATE; |
else if (strcmp(s, "default") == 0 || strcmp(s, "udefault") == 0) |
else if (strcmp(s, "default") == 0 || strcmp(s, "udefault") == 0) |
ml->type = MAGIC_TYPE_DEFAULT; |
ml->type = MAGIC_TYPE_DEFAULT; |
|
else if (strcmp(s, "clear") == 0 || strcmp(s, "uclear") == 0) |
|
ml->type = MAGIC_TYPE_CLEAR; |
else { |
else { |
magic_warn(ml, "unknown type: %s", s); |
magic_warn(ml, "unknown type: %s", s); |
goto fail; |
goto fail; |
|
|
s = *line; |
s = *line; |
if (s[0] == 'x' && (s[1] == '\0' || isspace((u_char)s[1]))) { |
if (s[0] == 'x' && (s[1] == '\0' || isspace((u_char)s[1]))) { |
(*line)++; |
(*line)++; |
|
ml->test_operator = 'x'; |
|
return (0); |
|
} |
|
|
|
if (ml->type == MAGIC_TYPE_DEFAULT || ml->type == MAGIC_TYPE_CLEAR) { |
|
magic_warn(ml, "test specified for default or clear"); |
ml->test_operator = 'x'; |
ml->test_operator = 'x'; |
return (0); |
return (0); |
} |
} |