nano

commit cfd4b89f4b0f13c8b44500d129e40350e8941c81
parent 4510bac41d224ffaabb8c1ad103f9360b9d409ae
Author: David Lawrence Ramsey <pooka109@gmail.com>
Date:   Sat, 17 Nov 2007 20:34:38 +0000

in read_file(), improve autodetection of DOS and Mac format files to not
trigger on carriage returns in the middle of files, as found by Kjell
Braden


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4179 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:
M
ChangeLog
 | 
6
++++++
M
src/files.c
 | 
23
++++++++++++++---------

2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-17  David Lawrence Ramsey  <pooka109@gmail.com>
+
+	* files.c (read_file): Improve autodetection of DOS and Mac
+	format files to not trigger on carriage returns in the middle of
+	files, as found by Kjell Braden.
+
 2007-11-06  David Lawrence Ramsey  <pooka109@gmail.com>
 
 	* doc/man/rnano.1, doc/man/fr/rnano.1: Update copyright notices,
diff --git a/src/files.c b/src/files.c
@@ -382,12 +382,15 @@ void read_file(FILE *f, const char *filename)
 	 * conversion isn't disabled, handle it! */
 	if (input == '\n') {
 #ifndef NANO_TINY
-	    /* If there's a '\r' before the '\n', set format to DOS if
-	     * we currently think this is a *nix file, or to both if we
-	     * currently think it's a Mac file. */
-	    if (!ISSET(NO_CONVERT) && i > 0 && buf[i - 1] == '\r' &&
-		(format == 0 || format == 2))
-		format++;
+	    /* If it's a DOS file or a DOS/Mac file ('\r' before '\n' on
+	     * the first line if we think it's a *nix file, or on any
+	     * line otherwise), and file conversion isn't disabled,
+	     * handle it! */
+	    if (!ISSET(NO_CONVERT) && (num_lines == 0 || format != 0) &&
+		i > 0 && buf[i - 1] == '\r') {
+		if (format == 0 || format == 2)
+		    format++;
+	    }
 #endif
 
 	    /* Read in the line properly. */
@@ -401,9 +404,11 @@ void read_file(FILE *f, const char *filename)
 	    buf[0] = '\0';
 	    i = 0;
 #ifndef NANO_TINY
-	/* If it's a Mac file ('\r' without '\n'), and file conversion
-	 * isn't disabled, handle it! */
-	} else if (!ISSET(NO_CONVERT) && i > 0 && buf[i - 1] == '\r') {
+	/* If it's a Mac file ('\r' without '\n' on the first line if we
+	 * think it's a *nix file, or on any line otherwise), and file
+	 * conversion isn't disabled, handle it! */
+	} else if (!ISSET(NO_CONVERT) && (num_lines == 0 ||
+		format != 0) && i > 0 && buf[i - 1] == '\r') {
 	    /* If we currently think the file is a *nix file, set format
 	     * to Mac.  If we currently think the file is a DOS file,
 	     * set format to both DOS and Mac. */