42 lines
911 B
Diff
42 lines
911 B
Diff
---
|
|
src/compress.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
--- file-5.26/src/compress.c
|
|
+++ file-5.26/src/compress.c 2016-04-19 11:44:03.297654887 +0200
|
|
@@ -231,9 +231,9 @@ file_zmagic(struct magic_set *ms, int fd
|
|
goto error;
|
|
DPRINTF("rv = %d\n", rv);
|
|
if ((ms->flags & MAGIC_COMPRESS_TRANSP) != 0)
|
|
- goto out;
|
|
+ break;
|
|
if (mime != MAGIC_MIME && mime != 0)
|
|
- goto out;
|
|
+ break;
|
|
if ((file_printf(ms,
|
|
mime ? " compressed-encoding=" : " (")) == -1)
|
|
goto error;
|
|
@@ -250,16 +250,16 @@ file_zmagic(struct magic_set *ms, int fd
|
|
}
|
|
if (!mime && file_printf(ms, ")") == -1)
|
|
goto error;
|
|
- goto out;
|
|
case NODATA:
|
|
- goto out;
|
|
+ break;
|
|
default:
|
|
- abort();
|
|
+ error:
|
|
+ rv = -1;
|
|
+ break;
|
|
}
|
|
}
|
|
-out:
|
|
- rv = 1;
|
|
-error:
|
|
+ DPRINTF("rv = %d\n", rv);
|
|
+
|
|
#ifdef HAVE_SIGNAL_H
|
|
(void)signal(SIGPIPE, osigpipe);
|
|
#endif
|