1 files changed, 171 insertions, 102 deletions

diff --git a/contrib/file/fsmagic.c b/contrib/file/fsmagic.c
index fc6a29b..18bdd60 100644
--- a/contrib/file/fsmagic.c
+++ b/contrib/file/fsmagic.c
@@ -1,37 +1,48 @@
 /*
+ * Copyright (c) Ian F. Darwin 1986-1995.
+ * Software written by Ian F. Darwin and others;
+ * maintained 1995-present by Christos Zoulas and others.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice immediately at the beginning of the file, without modification,
+ *    this list of conditions, and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    This product includes software developed by Ian F. Darwin and others.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *  
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/*
  * fsmagic - magic based on filesystem info - directory, special files, etc.
- *
- * Copyright (c) Ian F. Darwin, 1987.
- * Written by Ian F. Darwin.
- *
- * This software is not subject to any license of the American Telephone
- * and Telegraph Company or of the Regents of the University of California.
- *
- * Permission is granted to anyone to use this software for any purpose on
- * any computer system, and to alter it and redistribute it freely, subject
- * to the following restrictions:
- *
- * 1. The author is not responsible for the consequences of use of this
- *    software, no matter how awful, even if they arise from flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- *    explicit claim or by omission.  Since few users ever read sources,
- *    credits must appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.  Since few users
- *    ever read sources, credits must appear in the documentation.
- *
- * 4. This notice may not be removed or altered.
  */
 
 #include "file.h"
+#include "magic.h"
 #include <string.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <stdlib.h>
-/* Since major is a function on SVR4, we can't use `ifndef major'.  */
+#include <sys/stat.h>
+/* Since major is a function on SVR4, we cannot use `ifndef major'.  */
 #ifdef MAJOR_IN_MKDEV
 # include <sys/mkdev.h>
 # define HAVE_MAJOR
@@ -51,54 +62,74 @@
 #undef HAVE_MAJOR
 
 #ifndef	lint
-FILE_RCSID("@(#)$Id: fsmagic.c,v 1.36 2002/07/03 19:00:41 christos Exp $")
+FILE_RCSID("@(#)$Id: fsmagic.c,v 1.43 2003/10/14 19:29:55 christos Exp $")
 #endif	/* lint */
 
-int
-fsmagic(const char *fn, struct stat *sb)
+protected int
+file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 {
 	int ret = 0;
+#ifdef	S_IFLNK
+	char buf[BUFSIZ+4];
+	int nch;
+	struct stat tstatbuf;
+#endif
+
+	if (fn == NULL)
+		return 0;
 
 	/*
 	 * Fstat is cheaper but fails for files you don't have read perms on.
 	 * On 4.2BSD and similar systems, use lstat() to identify symlinks.
 	 */
 #ifdef	S_IFLNK
-	if (!lflag)
+	if ((ms->flags & MAGIC_SYMLINK) == 0)
 		ret = lstat(fn, sb);
 	else
 #endif
 	ret = stat(fn, sb);	/* don't merge into if; see "ret =" above */
 
 	if (ret) {
-		ckfprintf(stdout,
-			/* Yes, I do mean stdout. */
-			/* No \n, caller will provide. */
-			"can't stat `%s' (%s).", fn, strerror(errno));
+		if (ms->flags & MAGIC_ERROR) {
+			file_error(ms, errno, "cannot stat `%s'", fn);
+			return -1;
+		}
+		if (file_printf(ms, "cannot open (%s)",
+		    fn, strerror(errno)) == -1)
+			return -1;
 		return 1;
 	}
 
-	if (iflag) {
+	if ((ms->flags & MAGIC_MIME) != 0) {
 		if ((sb->st_mode & S_IFMT) != S_IFREG) {
-			ckfputs("application/x-not-regular-file", stdout);
+			if (file_printf(ms, "application/x-not-regular-file")
+			    == -1)
+				return -1;
 			return 1;
 		}
 	}
 	else {
 #ifdef S_ISUID
-		if (sb->st_mode & S_ISUID) ckfputs("setuid ", stdout);
+		if (sb->st_mode & S_ISUID) 
+			if (file_printf(ms, "setuid ") == -1)
+				return -1;
 #endif
 #ifdef S_ISGID
-		if (sb->st_mode & S_ISGID) ckfputs("setgid ", stdout);
+		if (sb->st_mode & S_ISGID) 
+			if (file_printf(ms, "setgid ") == -1)
+				return -1;
 #endif
 #ifdef S_ISVTX
-		if (sb->st_mode & S_ISVTX) ckfputs("sticky ", stdout);
+		if (sb->st_mode & S_ISVTX) 
+			if (file_printf(ms, "sticky ") == -1)
+				return -1;
 #endif
 	}
 	
 	switch (sb->st_mode & S_IFMT) {
 	case S_IFDIR:
-		ckfputs("directory", stdout);
+		if (file_printf(ms, "directory") == -1)
+			return -1;
 		return 1;
 #ifdef S_IFCHR
 	case S_IFCHR:
@@ -107,20 +138,22 @@ fsmagic(const char *fn, struct stat *sb)
 		 * like ordinary files.  Otherwise, just report that they
 		 * are block special files and go on to the next file.
 		 */
-		if (sflag)
+		if ((ms->flags & MAGIC_DEVICES) != 0)
 			break;
 #ifdef HAVE_ST_RDEV
 # ifdef dv_unit
-		(void) printf("character special (%d/%d/%d)",
-			major(sb->st_rdev),
-			dv_unit(sb->st_rdev),
-			dv_subunit(sb->st_rdev));
+		if (file_printf(ms, "character special (%d/%d/%d)",
+		    major(sb->st_rdev), dv_unit(sb->st_rdev),
+		    dv_subunit(sb->st_rdev)) == -1)
+			return -1;
 # else
-		(void) printf("character special (%ld/%ld)",
-			(long) major(sb->st_rdev), (long) minor(sb->st_rdev));
+		if (file_printf(ms, "character special (%ld/%ld)",
+		    (long) major(sb->st_rdev), (long) minor(sb->st_rdev)) == -1)
+			return -1;
 # endif
 #else
-		(void) printf("character special");
+		if (file_printf(ms, "character special") == -1)
+			return -1;
 #endif
 		return 1;
 #endif
@@ -131,98 +164,132 @@ fsmagic(const char *fn, struct stat *sb)
 		 * like ordinary files.  Otherwise, just report that they
 		 * are block special files and go on to the next file.
 		 */
-		if (sflag)
+		if ((ms->flags & MAGIC_DEVICES) != 0)
 			break;
 #ifdef HAVE_ST_RDEV
 # ifdef dv_unit
-		(void) printf("block special (%d/%d/%d)",
-			major(sb->st_rdev),
-			dv_unit(sb->st_rdev),
-			dv_subunit(sb->st_rdev));
+		if (file_printf(ms, "block special (%d/%d/%d)",
+		    major(sb->st_rdev), dv_unit(sb->st_rdev),
+		    dv_subunit(sb->st_rdev)) == -1)
+			return -1;
 # else
-		(void) printf("block special (%ld/%ld)",
-			(long) major(sb->st_rdev), (long) minor(sb->st_rdev));
+		if (file_printf(ms, "block special (%ld/%ld)",
+		    (long)major(sb->st_rdev), (long)minor(sb->st_rdev)) == -1)
+			return -1;
 # endif
 #else
-		(void) printf("block special");
+		if (file_printf(ms, "block special") == -1)
+			return -1;
 #endif
 		return 1;
 #endif
 	/* TODO add code to handle V7 MUX and Blit MUX files */
 #ifdef	S_IFIFO
 	case S_IFIFO:
-		ckfputs("fifo (named pipe)", stdout);
+		if (file_printf(ms, "fifo (named pipe)") == -1)
+			return -1;
 		return 1;
 #endif
 #ifdef	S_IFDOOR
 	case S_IFDOOR:
-		ckfputs("door", stdout);
+		if (file_printf(ms, "door") == -1)
+			return -1;
 		return 1;
 #endif
 #ifdef	S_IFLNK
 	case S_IFLNK:
-		{
-			char buf[BUFSIZ+4];
-			int nch;
-			struct stat tstatbuf;
-
-			if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) {
-				ckfprintf(stdout, "unreadable symlink (%s).", 
-				      strerror(errno));
-				return 1;
+		if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) {
+			if (ms->flags & MAGIC_ERROR) {
+			    file_error(ms, errno, "unreadable symlink `%s'",
+				fn);
+			    return -1;
 			}
-			buf[nch] = '\0';	/* readlink(2) forgets this */
+			if (file_printf(ms,
+			    "unreadable symlink `%s' (%s)", fn,
+			    strerror(errno)) == -1)
+				return -1;
+			return 1;
+		}
+		buf[nch] = '\0';	/* readlink(2) forgets this */
 
-			/* If broken symlink, say so and quit early. */
-			if (*buf == '/') {
-			    if (stat(buf, &tstatbuf) < 0) {
-				ckfprintf(stdout,
-					"broken symbolic link to %s", buf);
-				return 1;
-			    }
-			}
-			else {
-			    char *tmp;
-			    char buf2[BUFSIZ+BUFSIZ+4];
+		/* If broken symlink, say so and quit early. */
+		if (*buf == '/') {
+		    if (stat(buf, &tstatbuf) < 0) {
+			    if (ms->flags & MAGIC_ERROR) {
+				    file_error(ms, errno, 
+					"broken symbolic link to `%s'", buf);
+				    return -1;
+			    } 
+			    if (file_printf(ms, "broken symbolic link to `%s'",
+				buf) == -1)
+				    return -1;
+			    return 1;
+		    }
+		}
+		else {
+			char *tmp;
+			char buf2[BUFSIZ+BUFSIZ+4];
 
-			    if ((tmp = strrchr(fn,  '/')) == NULL) {
+			if ((tmp = strrchr(fn,  '/')) == NULL) {
 				tmp = buf; /* in current directory anyway */
-			    }
-			    else {
-				strcpy (buf2, fn);  /* take directory part */
-				buf2[tmp-fn+1] = '\0';
-				strcat (buf2, buf); /* plus (relative) symlink */
+			} else {
+				if (tmp - fn + 1 > BUFSIZ) {
+					if (ms->flags & MAGIC_ERROR) {
+						file_error(ms, 0, 
+						    "path too long: `%s'", buf);
+						return -1;
+					}
+					if (file_printf(ms,
+					    "path too long: `%s'", fn) == -1)
+						return -1;
+					return 1;
+				}
+				(void)strcpy(buf2, fn);  /* take dir part */
+				buf2[tmp - fn + 1] = '\0';
+				(void)strcat(buf2, buf); /* plus (rel) link */
 				tmp = buf2;
-			    }
-			    if (stat(tmp, &tstatbuf) < 0) {
-				ckfprintf(stdout,
-					"broken symbolic link to %s", buf);
-				return 1;
-			    }
-                        }
-
-			/* Otherwise, handle it. */
-			if (lflag) {
-				process(buf, strlen(buf));
+			}
+			if (stat(tmp, &tstatbuf) < 0) {
+				if (ms->flags & MAGIC_ERROR) {
+					file_error(ms, errno, 
+					    "broken symbolic link to `%s'",
+					    buf);
+					return -1;
+				}
+				if (file_printf(ms,
+				    "broken symbolic link to `%s'", buf) == -1)
+					return -1;
 				return 1;
-			} else { /* just print what it points to */
-				ckfputs("symbolic link to ", stdout);
-				ckfputs(buf, stdout);
 			}
 		}
-		return 1;
+
+		/* Otherwise, handle it. */
+		if ((ms->flags & MAGIC_SYMLINK) != 0) {
+			const char *p;
+			ms->flags &= MAGIC_SYMLINK;
+			p = magic_file(ms, buf);
+			ms->flags |= MAGIC_SYMLINK;
+			return p != NULL ? 1 : -1;
+		} else { /* just print what it points to */
+			if (file_printf(ms, "symbolic link to `%s'",
+			    buf) == -1)
+				return -1;
+		}
+	return 1;
 #endif
 #ifdef	S_IFSOCK
 #ifndef __COHERENT__
 	case S_IFSOCK:
-		ckfputs("socket", stdout);
+		if (file_printf(ms, "socket") == -1)
+			return -1;
 		return 1;
 #endif
 #endif
 	case S_IFREG:
 		break;
 	default:
-		error("invalid mode 0%o.\n", sb->st_mode);
+		file_error(ms, 0, "invalid mode 0%o", sb->st_mode);
+		return -1;
 		/*NOTREACHED*/
 	}
 
@@ -238,8 +305,10 @@ fsmagic(const char *fn, struct stat *sb)
 	 * the fact that it is empty will be detected and reported correctly
 	 * when we read the file.)
 	 */
-	if (!sflag && sb->st_size == 0) {
-		ckfputs(iflag ? "application/x-empty" : "empty", stdout);
+	if ((ms->flags & MAGIC_DEVICES) == 0 && sb->st_size == 0) {
+		if (file_printf(ms, (ms->flags & MAGIC_MIME) ?
+		    "application/x-empty" : "empty") == -1)
+			return -1;
 		return 1;
 	}
 	return 0;