From: Christos Zoulas <christos@zoulas.com>
Date: Fri, 19 Jan 2007 19:54:39 +0000 (+0000)
Subject: codify and explain what needs to be quoted and why.
X-Git-Tag: FILE5_05~662
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fde40ee4bfc4d2258572756579fe354fe80d56c7;p=file

codify and explain what needs to be quoted and why.
---

diff --git a/src/apprentice.c b/src/apprentice.c
index fc1d223f..2c34970d 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -46,7 +46,7 @@
 #endif
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: apprentice.c,v 1.103 2007/01/18 05:29:33 ljt Exp $")
+FILE_RCSID("@(#)$File: apprentice.c,v 1.104 2007/01/19 19:54:39 christos Exp $")
 #endif	/* lint */
 
 #define	EATAB {while (isascii((unsigned char) *l) && \
@@ -1399,14 +1399,42 @@ getstr(struct magic_set *ms, const char *s, char *p, int plen, int *slen, int ac
 					file_magwarn(ms, "incomplete escape");
 				goto out;
 
-			default:
-				if (action == FILE_COMPILE)
+			case '\t':
+				if (action == FILE_COMPILE) {
 					file_magwarn(ms,
-					    "unknown escape sequence: \\%03o", c);
+					    "escaped tab found, use \\t instead");
+					action++;
+				}
 				/*FALLTHROUGH*/
+			default:
+				if (action == FILE_COMPILE) {
+					if (isprint((unsigned char)c))
+					    file_magwarn(ms,
+						"no need to escape `%c'", c);
+					else
+					    file_magwarn(ms,
+						"unknown escape sequence: \\%03o", c);
+				}
+				/*FALLTHROUGH*/
+			/* space, perhaps force people to use \040? */
+			case ' ':
+#if 0
+			/*
+			 * Other things people escape, but shouldn't need to,
+			 * so we disallow them
+			 */
 			case '\'':
 			case '"':
 			case '?':
+#endif
+			/* Relations */
+			case '>':
+			case '<':
+			case '&':
+			case '^':
+			case '=':
+			case '!':
+			/* and baskslash itself */
 			case '\\':
 				*p++ = (char) c;
 				break;