diff options
| author | delphij <delphij@FreeBSD.org> | 2014-12-11 06:00:53 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-12-11 06:00:53 +0000 |
| commit | 2e5be0fdd11aef0d2cb0d88c71946b953019f313 (patch) | |
| tree | b244166ac6ad22aa3a3644030c1820586c4b9fc6 /src/fsmagic.c | |
| parent | 7893a3c5449c71b45d7eadfe0af1d36c4b36103d (diff) | |
| download | FreeBSD-src-2e5be0fdd11aef0d2cb0d88c71946b953019f313.zip FreeBSD-src-2e5be0fdd11aef0d2cb0d88c71946b953019f313.tar.gz | |
Vendor import of file 5.21.
Diffstat (limited to 'src/fsmagic.c')
| -rw-r--r-- | src/fsmagic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/fsmagic.c b/src/fsmagic.c index ef5492f..1e8fd74 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.73 2014/05/14 23:15:42 christos Exp $") +FILE_RCSID("@(#)$File: fsmagic.c,v 1.75 2014/12/04 15:56:46 christos Exp $") #endif /* lint */ #include "magic.h" @@ -75,10 +75,10 @@ bad_link(struct magic_set *ms, int err, char *buf) else if (!mime) { if (ms->flags & MAGIC_ERROR) { file_error(ms, err, - "broken symbolic link to `%s'", buf); + "broken symbolic link to %s", buf); return -1; } - if (file_printf(ms, "broken symbolic link to `%s'", buf) == -1) + if (file_printf(ms, "broken symbolic link to %s", buf) == -1) return -1; } return 1; @@ -129,7 +129,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) #ifdef WIN32 { - HANDLE hFile = CreateFile(fn, 0, FILE_SHARE_DELETE | + HANDLE hFile = CreateFile((LPCSTR)fn, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); if (hFile != INVALID_HANDLE_VALUE) { @@ -352,7 +352,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) if (mime) { if (handle_mime(ms, mime, "symlink") == -1) return -1; - } else if (file_printf(ms, "%ssymbolic link to `%s'", + } else if (file_printf(ms, "%ssymbolic link to %s", COMMA, buf) == -1) return -1; } |
