summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorReuben Thomas <rrt@sc3d.org>2010-09-20 20:16:08 +0000
committerReuben Thomas <rrt@sc3d.org>2010-09-20 20:16:08 +0000
commitec78aa2f9c8a7bcacdb40b4024244408ba2c979d (patch)
tree6c025c537c066a33f9c9202e479ee2294c019c6a /src
parent4c43199d124e0aa6d3700992afafd748c2968f43 (diff)
downloadfile-git-ec78aa2f9c8a7bcacdb40b4024244408ba2c979d.tar.gz
Apply Debian code patches from Debian package 5.04-6.
Diffstat (limited to 'src')
-rw-r--r--src/fsmagic.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fsmagic.c b/src/fsmagic.c
index de837b04..b80d74a9 100644
--- a/src/fsmagic.c
+++ b/src/fsmagic.c
@@ -32,7 +32,7 @@
#include "file.h"
#ifndef lint
-FILE_RCSID("@(#)$File: fsmagic.c,v 1.61 2010/07/21 16:47:17 christos Exp $")
+FILE_RCSID("@(#)$File: fsmagic.c,v 1.62 2010/09/20 20:16:08 rrt Exp $")
#endif /* lint */
#include "magic.h"
@@ -134,7 +134,8 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
if (file_printf(ms, "cannot open `%s' (%s)",
fn, strerror(errno)) == -1)
return -1;
- return 1;
+ ms->event_flags |= EVENT_HAD_ERR;
+ return -1;
}
if (!mime) {