From: Christos Zoulas <christos@zoulas.com>
Date: Sat, 13 Nov 2004 08:11:12 +0000 (+0000)
Subject: simplify the logic
X-Git-Tag: FILE5_05~853
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5b9127cd5139eee60513de5cd293c163d175267;p=file

simplify the logic
---

diff --git a/src/softmagic.c b/src/softmagic.c
index 5b832154..4fc1af83 100644
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -39,7 +39,7 @@
 
 
 #ifndef	lint
-FILE_RCSID("@(#)$Id: softmagic.c,v 1.68 2004/10/12 14:55:09 christos Exp $")
+FILE_RCSID("@(#)$Id: softmagic.c,v 1.69 2004/11/13 08:11:12 christos Exp $")
 #endif	/* lint */
 
 private int match(struct magic_set *, struct magic *, uint32_t,
@@ -427,8 +427,8 @@ mconvert(struct magic_set *ms, union VALUETYPE *p, struct magic *m)
 			/* Null terminate and eat *trailing* return */
 			p->s[sizeof(p->s) - 1] = '\0';
 			len = strlen(p->s);
-			if (len && p->s[len - 1] == '\n')
-				p->s[len - 1] = '\0';
+			if (len-- && p->s[len] == '\n')
+				p->s[len] = '\0';
 			return 1;
 		}
 	case FILE_PSTRING:
@@ -441,8 +441,8 @@ mconvert(struct magic_set *ms, union VALUETYPE *p, struct magic *m)
 				*ptr1++ = *ptr2++;
 			*ptr1 = '\0';
 			len = strlen(p->s);
-			if (len && p->s[len - 1] == '\n')
-				p->s[len - 1] = '\0';
+			if (len-- && p->s[len] == '\n')
+				p->s[len] = '\0';
 			return 1;
 		}
 	case FILE_BESHORT: