sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BAS: Experimenta change -- ignore carriage returns in CRLF sequence

Browse Source
This commit is contained in:
Gregory Nutt 2014-11-06 13:19:41 -06:00
parent 36dbd756ba
commit 811128b275
1 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
interpreters/bas/fs.c
View File

@ -285,18 +285,36 @@ static int edit(int chn, int onl)
#else #else
if ((f->inCapacity + 1) < sizeof(f->inBuf)) if ((f->inCapacity + 1) < sizeof(f->inBuf))
{ {
/* Ignore carriage returns that may accompnay a CRLF sequence.
* REVISIT: Some environments may have other line termination rules
*/
if (ch != '\r')
{
/* Is this a new line character */
if (ch != '\n') if (ch != '\n')
{ {
/* No.. escape control characters other than newline and
* carriage return
*/
if (ch >= '\0' && ch < ' ') if (ch >= '\0' && ch < ' ')
{ {
FS_putChar(chn, '^'); FS_putChar(chn, '^');
FS_putChar(chn, ch ? (ch + 'a' - 1) : '@'); FS_putChar(chn, ch ? (ch + 'a' - 1) : '@');
} }
/* Output normal, printable characters */
else else
{ {
FS_putChar(chn, ch); FS_putChar(chn, ch);
} }
} }
/* Echo the newline (or not) */
else if (onl) else if (onl)
{ {
FS_putChar(chn, '\n'); FS_putChar(chn, '\n');
@ -304,6 +322,7 @@ static int edit(int chn, int onl)
f->inBuf[f->inCapacity++] = ch; f->inBuf[f->inCapacity++] = ch;
} }
}
#endif #endif
} }
while (ch != '\n'); while (ch != '\n');
@ -813,7 +832,6 @@ int FS_lock(int chn, off_t offset, off_t length, int mode, int w)
int FS_truncate(int chn) int FS_truncate(int chn)
{ {
#ifdef CONFIG_INTERPRETER_BAS_HAVE_FTRUNCATE
int fd; int fd;
off_t o; off_t o;
@ -844,10 +862,6 @@ int FS_truncate(int chn)
} }
return 0; return 0;
#else
FS_errmsg = strerror(ENOSYS);
return -1;
#endif
} }
void FS_shellmode(int dev) void FS_shellmode(int dev)
@ -1669,12 +1683,6 @@ int FS_appendToString(int chn, struct String *s, int onl)
f->inSize = f->inCapacity = 0; f->inSize = f->inCapacity = 0;
} }
if (s->length >= 2 && s->character[s->length - 2] == '\r')
{
s->character[s->length - 2] = '\n';
--s->length;
}
return 0; return 0;
} }
} }