Fixed text file auto-detection: treat EOF character 032 at the end of file as printable

Dimagog · gitster · commit f9dd4bf4e58a · 2008-07-11T21:14:27.000-07:00
Signed-off-by: Dmitry Kakurin &lt;Dmitry.Kakurin@gmail.com&gt;
Signed-off-by: Steffen Prohaska &lt;prohaska@zib.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/convert.c b/convert.c
@@ -61,6 +61,10 @@ static void gather_stats(const char *buf, unsigned long size, struct text_stat *
 		else
 			stats->printable++;
 	}
+
+	/* If file ends with EOF then don't count this EOF as non-printable. */
+	if (size >= 1 && buf[size-1] == '\032')
+		stats->nonprintable--;
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,10 @@ static void gather_stats(const char buf, unsigned long size, struct text_stat `
`61`	`61`	`else`
`62`	`62`	`stats->printable++;`
`63`	`63`	`}`
	`64`	`+`
	`65`	`+ /* If file ends with EOF then don't count this EOF as non-printable. */`
	`66`	`+ if (size >= 1 && buf[size-1] == '\032')`
	`67`	`+ stats->nonprintable--;`
`64`	`68`	`}`
`65`	`69`
`66`	`70`	`/*`