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

Back out mkdtemp change. mkdtemp is not available on all platforms

DEVEL_2_0_BRANCH-1
Peter Fales 2001-06-21 01:48:33 +00:00
rodzic 6063e12839
commit 6c4ef58b92
1 zmienionych plików z 6 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
backend/dc25.c
Wyświetl plik

@ -138,7 +138,8 @@ static char tty_name[PATH_MAX];
#define DEF_TTY_NAME "/dev/ttyS0" #define DEF_TTY_NAME "/dev/ttyS0"
static speed_t tty_baud = DEFAULT_TTY_BAUD; static speed_t tty_baud = DEFAULT_TTY_BAUD;
static char tmpdir[] = "/tmp/dc25.XXXXXX"; static char *tmpname;
static char tmpnamebuf[] = "/tmp/dc25.XXXXXX";
static Dc20Info *dc20_info; static Dc20Info *dc20_info;
static Dc20Info CameraInfo; static Dc20Info CameraInfo;
@ -1869,10 +1870,10 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
DBG (1,"No device info\n"); DBG (1,"No device info\n");
} }
if ( strstr (tmpdir, "XXXXXX") ) { if ( tmpname == NULL ) {
if (!mkdtemp (tmpdir) ) { tmpname = tmpnamebuf;
perror (tmpdir); if ( mktemp(tmpname) == NULL ) {
DBG (1,"Unable to make temp file name\n"); DBG (1,"Unable to make temp file %s\n",tmpname);
return SANE_STATUS_INVAL; return SANE_STATUS_INVAL;
} }
} }
@ -2259,10 +2260,6 @@ sane_start (SANE_Handle handle)
* to set the "-u1" flag on the system drives. * to set the "-u1" flag on the system drives.
*/ */
char tmpname[100];
size_t tmpdirlen = strlen (tmpdir);
memcpy (tmpname, tmpdir, tmpdirlen);
strcpy (tmpname + tmpdirlen, "comet");
f = fopen (tmpname,"wb"); f = fopen (tmpname,"wb");
if ( f == NULL ) { if ( f == NULL ) {
DBG (4,"Unable to open tmp file\n"); DBG (4,"Unable to open tmp file\n");