Date: Wed, 10 Sep 2003 03:50:11 -0700 (PDT) From: Greg Lewis <glewis@misty.eyesbeyond.com> To: freebsd-bugs@FreeBSD.org Subject: Re: bin/34759: Phantasia does not accept [enter] key Message-ID: <200309101050.h8AAoBaX065366@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR bin/34759; it has been noted by GNATS. From: Greg Lewis <glewis@misty.eyesbeyond.com> To: freebsd-gnats-submit@FreeBSD.ORG Cc: Subject: Re: bin/34759: Phantasia does not accept [enter] key Date: Wed, 10 Sep 2003 04:49:26 -0600 Here is the diff I committed to ports. It should be sufficient to commit this to 4.x to close the PR. Index: phantasia/io.c =================================================================== RCS file: /var/fcvs/src/games/phantasia/Attic/io.c,v retrieving revision 1.6 diff -u -r1.6 io.c --- phantasia/io.c 16 Nov 1999 02:57:33 -0000 1.6 +++ phantasia/io.c 10 Sep 2003 09:52:52 -0000 @@ -79,6 +79,9 @@ case CH_NEWLINE: /* terminate string */ break; + case CH_CR: /* terminate string */ + break; + case CH_REDRAW: /* redraw screen */ clearok(stdscr, TRUE); continue; @@ -91,7 +94,7 @@ *inptr = '\0'; /* terminate string */ } - while (ch != CH_NEWLINE && inptr < cp + mx); + while (ch != CH_NEWLINE && ch != CH_CR && inptr < cp + mx); } /**/ /************************************************************************ Index: phantasia/phantdefs.h =================================================================== RCS file: /var/fcvs/src/games/phantasia/Attic/phantdefs.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 phantdefs.h --- phantasia/phantdefs.h 4 Sep 1994 04:03:06 -0000 1.1.1.1 +++ phantasia/phantdefs.h 10 Sep 2003 09:53:25 -0000 @@ -136,4 +136,5 @@ #define CH_KILL '\030' /* kill character (ctrl-X) */ #define CH_ERASE '\010' /* erase character (ctrl-H) */ #define CH_NEWLINE '\n' /* newline */ +#define CH_CR '\r' /* carriage return */ #define CH_REDRAW '\014' /* redraw screen character (ctrl-L) */ -- Greg Lewis Email : glewis@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : glewis@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309101050.h8AAoBaX065366>