diff options
| -rw-r--r-- | src/fsmagic.c | 12 | ||||
| -rw-r--r-- | src/print.c | 5 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/fsmagic.c b/src/fsmagic.c index b8ea0715..ab3975bb 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.62 2010/09/20 20:16:08 rrt Exp $") +FILE_RCSID("@(#)$File: fsmagic.c,v 1.63 2011/07/12 11:31:59 rrt Exp $") #endif /* lint */ #include "magic.h" @@ -63,22 +63,18 @@ FILE_RCSID("@(#)$File: fsmagic.c,v 1.62 2010/09/20 20:16:08 rrt Exp $") private int bad_link(struct magic_set *ms, int err, char *buf) { - const char *errfmt; int mime = ms->flags & MAGIC_MIME; if ((mime & MAGIC_MIME_TYPE) && file_printf(ms, "inode/symlink") == -1) return -1; else if (!mime) { - if (err == ELOOP) - errfmt = "symbolic link in a loop"; - else - errfmt = "broken symbolic link to `%s'"; if (ms->flags & MAGIC_ERROR) { - file_error(ms, err, errfmt, buf); + file_error(ms, err, + "broken symbolic link to `%s'", buf); return -1; } - if (file_printf(ms, errfmt, buf) == -1) + if (file_printf(ms, "broken symbolic link to `%s'", buf) == -1) return -1; } return 1; diff --git a/src/print.c b/src/print.c index 07e9ba16..23a7708d 100644 --- a/src/print.c +++ b/src/print.c @@ -32,7 +32,7 @@ #include "file.h" #ifndef lint -FILE_RCSID("@(#)$File: print.c,v 1.68 2009/11/18 23:35:14 christos Exp $") +FILE_RCSID("@(#)$File: print.c,v 1.69 2010/07/21 16:47:18 christos Exp $") #endif /* lint */ #include <string.h> @@ -51,8 +51,7 @@ file_mdump(struct magic *m) { private const char optyp[] = { FILE_OPS }; - (void) fprintf(stderr, "[%u", m->lineno); - (void) fprintf(stderr, ">>>>>>>> %u" + 8 - (m->cont_level & 7), + (void) fprintf(stderr, "%.*s %u", (m->cont_level & 7) + 1, ">>>>>>>>", m->offset); if (m->flag & INDIR) { |