github.com/open-simh.simtools
1
0
Fork 0
mirror of https://github.com/open-simh/simtools.git synced 2026-04-26 12:07:11 +00:00
Code Issues Projects Releases Wiki Activity

Add parameter to dismount, better drive letter assignment, small bugs

Browse Source 
Dismount command lost drive parameter in previous commit.

Under windows, limit confusion by assigning pseudo-drive letters for images more
carefully.  Avoid letters used by Windows.

Dir /detail wasn't reporting rab$b_fsz correctly.

qualifier list keyword syntax error now reported correctly.

Include Windows release .exes in git.

Improve conditional compilation in compat.
This commit is contained in:
Timothe Litt
2016-02-29 22:24:30 -05:00
parent a88888f24e
commit 45e3b4e500
8 changed files with 174 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
extracters/ods2/diskio.c
View File

@@ -63,20 +63,57 @@ static char drives[26][4];
* the physical device. To keep it happy, map the next free drive letter to this
* filename, and use it to identify the device. phyio_init will check the mapping table
* to get the actual filename to open.
*
* To minimize confusion, under Windows, try to pick a pseudo-drive letter that
* isn't in use by windows. Avoid A & B unless all >= C are in use. If we can't
* find a non-conflicting letter, use the first letter not in use. Under any other
* OS, just use the first free letter.
*/
char *diskio_mapfile( const char *filename, int options ) {
int l, L = -1;
#ifdef _WIN32
int ff = -1, ffa = -1;
#endif
for( l = 0; l < 26; l++ ) {
if( diskfiles[l] == NULL && L < 0 ) L = l;
if( diskfiles[l] == NULL && L < 0) {
#ifdef _WIN32
char dl[3] = { 'A', ':', '\0' };
dl[0] += l;
if( ff < 0 )
ff = l;
if( driveFromLetter( dl ) == NULL) {
if( dl[0] >= 'C' ) {
if( L < 0 )
L = l;
} else {
if( ffa < 0 )
ffa = l;
}
}
#else
L = l;
#endif
}
if( diskfiles[l] && strcmp( diskfiles[l], filename ) == 0 ) {
printf( "%s is already mounted as drive %s\n", filename, drives[l] );
return NULL;
}
}
#ifdef _WIN32
if( L < 0 ) {
if( ffa >= 0 )
L = ffa;
else {
if( ff >= 0 )
L = ff;
}
}
#endif
if( L < 0 ) {
printf( "No free drive letters for %s\n", filename );
return 0;
return NULL;
}
snprintf(drives[L], 3, "%c:", L + 'A');
drives[L][3] = options;