ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refuse to read non-block device set in config. 

Avoid blocking on open if user sets device to unconnected pipe.
This commit is contained in:
Michal Janusz Miroslaw 2003-04-17 02:13:01 +00:00 committed by Alexandre Julliard
parent 0de21b651e
commit ac1d1056d4
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
files/drive.c
View File

@ -663,17 +663,38 @@ int DRIVE_ReadSuperblock (int drive, char * buff)
int fd; int fd;
off_t offs; off_t offs;
int ret = 0; int ret = 0;
struct stat stat_buf;
if (memset(buff,0,DRIVE_SUPER)!=buff) return -1; memset(buff, 0, DRIVE_SUPER);
if ((fd=open(DOSDrives[drive].device,O_RDONLY)) == -1) /* O_NONBLOCK in case we're opening FIFO; we'll be reset it later */
{ if ((fd = open(DOSDrives[drive].device, O_RDONLY|O_NOCTTY|O_NONBLOCK)) != -1) {
struct stat st; if (fstat(fd, &stat_buf) < 0) { /* shouldn't happen since we just opened that file */
ERR("fstat() failed for opened device '%s' (drive %c:) ! IT SHOULDN'T HAPPEN !!!\n",
DOSDrives[drive].device, 'A'+drive);
ret = -1;
} else if (!S_ISBLK(stat_buf.st_mode)) {
ERR("Device '%s' (drive %c:) is not a block device - check your config\n",
DOSDrives[drive].device, 'A'+drive);
ret = -1;
/* reset O_NONBLOCK */
} else if (fcntl(fd, F_SETFL, 0) < 0 || fcntl(fd, F_GETFL) & O_NONBLOCK) {
ERR("fcntl() failed to reset O_NONBLOCK for device '%s' (drive %c:)\n",
DOSDrives[drive].device, 'A'+drive);
ret = -1;
}
if (ret) {
close(fd);
fd = -1;
}
} else {
if (!DOSDrives[drive].device) if (!DOSDrives[drive].device)
ERR("No device configured for drive %c: !\n", 'A'+drive); ERR("No device configured for drive %c: !\n", 'A'+drive);
else else
ERR("Couldn't open device '%s' for drive %c: ! (%s)\n", DOSDrives[drive].device, 'A'+drive, ERR("Couldn't open device '%s' for drive %c: ! (%s)\n", DOSDrives[drive].device, 'A'+drive,
(stat(DOSDrives[drive].device, &st)) ? (stat(DOSDrives[drive].device, &stat_buf)) ?
"not available or symlink not valid ?" : "no permission"); "not available or symlink not valid ?" : "no permission");
}
if (fd == -1) {
ERR("Can't read drive volume info ! Either pre-set it or make sure the device to read it from is accessible !\n"); ERR("Can't read drive volume info ! Either pre-set it or make sure the device to read it from is accessible !\n");
PROFILE_UsageWineIni(); PROFILE_UsageWineIni();
return -1; return -1;