Skip to content

Eof #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stsp merged 5 commits into from
Mar 27, 2026
+48 −16
Merged

Eof #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfed8be
chario: fix to 4663795b6
stsp Mar 26, 2026
5023a80
chario: propagate EOF properly
stsp Mar 27, 2026
79f5217
console: treat 0 from int16 as EOF
stsp Mar 27, 2026
1f1a101
chario: more EOF propagation
stsp Mar 27, 2026
4792cbc
chario: break line on ^C
stsp Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 38 additions & 14 deletions kernel/chario.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,13 @@ STATIC void CharCmd(struct dhdr FAR *pdev, unsigned command)

STATIC int Busy(struct dhdr FAR *pdev)
{
int ret;
____R(CharReqHdr.r_count) = 1;
CharCmd(pdev, C_ISTAT);
return CharReqHdr.r_status & S_BUSY;
ret = CharReqHdr.r_status & S_BUSY;
if (!ret && !CharReqHdr.r_count)
return 256;
return ret;
}

void con_flush(struct dhdr FAR *pdev)
Expand Down Expand Up @@ -150,6 +155,8 @@ int ndread(struct dhdr FAR *pdev)
CharCmd(pdev, C_NDREAD);
if (CharReqHdr.r_status & S_BUSY)
return -1;
if (!CharReqHdr.r_count)
return 256;
return CharReqHdr.r_ndbyte;
}

Expand Down Expand Up @@ -321,13 +328,15 @@ STATIC unsigned do_read_char_dev(struct dhdr FAR *pdev, BOOL check_break)

FOREVER
{
if (!Busy(pdev))
if (!(c = Busy(pdev)))
{
c = CharIO(pdev, 0, C_INPUT);
if (c == CTL_C && !check_break && !break_ena)
clear_break();
break;
}
if (c == 256)
break;
if (pdev != syscon)
{
if (check_break)
Expand All @@ -340,7 +349,7 @@ STATIC unsigned do_read_char_dev(struct dhdr FAR *pdev, BOOL check_break)
if (c1 == CTL_C)
{
con_flush(syscon);
c = -1; // EOF
c = 256; // EOF
break;
}
}
Expand Down Expand Up @@ -377,15 +386,15 @@ STATIC int raw_get_char(struct dhdr FAR *pdev, BOOL check_break)
return read_char_sft_dev(pdev, check_break);
}

static unsigned char dev_read_char(int sft_in, BOOL check_break)
static unsigned int dev_read_char(int sft_in, BOOL check_break)
{
struct dhdr FAR *dev = sft_to_dev(idx_to_sft(sft_in));
return read_char_sft_dev(dev, check_break);
}

/* reads a line (buffered, called by int21/ah=0ah, 3fh) */
static void do_read_line(int sft_in, kbd0a FAR *kp, BOOL check_break,
unsigned char (*do_read_char)(int, BOOL))
static unsigned int do_read_line(int sft_in, kbd0a FAR *kp, BOOL check_break,
unsigned int (*do_read_char)(int, BOOL))
{
unsigned c;
unsigned cu_pos = scr_pos;
Expand All @@ -395,7 +404,7 @@ static void do_read_line(int sft_in, kbd0a FAR *kp, BOOL check_break,
int sft_out = sft_in;

if (size == 0)
return;
return 0;

/* the stored line is invalid unless it ends with a CR */
if (kp->_kb_buf[stored_size] != CR)
Expand All @@ -411,7 +420,8 @@ static void do_read_line(int sft_in, kbd0a FAR *kp, BOOL check_break,
switch (c)
{
case 0:
return;
case 256:
return c;
case LF:
/* show LF if it's not the first character. Never store it */
if (!first)
Expand Down Expand Up @@ -533,19 +543,28 @@ static void do_read_line(int sft_in, kbd0a FAR *kp, BOOL check_break,
break;
}
first = FALSE;
} while (c != CR);
} while (c != CR && c != CTL_C); // but not CTL_Z, checked with ms-dos
memcpy(kp->_kb_buf, local_buffer, count);
/* if local_buffer overflows into the CON default buffer we
must invalidate it */
if (count > LINEBUFSIZECON)
____R(kb_buf.kb_size) = 0;
/* kb_count does not include the final CR */
kp->kb_count = count - 1;
kp->kb_count = count - (c == CR);
return c;
}

static unsigned read_char_eof(int sft_in, BOOL check_break)
{
unsigned char c = read_char(sft_in, check_break);
if (!c)
return 256;
return c;
}

void read_line(int sft_in, kbd0a FAR *kp, BOOL check_break)
{
do_read_line(sft_in, kp, check_break, read_char);
do_read_line(sft_in, kp, check_break, read_char_eof);
}

/* called by handle func READ (int21/ah=3f) */
Expand All @@ -556,15 +575,20 @@ size_t read_line_handle(int sft_idx, size_t n, char FAR * bp, BOOL check_break)

if (inputptr == NULL)
{
unsigned int c;
/* can we reuse kb_buf or was it overwritten? */
if (kb_buf.kb_size != LINEBUFSIZECON)
{
____R(kb_buf.kb_count) = 0;
____R(kb_buf.kb_size) = LINEBUFSIZECON;
}
ktmp = (kbd0a FAR *)&kb_buf;
do_read_line(sft_idx, ktmp, check_break, dev_read_char);
kb_buf._kb_buf[kb_buf.kb_count + 1] = echo_char(LF, sft_idx);
c = do_read_line(sft_idx, ktmp, check_break, dev_read_char);
if (c == CR)
{
____R(kb_buf.kb_count) += 2;
kb_buf._kb_buf[kb_buf.kb_count - 1] = echo_char(LF, sft_idx);
}
inputptr = kb_buf._kb_buf;
if (*inputptr == CTL_Z)
{
Expand All @@ -573,7 +597,7 @@ size_t read_line_handle(int sft_idx, size_t n, char FAR * bp, BOOL check_break)
}
}

chars_left = &kb_buf._kb_buf[kb_buf.kb_count + 2] - inputptr;
chars_left = &kb_buf._kb_buf[kb_buf.kb_count] - inputptr;
if (n > chars_left)
n = chars_left;

Expand Down
12 changes: 10 additions & 2 deletions kernel/console.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ ConRead:

ConRead1:
call KbdRdChar ; Get a char from kbd in al
or ax,ax
jz _IOSuccess
stosb ; Store al to es:[di]
loop ConRead1 ; Loop until all are read

Expand Down Expand Up @@ -125,7 +127,7 @@ KbdRdChar:
jnz KbdRdRtn ; Exit if it was, returning it
call readkey ; get keybd char in al, ah=scan
or ax,ax ; Zero ?
jz KbdRdChar ; Loop if it is
jz KbdRdRtn
cmp ax,CTL_PRT_SCREEN ; Ctrl-Print screen?
jne KbdRd1 ; Nope, keep going
mov al,CTL_P ; Yep, make it ^P
Expand Down Expand Up @@ -157,11 +159,13 @@ CommonNdRdExit: ; *** tell if key waiting and return its ASCII if yes
int 16h ; Get status, if zf=0 al=char
jz ConNdRd4 ; Jump if no char available
or ax,ax ; See if call was supported
jz ConNdRd4 ; 0 (sometimes) means unsupported
jz _IOSuccess ; 0 (sometimes) means unsupported
call checke0 ; check for e0 scancode
or ax,ax ; Zero ?
jnz ConNdRd1 ; Jump if not zero
call readkey
or ax,ax ; See if call was supported
jz _IOSuccess ; 0 (sometimes) means unsupported
jmp short CommonNdRdExit
; if char was there but 0, fetch and retry...
; (why do we check uScanCode here?)
Expand Down Expand Up @@ -200,8 +204,12 @@ KbdInpCh1:
add ah,[cs:_kbdType]
int 16h ; get status, if zf=0 al=char
jz KbdInpRtnZero ; Jump if zero
or ax,ax ; See if call was supported
jz KbdInpRtnZero ; Jump if zero
; returns 0 or the last key that was waiting in AL
call readkey
or ax,ax ; See if call was supported
jz KbdInpRtnZero ; Jump if zero
jmp short KbdInpCh1
; just read any key that is waiting, then check if
; more keys are waiting. if not, return AL of this
Expand Down