diff options
| author | Christos Zoulas <christos@zoulas.com> | 2018-03-11 01:23:52 +0000 |
|---|---|---|
| committer | Christos Zoulas <christos@zoulas.com> | 2018-03-11 01:23:52 +0000 |
| commit | fd83d6ff56456c56ddef510d3c935ee123de62fd (patch) | |
| tree | 99f482f8b6284d089bf1f9076a6eca95bda2f22c | |
| parent | a4089c25503a17d7836694ebe74d3d7090544361 (diff) | |
| download | file-git-fd83d6ff56456c56ddef510d3c935ee123de62fd.tar.gz | |
return if we matched or not in the "use" case so we can use:
>>>>&26 use msooxml
>>>>&26 default x
correctly.
| -rw-r--r-- | src/softmagic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/softmagic.c b/src/softmagic.c index f89e687c..00d5aac6 100644 --- a/src/softmagic.c +++ b/src/softmagic.c @@ -32,7 +32,7 @@ #include "file.h" #ifndef lint -FILE_RCSID("@(#)$File: softmagic.c,v 1.258 2018/02/24 19:49:43 christos Exp $") +FILE_RCSID("@(#)$File: softmagic.c,v 1.259 2018/03/11 01:23:52 christos Exp $") #endif /* lint */ #include "magic.h" @@ -1728,7 +1728,7 @@ mget(struct magic_set *ms, struct magic *m, const struct buffer *b, printed_something, need_separator, returnval); if (rv != 1) *need_separator = oneed_separator; - return 1; + return rv; case FILE_NAME: if (ms->flags & MAGIC_NODESC) |