mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Create lockfile with O_EXCL even when using fcntl locking. Remove it in any 

case after exiting. Log file handling is still buggy but this has to be done
by someone who has a qcam.
Henning Meier-Geinitz <henning@meier-geinitz.de>
DEVEL_2_0_BRANCH-1
Henning Geinitz 2002-01-11 17:49:09 +00:00
rodzic 3d95b80b62
commit e3e5173c66
1 zmienionych plików z 6 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
backend/qcam.c
Wyświetl plik

@ -300,10 +300,7 @@ qc_lock_wait (QC_Device * q, int wait)
sprintf (lockfile, "/tmp/LOCK.qcam.0x%x", q->port);
q->lock_fd = open (lockfile,
O_WRONLY | O_CREAT
#ifndef F_SETLK
| O_EXCL
#endif
O_WRONLY | O_CREAT | O_EXCL
, 0666);
if (q->lock_fd < 0)
{
@ -331,6 +328,7 @@ qc_lock_wait (QC_Device * q, int wait)
static SANE_Status
qc_unlock (QC_Device *q)
{
char lockfile[128];
#ifdef F_SETLK
#ifndef HAVE_STRUCT_FLOCK
struct flock
@ -363,16 +361,11 @@ qc_unlock (QC_Device *q)
strerror (errno));
return SANE_STATUS_INVAL;
}
#else
{
char lockfile[128];
sprintf (lockfile, "/tmp/LOCK.qcam.0x%x", q->port);
unlink (lockfile);
close (q->lock_fd);
q->lock_fd = -1;
}
#endif
sprintf (lockfile, "/tmp/LOCK.qcam.0x%x", q->port);
unlink (lockfile);
close (q->lock_fd);
q->lock_fd = -1;
return SANE_STATUS_GOOD;
}