mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

* edit.c: Remove all references to CR_LF_TRANSLATION.

Browse Source 
* editcmd.c: Likewise.
This commit is contained in:
Pavel Roskin 2002-09-24 04:35:44 +00:00
parent 609af3a4b7
commit 2e3fc9234b
3 changed files with 5 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
edit/ChangeLog
View File

@ -1,3 +1,8 @@
2002-09-24 Pavel Roskin <proski@gnu.org>
* edit.c: Remove all references to CR_LF_TRANSLATION.
* editcmd.c: Likewise.
2002-09-23 Pavel Roskin <proski@gnu.org> 2002-09-23 Pavel Roskin <proski@gnu.org>
* editwidget.c (edit): Install handler for DLG_RESIZE. * editwidget.c (edit): Install handler for DLG_RESIZE.

62
edit/edit.c
View File

@ -23,10 +23,6 @@
*/ */
#include <config.h> #include <config.h>
#if defined(NEEDS_IO_H)
# include <io.h>
# define CR_LF_TRANSLATION
#endif
#include "edit.h" #include "edit.h"
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
@ -259,45 +255,6 @@ char *edit_get_write_filter (char *writename, const char *filename)
return p; return p;
} }
#ifdef CR_LF_TRANSLATION
/* reads into buffer, replace \r\n with \n */
long edit_insert_stream (WEdit * edit, FILE * f)
{
int a = -1, b;
long i;
while ((b = fgetc (f))) {
if (a == '\r' && b == '\n') {
edit_insert (edit, '\n');
i++;
a = -1;
continue;
} else if (a >= 0) {
edit_insert (edit, a);
i++;
}
a = b;
}
if (a >= 0)
edit_insert (edit, a);
return i;
}
/* writes buffer, replaces, replace \n with \r\n */
long edit_write_stream (WEdit * edit, FILE * f)
{
long i;
int c;
for (i = 0; i < edit->last_byte; i++) {
c = edit_get_byte (edit, i);
if (c == '\n') {
if (fputc ('\r', f) < 0)
break;
}
if (fputc (c, f) < 0)
break;
}
return i;
}
#else /* CR_LF_TRANSLATION */
long edit_insert_stream (WEdit * edit, FILE * f) long edit_insert_stream (WEdit * edit, FILE * f)
{ {
int c; int c;
@ -316,7 +273,6 @@ long edit_write_stream (WEdit * edit, FILE * f)
break; break;
return i; return i;
} }
#endif /* CR_LF_TRANSLATION */
#define TEMP_BUF_LEN 1024 #define TEMP_BUF_LEN 1024
@ -342,23 +298,6 @@ int edit_insert_file (WEdit * edit, const char *filename)
return 0; return 0;
} }
free (p); free (p);
#ifdef CR_LF_TRANSLATION
} else {
FILE *f;
long current = edit->curs1;
f = fopen (filename, "r");
if (f) {
edit_insert_stream (edit, f);
edit_cursor_move (edit, current - edit->curs1);
if (fclose (f)) {
edit_error_dialog (_ (" Error "), get_sys_error (catstrs (_ (" Error reading file: "), filename, " ", 0)));
return 0;
}
} else {
edit_error_dialog (_ (" Error "), get_sys_error (catstrs (_ (" Failed trying to open file for reading: "), filename, " ", 0)));
return 0;
}
#else
} else { } else {
int i, file, blocklen; int i, file, blocklen;
long current = edit->curs1; long current = edit->curs1;
@ -375,7 +314,6 @@ int edit_insert_file (WEdit * edit, const char *filename)
mc_close (file); mc_close (file);
if (blocklen) if (blocklen)
return 0; return 0;
#endif
} }
return 1; return 1;
} }

7
edit/editcmd.c
View File

@ -265,12 +265,6 @@ int edit_save_file (WEdit * edit, const char *filename)
goto error_save; goto error_save;
} }
free (p); free (p);
#ifdef CR_LF_TRANSLATION
} else { /* optimised save */
filelen = edit_write_stream (edit, f);
if (fclose (file))
filelen = -1;
#else
} else { } else {
long buf; long buf;
buf = 0; buf = 0;
@ -301,7 +295,6 @@ int edit_save_file (WEdit * edit, const char *filename)
} }
if (mc_close (fd)) if (mc_close (fd))
goto error_save; goto error_save;
#endif /* !CR_LF_TRANSLATION */
} }
if (filelen != edit->last_byte) if (filelen != edit->last_byte)