system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

As last option for drive type detection we try the device node name.

Browse source
This commit is contained in:
Paul van Schayck 2005-02-25 13:58:45 +00:00 committed by Alexandre Julliard
parent 8922da9ed4
commit 6cf1b31d25
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
programs/winecfg/drivedetect.c
View file

@ -43,6 +43,13 @@ BOOL gui_mode = TRUE;
static long working_mask = 0;
#ifdef HAVE_MNTENT_H
static DEV_NODES sDeviceNodes[] = {
{"/dev/fd", DRIVE_REMOVABLE},
{"/dev/cdrom", DRIVE_CDROM},
{"",0}
};
static char *ignored_fstypes[] = {
"devpts",
"tmpfs",
@ -59,6 +66,20 @@ static char *ignored_mnt_dirs[] = {
NULL
};
static int try_dev_node(char *dev)
{
const DEV_NODES *pDevNodes = sDeviceNodes;
while(pDevNodes->szNode[0])
{
if(!strncmp(dev,pDevNodes->szNode,strlen(pDevNodes->szNode)))
return pDevNodes->nType;
++pDevNodes;
}
return DRIVE_FIXED;
}
static BOOL should_ignore_fstype(char *type)
{
char **s;
@ -288,11 +309,11 @@ int autodetect_drives()
fclose(fstab);
return FALSE;
}
WINE_TRACE("adding drive %c for %s, type %s\n", letter, ent->mnt_dir, ent->mnt_type);
strncpy(label, "Drive X", 8);
label[6] = letter;
WINE_TRACE("adding drive %c for %s, type %s with label %s\n", letter, ent->mnt_dir, ent->mnt_type,label);
if (!strcmp(ent->mnt_type, "nfs")) type = DRIVE_REMOTE;
else if (!strcmp(ent->mnt_type, "nfs4")) type = DRIVE_REMOTE;
@ -301,7 +322,7 @@ int autodetect_drives()
else if (!strcmp(ent->mnt_type, "coda")) type = DRIVE_REMOTE;
else if (!strcmp(ent->mnt_type, "iso9660")) type = DRIVE_CDROM;
else if (!strcmp(ent->mnt_type, "ramfs")) type = DRIVE_RAMDISK;
else type = DRIVE_FIXED;
else type = try_dev_node(ent->mnt_fsname);
add_drive(letter, ent->mnt_dir, label, "0", type);

6
programs/winecfg/properties.h
View file

@ -87,6 +87,12 @@ typedef struct
int nSynchronous;
} X11DRV_DESC;
typedef struct
{
char szNode[MAX_NAME_LENGTH];
int nType;
} DEV_NODES;
VERSION_DESC *getWinVersions(void);
VERSION_DESC *getDOSVersions(void);
DLL_DESC *getDLLDefaults(void);