summaryrefslogtreecommitdiff
path: root/frontend
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-02-16 10:20:08 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-02-16 10:20:08 +0100
commit778ebf8ee9cb22ea5727844333bcd5a6ee6bc0de (patch)
treea754e785b286ed82b45fe4e50b980714ad80e0a7 /frontend
parent7d8aac1f3634dc58785bec7acf097dd6bac8c394 (diff)
parent32cb765f681299af226ca0520993cbe47ba5ecd0 (diff)
Merge branch 'release/debian/1.2.1-1'debian/1.2.1-1
Diffstat (limited to 'frontend')
-rw-r--r--frontend/jpegtopdf.c4
-rw-r--r--frontend/saned.c10
-rw-r--r--frontend/scanimage.c25
3 files changed, 31 insertions, 8 deletions
diff --git a/frontend/jpegtopdf.c b/frontend/jpegtopdf.c
index 8f144b5..5c5d712 100644
--- a/frontend/jpegtopdf.c
+++ b/frontend/jpegtopdf.c
@@ -201,7 +201,11 @@ static SANE_Int _get_current_time( struct tm *pt, SANE_Byte *sign_c, int *ptz_h,
goto EXIT;
}
/* get time difference ( OHH'mm' ) */
+#ifdef __FreeBSD__
+ tz = -pt->tm_gmtoff;
+#else
tz = timezone;
+#endif
if ( tz > 0 ) {
*sign_c = '-';
}
diff --git a/frontend/saned.c b/frontend/saned.c
index 5b16980..e31758a 100644
--- a/frontend/saned.c
+++ b/frontend/saned.c
@@ -84,8 +84,8 @@
#include "lgetopt.h"
-#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
-# include <sys/poll.h>
+#if defined(HAVE_POLL_H) && defined(HAVE_POLL)
+# include <poll.h>
#else
/*
* This replacement poll() using select() is only designed to cover
@@ -2449,7 +2449,7 @@ void
sig_int_term_handler (int signum)
{
/* unused */
- signum = signum;
+ (void) signum;
signal (SIGINT, NULL);
signal (SIGTERM, NULL);
@@ -2543,7 +2543,7 @@ saned_avahi_group_callback (AvahiEntryGroup *g, AvahiEntryGroupState state, void
char *n;
/* unused */
- userdata = userdata;
+ (void) userdata;
if ((!g) || (g != avahi_group))
return;
@@ -2657,7 +2657,7 @@ saned_avahi_callback (AvahiClient *c, AvahiClientState state, void *userdata)
int error;
/* unused */
- userdata = userdata;
+ (void) userdata;
if (!c)
return;
diff --git a/frontend/scanimage.c b/frontend/scanimage.c
index b587b9d..d79d487 100644
--- a/frontend/scanimage.c
+++ b/frontend/scanimage.c
@@ -40,6 +40,14 @@
#include <unistd.h>
#include <stdarg.h>
+#ifdef __FreeBSD__
+#include <libgen.h>
+#endif
+
+#if defined (__APPLE__) && defined (__MACH__)
+#include <libgen.h> // for basename()
+#endif
+
#include <sys/types.h>
#include <sys/stat.h>
@@ -917,9 +925,10 @@ fetch_options (SANE_Device * device)
scanimage_exit (1);
}
- /* create command line option only for settable options */
- if (!SANE_OPTION_IS_SETTABLE (opt->cap) || opt->type == SANE_TYPE_GROUP)
- continue;
+ /* create command line option only for non-group options */
+ /* Also we sometimes see options with no name in rogue backends. */
+ if ((opt->type == SANE_TYPE_GROUP) || (opt->name == NULL))
+ continue;
option_number[option_count] = i;
@@ -1072,6 +1081,12 @@ process_backend_option (SANE_Handle device, int optnum, const char *optarg)
opt = sane_get_option_descriptor (device, optnum);
+ if (!SANE_OPTION_IS_SETTABLE (opt->cap))
+ {
+ fprintf (stderr, "%s: attempted to set readonly option %s\n",
+ prog_name, opt->name);
+ scanimage_exit (1);
+ }
if (!SANE_OPTION_IS_ACTIVE (opt->cap))
{
fprintf (stderr, "%s: attempted to set inactive option %s\n",
@@ -2013,6 +2028,10 @@ static void print_options(SANE_Device * device, SANE_Int num_dev_options, SANE_B
if (!opt)
opt = sane_get_option_descriptor (device, i);
+ /* Some options from rogue backends are empty. */
+ if (opt->name == NULL)
+ continue;
+
if (ro || SANE_OPTION_IS_SETTABLE (opt->cap)
|| opt->type == SANE_TYPE_GROUP)
print_option (device, i, opt);