From: James Youngman <jay@gnu.org>
Date: Wed, 14 May 2008 08:51:40 +0000 (+0100)
Subject: more: minor fixes to magic()
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f446af07d99157106b1a7e2c20e03c75f2dd6ff;p=util-linux

more: minor fixes to magic()

Read the magic bytes into signed chars instead of vanilla chars in
order to ensure consistent results even on systems whose char type has
no sign.  Eliminate spurious parentheses in return statements.
Correct grammatical errors in comments.

Signed-off-by: James Youngman <jay@gnu.org>
---

diff --git a/text-utils/more.c b/text-utils/more.c
index 41078d12..45a58e27 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -530,18 +530,18 @@ checkf (fs, clearfirst)
 /*
  * magic --
  *	check for file magic numbers.  This code would best be shared with
- *	the file(1) program or, perhaps, more should not try and be so smart?
+ *	the file(1) program or, perhaps, more should not try to be so smart.
  */
 static int
 magic(f, fs)
 	FILE *f;
 	char *fs;
 {
-	char twobytes[2];
+	signed char twobytes[2];
 
 	/* don't try to look ahead if the input is unseekable */
 	if (fseek(f, 0L, SEEK_SET))
-		return(0);
+		return 0;
 
 	if (fread(twobytes, 2, 1, f) == 1) {
 		switch(twobytes[0] + (twobytes[1]<<8)) {
@@ -554,11 +554,11 @@ magic(f, fs)
 		case 0x457f:		/* simple ELF detection */
 			printf(_("\n******** %s: Not a text file ********\n\n"), fs);
 			(void)fclose(f);
-			return(1);
+			return 1;
 		}
 	}
 	(void)fseek(f, 0L, SEEK_SET);		/* rewind() not necessary */
-	return(0);
+	return 0;
 }
 
 /*