Skip to content

Commit 314c8b6

Browse files
ecm-pushbxPerditionC
authored andcommitted
do not display any lone Carriage Returns
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.
1 parent 42980df commit 314c8b6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

kernel/initdisk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ void DosDefinePartition(struct DriveParamS *driveParam,
618618
ExtPri = "Ext";
619619
num = extendedPartNo;
620620
}
621-
printf("\r%c: HD%d, %s[%2d]", 'A' + nUnits,
621+
printf("%c: HD%d, %s[%2d]", 'A' + nUnits,
622622
(driveParam->driveno & 0x7f) + 1, ExtPri, num);
623623

624624
printCHS(", CHS= ", &chs);

kernel/main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -443,15 +443,15 @@ STATIC VOID signon()
443443
if (InitKernelConfig.Verbose < 0)
444444
{
445445
#ifdef CUSTOM_BRANDING
446-
printf("\n\r" CUSTOM_BRANDING "\n\n");
446+
printf("\n" CUSTOM_BRANDING "\n\n");
447447
#else
448-
printf("\n\r%S\n\n", MK_FP(FP_SEG(LoL), FP_OFF(LoL->os_release)));
448+
printf("\n%S\n\n", MK_FP(FP_SEG(LoL), FP_OFF(LoL->os_release)));
449449
#endif
450450
} else {
451451
#ifdef CUSTOM_BRANDING
452-
printf("\n\r" CUSTOM_BRANDING "\n\n%s", copyright);
452+
printf("\n" CUSTOM_BRANDING "\n\n%s", copyright);
453453
#else
454-
printf("\r%S"
454+
printf("\n%S"
455455
"Kernel compatibility %d.%d - "
456456
#if defined(__BORLANDC__)
457457
"BORLANDC"

0 commit comments

Comments
 (0)