[BusyBox-cvs] busybox.stable more.c,1.53,1.54 vi.c,1.19,1.20

Erik Andersen andersen at busybox.net
Tue Dec 23 21:26:08 UTC 2003


Update of /var/cvs/busybox.stable
In directory nail:/tmp/cvs-serv7343

Modified Files:
	more.c vi.c 
Log Message:
match changes from the 1.0.0-pre series


Index: more.c
===================================================================
RCS file: /var/cvs/busybox.stable/more.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- more.c	6 Dec 2001 07:22:00 -0000	1.53
+++ more.c	23 Dec 2003 21:26:05 -0000	1.54
@@ -87,11 +87,8 @@
 		new_settings = initial_settings;
 		new_settings.c_lflag &= ~ICANON;
 		new_settings.c_lflag &= ~ECHO;
-#ifndef linux
-                /* Hmm, in linux c_cc[] not parsed if set ~ICANON */
 		new_settings.c_cc[VMIN] = 1;
 		new_settings.c_cc[VTIME] = 0;
-#endif
 		setTermSettings(fileno(cin), &new_settings);
 		atexit(set_tty_to_initial_mode);
 		(void) signal(SIGINT, gotsig);

Index: vi.c
===================================================================
RCS file: /var/cvs/busybox.stable/vi.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- vi.c	26 Oct 2002 10:19:07 -0000	1.19
+++ vi.c	23 Dec 2003 21:26:05 -0000	1.20
@@ -3172,10 +3172,8 @@
 	term_vi.c_lflag &= (~ICANON & ~ECHO);	// leave ISIG ON- allow intr's
 	term_vi.c_iflag &= (~IXON & ~ICRNL);
 	term_vi.c_oflag &= (~ONLCR);
-#ifndef linux
 	term_vi.c_cc[VMIN] = 1;
 	term_vi.c_cc[VTIME] = 0;
-#endif
 	erase_char = term_vi.c_cc[VERASE];
 	tcsetattr(0, TCSANOW, &term_vi);
 }




More information about the busybox-cvs mailing list