ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: adjust the file format indicator in a quicker way

master
Benno Schulenberg 2020-05-11 15:32:41 +02:00
parent f9ff902bbc
commit ff4973458c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/files.c
View File

@ -688,8 +688,7 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
* handle it! */ * handle it! */
if ((num_lines == 0 || format != 0) && !ISSET(NO_CONVERT) && if ((num_lines == 0 || format != 0) && !ISSET(NO_CONVERT) &&
len > 0 && buf[len - 1] == '\r') { len > 0 && buf[len - 1] == '\r') {
if (format == 0 || format == 2) format |= 1;
format++;
} }
/* If it's a Mac file ('\r' without '\n' on the first line if we /* 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 * think it's a *nix file, or on any line otherwise), and file
@ -699,8 +698,7 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
/* If we currently think the file is a *nix file, set format /* If we currently think the file is a *nix file, set format
* to Mac. If we currently think the file is a DOS file, * to Mac. If we currently think the file is a DOS file,
* set format to both DOS and Mac. */ * set format to both DOS and Mac. */
if (format == 0 || format == 1) format |= 2;
format += 2;
#endif #endif
} else { } else {
/* Store the character. */ /* Store the character. */
@ -780,8 +778,7 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
* set format to Mac if we currently think the file is a *nix file, or * set format to Mac if we currently think the file is a *nix file, or
* to DOS-and-Mac if we currently think it is a DOS file. */ * to DOS-and-Mac if we currently think it is a DOS file. */
if (buf[len - 1] == '\r' && !ISSET(NO_CONVERT)) { if (buf[len - 1] == '\r' && !ISSET(NO_CONVERT)) {
if (format < 2) format |= 2;
format += 2;
/* Strip the carriage return. */ /* Strip the carriage return. */
buf[--len] = '\0'; buf[--len] = '\0';