tyler.durden/kernel
1
0
Fork 0
mirror of https://github.com/FDOS/kernel.git synced 2025-07-24 06:14:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

do not display any lone Carriage Returns

Browse Source 
In combination with SWITCHES=/N in fdconfig.sys this commit makes
it so only proper CR LF linebreaks are displayed, for instance when
piping dosemu2 output to a file.

SWITCHES=/F will set SkipConfigSeconds so that config.c SkipLine will
display a string reading "\r%79s\r" to delete the prompt that it has
displayed. This overwriting should not be needed for SkipConfigSeconds=0
however. Refer to subsequent commit.
This commit is contained in:
E. C. Masloch 2024-08-01 20:52:39 +02:00 committed by Kenneth J Davis
parent 42980dfe7d
commit 314c8b627b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/initdisk.c
View File

@ -618,7 +618,7 @@ void DosDefinePartition(struct DriveParamS *driveParam,
ExtPri = "Ext"; ExtPri = "Ext";
num = extendedPartNo; num = extendedPartNo;
} }
printf("\r%c: HD%d, %s[%2d]", 'A' + nUnits, printf("%c: HD%d, %s[%2d]", 'A' + nUnits,
(driveParam->driveno & 0x7f) + 1, ExtPri, num); (driveParam->driveno & 0x7f) + 1, ExtPri, num);
printCHS(", CHS= ", &chs); printCHS(", CHS= ", &chs);

8
kernel/main.c
View File

@ -443,15 +443,15 @@ STATIC VOID signon()
if (InitKernelConfig.Verbose < 0) if (InitKernelConfig.Verbose < 0)
{ {
#ifdef CUSTOM_BRANDING #ifdef CUSTOM_BRANDING
printf("\n\r" CUSTOM_BRANDING "\n\n"); printf("\n" CUSTOM_BRANDING "\n\n");
#else #else
printf("\n\r%S\n\n", MK_FP(FP_SEG(LoL), FP_OFF(LoL->os_release))); printf("\n%S\n\n", MK_FP(FP_SEG(LoL), FP_OFF(LoL->os_release)));
#endif #endif
} else { } else {
#ifdef CUSTOM_BRANDING #ifdef CUSTOM_BRANDING
printf("\n\r" CUSTOM_BRANDING "\n\n%s", copyright); printf("\n" CUSTOM_BRANDING "\n\n%s", copyright);
#else #else
printf("\r%S" printf("\n%S"
"Kernel compatibility %d.%d - " "Kernel compatibility %d.%d - "
#if defined(__BORLANDC__) #if defined(__BORLANDC__)
"BORLANDC" "BORLANDC"