Blame file-5.04-retval.patch
|
Daniel Novotny |
af58b03 |
diff -up file-5.04/src/fsmagic.c.retval file-5.04/src/fsmagic.c
|
|
Daniel Novotny |
af58b03 |
--- file-5.04/src/fsmagic.c.retval 2010-04-14 12:37:12.000000000 +0200
|
|
Daniel Novotny |
af58b03 |
+++ file-5.04/src/fsmagic.c 2010-04-14 12:55:50.000000000 +0200
|
|
Daniel Novotny |
af58b03 |
@@ -127,14 +127,8 @@ file_fsmagic(struct magic_set *ms, const
|
|
Daniel Novotny |
af58b03 |
ret = stat(fn, sb); /* don't merge into if; see "ret =" above */
|
|
Daniel Novotny |
af58b03 |
|
|
Daniel Novotny |
af58b03 |
if (ret) {
|
|
Daniel Novotny |
af58b03 |
- if (ms->flags & MAGIC_ERROR) {
|
|
Daniel Novotny |
af58b03 |
- file_error(ms, errno, "cannot stat `%s'", fn);
|
|
Daniel Novotny |
af58b03 |
- return -1;
|
|
Daniel Novotny |
af58b03 |
- }
|
|
Daniel Novotny |
af58b03 |
- if (file_printf(ms, "cannot open `%s' (%s)",
|
|
Daniel Novotny |
af58b03 |
- fn, strerror(errno)) == -1)
|
|
Daniel Novotny |
af58b03 |
- return -1;
|
|
Daniel Novotny |
af58b03 |
- return 1;
|
|
Daniel Novotny |
af58b03 |
+ file_error(ms, errno, "cannot open `%s'", fn);
|
|
Daniel Novotny |
af58b03 |
+ return -1;
|
|
Daniel Novotny |
af58b03 |
}
|
|
Daniel Novotny |
af58b03 |
|
|
Daniel Novotny |
af58b03 |
if (!mime) {
|