OS_Develop/FreeDOS
OS_Develop/FreeDOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not clobber the DTA if findfirst or findnext fails. Fixes bug #1712

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@733 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2003-12-01 00:45:38 +00:00
parent a44981fc3a
commit 76cb6edf6e
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/dosfns.c
View File

@ -1036,21 +1036,14 @@ COUNT DosFindFirst(UCOUNT attr, BYTE FAR * name)
in newstuff.c. in newstuff.c.
- Ron Cemer */ - Ron Cemer */
fmemset(dmp, 0, sizeof(dmatch));
/* initially mark the dta as invalid for further findnexts */
dmp->dm_attr_fnd = D_DEVICE;
memset(&SearchDir, 0, sizeof(struct dirent));
SAttr = (BYTE) attr; SAttr = (BYTE) attr;
#if defined(FIND_DEBUG) #if defined(FIND_DEBUG)
printf("Remote Find: n='%Fs\n", PriPathName); printf("Remote Find: n='%Fs\n", PriPathName);
#endif #endif
fmemcpy(&sda_tmp_dm, dta, 21);
dta = &sda_tmp_dm; dta = &sda_tmp_dm;
memset(&sda_tmp_dm, 0, sizeof(dmatch)+sizeof(struct dirent));
if (rc & IS_NETWORK) if (rc & IS_NETWORK)
rc = remote_findfirst(current_ldt); rc = remote_findfirst(current_ldt);
@ -1074,10 +1067,11 @@ COUNT DosFindFirst(UCOUNT attr, BYTE FAR * name)
rc = dos_findfirst(attr, PriPathName); rc = dos_findfirst(attr, PriPathName);
dta = dmp; dta = dmp;
fmemcpy(dta, &sda_tmp_dm, 21); if (rc == SUCCESS)
pop_dmp(dmp); {
if (rc != SUCCESS) fmemcpy(dta, &sda_tmp_dm, 21);
dmp->dm_attr_fnd = D_DEVICE; /* mark invalid */ pop_dmp(dmp);
}
return rc; return rc;
} }
@ -1111,14 +1105,17 @@ COUNT DosFindNext(void)
printf("findnext: %d\n", dmp->dm_drive); printf("findnext: %d\n", dmp->dm_drive);
#endif #endif
fmemcpy(&sda_tmp_dm, dmp, 21); fmemcpy(&sda_tmp_dm, dmp, 21);
fmemset(dmp, 0, sizeof(*dmp)); memset(&SearchDir, 0, sizeof(struct dirent));
dta = &sda_tmp_dm; dta = &sda_tmp_dm;
rc = (sda_tmp_dm.dm_drive & 0x80) ? rc = (sda_tmp_dm.dm_drive & 0x80) ?
remote_findnext(&sda_tmp_dm) : dos_findnext(); remote_findnext(&sda_tmp_dm) : dos_findnext();
dta = dmp; dta = dmp;
fmemcpy(dmp, &sda_tmp_dm, 21); if (rc == SUCCESS)
pop_dmp(dmp); {
fmemcpy(dmp, &sda_tmp_dm, 21);
pop_dmp(dmp);
}
return rc; return rc;
} }