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

batch-prompt - handle EOF and \n more accurately

666-epsonds-has-issues-with-saned
Matthew Gilmore 2023-02-09 20:06:30 -08:00
rodzic 971a5a2e92
commit 8072c2e895
1 zmienionych plików z 8 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
frontend/scanimage.c
Wyświetl plik

@ -39,6 +39,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
#include <errno.h>
#ifdef __FreeBSD__ #ifdef __FreeBSD__
#include <libgen.h> #include <libgen.h>
@ -2087,8 +2088,6 @@ main (int argc, char **argv)
const char *devname = 0; const char *devname = 0;
const char *defdevname = 0; const char *defdevname = 0;
const char *format = 0; const char *format = 0;
char readbuf[2];
char *readbuf2;
int batch = 0; int batch = 0;
int batch_print = 0; int batch_print = 0;
int batch_prompt = 0; int batch_prompt = 0;
@ -2748,14 +2747,18 @@ List of available devices:", prog_name);
{ {
if (batch_prompt) if (batch_prompt)
{ {
int c;
fprintf (stderr, "Place document no. %d on the scanner.\n", fprintf (stderr, "Place document no. %d on the scanner.\n",
n); n);
fprintf (stderr, "Press <RETURN> to continue.\n"); fprintf (stderr, "Press <RETURN> to continue.\n");
fprintf (stderr, "Press Ctrl + D to terminate.\n"); fprintf (stderr, "Press Ctrl + D (EOF) to terminate.\n");
readbuf2 = fgets (readbuf, 2, stdin); while ((c = getchar()) != '\n' && c != EOF);
if (readbuf2 == NULL) if (c == EOF)
{ {
if (ferror(stdin))
fprintf(stderr, "%s: stdin error: %s\n", prog_name, strerror(errno));
if (ofp) if (ofp)
{ {
#ifdef HAVE_LIBJPEG #ifdef HAVE_LIBJPEG