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

remove unneeded printfs and properly handle multiple options on memdisk specified last line

Browse Source
This commit is contained in:
Kenneth J. Davis 2012-11-10 16:10:39 -05:00
parent 3a69192e7d
commit 99461450aa
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/config.c
View File

@ -745,35 +745,33 @@ BYTE FAR * GetNextMemdiskLine(BYTE FAR *cLine, BYTE *pLine)
if (mf && (*ptr == '=')) if (mf && (*ptr == '='))
{ {
BYTE FAR *old=sLine, FAR *new; BYTE FAR *old=sLine, FAR *new;
printf("Found = after memdisk arg\n");
/* check for = in command line */ /* check for = in command line */
for (; old < mf; ++old) for (; old < mf; ++old)
{ {
for (; (*old != '=') && (old < mf); ++old) for (; (*old != '=') && (old < mf); ++old)
; ;
/* ASSERT ptr points to = after memdisk option and old points to = before memdisk option or mf */ /* ASSERT ptr points to = after memdisk option and old points to = before memdisk option or mf */
printf("old = %c and new = %c\n", *old, *ptr);
/* compare backwards to see if same option */ /* compare backwards to see if same option */
for (new = ptr; (old >= sLine) && ((*old & 0xCD) == (*new & 0xCD)); --old, --new) for (new = ptr; (old >= sLine) && ((*old & 0xCD) == (*new & 0xCD)); --old, --new)
{ {
printf("%c=%c -> ", *old, *new);
if (iswh(*old) || iswh(*new)) break; if (iswh(*old) || iswh(*new)) break;
} }
/* if match found then overwrite, otherwise skip past the = */
if (((old <= sLine) || iswh(*old)) && iswh(*new)) if (((old <= sLine) || iswh(*old)) && iswh(*new))
{ {
printf("MATCH - clearing \n");
/* match found so overwrite with spaces */ /* match found so overwrite with spaces */
for(++old; !iswh(*old) && (old < mf); ++old) for(++old; !iswh(*old) && (old < mf); ++old)
*old = ' '; *old = ' ';
old = mf;
} }
else
printf("skipping after =\n"); {
for (; (*old != '=') && (old < mf); ++old) for (; (*old != '=') && (old < mf); ++old)
; ;
} }
} }
}
copy_char: copy_char:
*pLine = *ptr; *pLine = *ptr;
@ -820,7 +818,6 @@ VOID DoConfig(int nPass)
{ {
printf("MEMDISK version %u.%02u (%lu sectors)\n", mdsk->version, mdsk->version_minor, mdsk->size); printf("MEMDISK version %u.%02u (%lu sectors)\n", mdsk->version, mdsk->version_minor, mdsk->size);
DebugPrintf(("MEMDISK args:{%S}\n", mdsk->cmdline)); DebugPrintf(("MEMDISK args:{%S}\n", mdsk->cmdline));
printf("MEMDISK args:{%S}\n", mdsk->cmdline);
} }
else else
{ {
@ -915,7 +912,6 @@ VOID DoConfig(int nPass)
#endif #endif
DebugPrintf(("CONFIG=[%s]\n", szLine)); DebugPrintf(("CONFIG=[%s]\n", szLine));
printf("CONFIG=[%s]\n", szLine);
/* Skip leading white space and get verb. */ /* Skip leading white space and get verb. */
pLine = scan(szLine, szBuf); pLine = scan(szLine, szBuf);