diff options
author | joerg <joerg@FreeBSD.org> | 1994-11-27 13:43:37 +0000 |
---|---|---|
committer | joerg <joerg@FreeBSD.org> | 1994-11-27 13:43:37 +0000 |
commit | fa9f59677033c1667a1267d223ca900623446f93 (patch) | |
tree | dbb466f9e2e569890528db96eadd7b8d271a7857 /sys | |
parent | 7a0d5fdc6354f9dd69a89e01a555785b9859d921 (diff) | |
download | FreeBSD-src-fa9f59677033c1667a1267d223ca900623446f93.zip FreeBSD-src-fa9f59677033c1667a1267d223ca900623446f93.tar.gz |
Temporary kludge: treat \r same as \n in input, so working on a
comconsole will behave as expected. The true problem should be fixed
instead, Bruce' comment for this:
>Anyway, i found the reason for my problems: somehow, ICRNL isn't in
>effect at `userconfig' time (but only for comconsole?), hence only
ICRNL doesn't apply to cngetc(). cnputc() unconditionally does the
equivalent of ONLCR; perhaps cngetc() should unconditionally do the
equivalent of ICRNL. Ddb must be checking for CR. Userconfig only
checks for NL. Userconfig works with syscons because pccngetc()
does the conversion. This is probably the wrong place to do it.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/i386/i386/userconfig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c index 31c456f..a1e44816 100644 --- a/sys/i386/i386/userconfig.c +++ b/sys/i386/i386/userconfig.c @@ -38,7 +38,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: userconfig.c,v 1.14 1994/11/13 01:55:33 jkh Exp $ + * $Id: userconfig.c,v 1.15 1994/11/14 03:22:28 bde Exp $ */ #include <sys/param.h> @@ -431,7 +431,7 @@ cngets(char *input, int maxin) continue; } printf("%c", c); - if ((++nchars == maxin) || (c == '\n')) { + if ((++nchars == maxin) || (c == '\n') || (c == '\r')) { *input = '\0'; break; } |