Wykres commitów

209 Commity (20fbf1dc94cb3f4952ab973d1674abab0639a8f0)

Autor SHA1 Wiadomość Data
Chris Bagwell be3f46204b * po/Makefile.am, configure.in: convert remaining directory,
po, to use automake.
2009-02-21 22:45:14 +00:00
Mattias Ellert 18e9d6c358 Restore alloca include order 2009-02-20 17:56:54 +00:00
Mattias Ellert 0827226249 Adding missing liblib dependencies 2009-02-20 16:51:09 +00:00
Chris Bagwell cb4fb37eca Have configure define configdir so all makefiles can use
it (fixes bug introduce with sanei converted to automake).
Enable running testsuite during distcheck.
2009-02-19 18:10:12 +00:00
Chris Bagwell e380729334 * configure.in, tools/Makefile.am: convert tools to automake.
Add tools/openbsd to distribution package.
* include/Makefile.am: include files should have been installed
under sane/ directory when converted to automake.
* doc/Makefile.am: Cleanup. Use automake's built in support to
install docs within subdirectories.
2009-02-19 02:17:45 +00:00
Julien BLACHE 25818023c6 Fix handling of Avahi server restart. 2009-02-18 13:19:51 +00:00
Chris Bagwell aef46252cc convert frontend, include, and sanei directories to use
automake.  Only reference libsanei.la now. Use am_conditional
to compile sanei_jpeg.lo.  distcheck now runs sanei/wire_test.
2009-02-15 03:31:36 +00:00
Chris Bagwell caba90c552 * configure.in, acinclude.ac: Cleanup autoconf 2.63 warnings.
add cv_ prefix to cached variable.  Remove AC_ARG_PROGRAM as
automake already invokes this. When prefered AC_USE_SYSTEM_EXTENSIONS
exists, use that instead of AC_GNU_SOURCE/AC_AIX/AC_MINUX.
Cleanup socket detection more by creating only a single
SOCKET_LIBS that contains list of all optional libraries
for any socket related funciton.  Make sure that checks
for socket related functions use SOCKET_LIBS when searching.
Check for getopt_long() and getopt.h.  Make OS/2 use
-no-undefined (same as windows).
* ltmain.sh, m4/libtool.m4: Upgrade to libtool 1.5.26.
* Makefile.am: Cleanups to match configure updates.
* frontend/scanimage.c, include/Makefile.in, lib/getopt.c
lib/getopt1.c, toosl/sane-desc.c, include/lgetopt.h:
Rename internal getopt.h to lgetopt.h to allow using
external getopt.h when it exists.  This allows to go
back to optionally compiling getopt()/getopt_long() and its
prototypes and not have conflicts with external headers/symbols.
2009-02-06 03:10:44 +00:00
Chris Bagwell 0330a4d416 * aclocalm4: fix prototype of internal strcasestr and usleep.
* configure.in: Group all USB logic together and all SCSI
logic together to aid understanding of whats no longer
valid.  Allow sharing enable/disable options between all
USB drivers on multiple platforms.  Combined CAM_LIBS and
SCSI_LIBS since they are mutually exclusive.
Skip some USB/SCSI checks when previous tests show it will always fail.
* backend/Makefile.am, tools/Makefile.in: Combine CAM_LIBS and
SCSI_LIBS. Add missing SOCKET_LIBS to epson2.  Add USB_LIB.
* saned.c: Add limits.h for PATH_MAX.
2009-02-02 03:17:32 +00:00
Chris Bagwell 23ff26f9a5 * acinclude.m4, configure.in: Put all libraries into their
own *_LIB variables instead of $LIB so that we do not have to
link in the world to all executables. Modified SANE_CHECK_U_TYPES
to be a little more portable to platforms that use #define
for u_* types. Create SANE_CHECK_BACKENDS macro so that
PRELOADABLE_BACKENDS can also be valided.  Auto-populated
PRELAODABLE_BACKENDS when detect dlopen() won't work.
Various protability cleanups.
* backend/dll.c: Make dll-preload.c a .h since its an include and
not compilable byitself.
* frontend/Makefile.in, frontend/scanimage.c, include/laaloca.h,
  lib/Makefile.am, lib/alloca.c, strcasestr.c, tools/Makefile.in,
  tools/sane-desc.c: Convert lib/ to automake.  Create a liblib.la
  for everyone to use and a libfelib.la for only frontend programs.
  Make all internal programs be prefixed with sanei_ as not to conflict
  with other programs libsane is linked in with that will also most
  likely create similar internal utils on problem platforms.
  * include/getopt.h, lib/getopt.c, lib/getopt1.c: Always compile
  and link in getopt_long() but prefix it with sanei_.  Its
  easier to always use internal version then try to figure out what
  platforms support getopt_long() and what header files to use.
  * backend/Makefile.am: Convert backend makefile to automake.
  Initial version that is feature parity with original but uses
  specific rules instead of wildcards and only links in libraries/objs
  really required. Room for more cleanup of whats linked in once
  all makefiles have been converted to automake.
2009-01-31 03:12:18 +00:00
Chris Bagwell 907cbe7ac6 Replace usage of getgrouplist() with
getgrent() and friends.  getgrouplist is not posix and not
on several platforms including cygwin.
2009-01-31 02:18:41 +00:00
Chris Bagwell b52b0c0c14 * backend/epson2.c backend/pixma_bjnp.c, include/sane/sanei_backend.h,
sanei/sanei_tcp.c, sanie/sanei_udp.c: Improve portablity by
  removing usage of MSG_WAITALL since not all platforms support
  that (cygwin).  Default is to be blocking anyways.  Changed
  usage of MSG_NOTWAIT to use fcntl() function as needed as well.
  * configure.in, lib/Makefile.in, lib/strcasestr.c: Add internal
  strcasestr() for platforms missing it (cygwin).
  * pixma_common.c: My source match header prototype for picky
  compilers (cygwin).
  * backend/umax_pp_mid.c: Allow BACKEND_NAME to be filename
  yet debug to be SANE_DEBUG_UMAX_PP to match man page.
2009-01-29 15:10:19 +00:00
Julien BLACHE a42b57186f Make batch mode create output files atomically. 2009-01-17 10:18:40 +00:00
Chris Bagwell c90e23a6d2 Updates to Makefiles to prepare for transition to automake.
Fix a few bugs with "all" and "uninstall" targets to work when
$(builddir) != $(srcdir).  Added $(DESTDIR) to uninstall target.
Made $(distdir) related to current directory to match automake.
2009-01-16 23:39:48 +00:00
Julien BLACHE b9807541c7 Add a data_portrange configuration file option to saned. 2008-12-12 15:51:15 +00:00
Julien BLACHE 3dfc5881ea Fix crasher typo in IPv4-only code. 2008-12-12 15:29:59 +00:00
Julien BLACHE 383947f31d Fix erroneous comment. 2008-12-12 15:29:10 +00:00
m. allan noah 425a3d034d * backend/fujitsu.[ch]: backend v85
- round pixels_per_line down to arbitrary limits for fi-4990 & fi-4860
 - fi-4860 returns random garbage to serial number queries
 - initialize *info to 0 in sane_control_option()
* doc/descriptions/fujitsu.desc: backend v85, improve status/comments
* frontend/scanimage.c: initialize *info, fix buffer overwalk
2008-12-10 21:32:10 +00:00
m. allan noah ba856d2aec 2008-09-25 m. allan noah <kitno455 a t gmail d o t com>
* include/sane/saneopts.h: underscore not allowed in option names
        * frontend/scanimage.c: fix broken unknown length (-1) binary scans,
          fix invalid tiff height with unknown length scans, fix compiler warn
2008-09-25 02:39:52 +00:00
Julien BLACHE 9f7441d267 Initialize ngroups to 0, ditto for runas_{u,g}id (instead of -1). 2008-08-05 09:27:39 +00:00
Julien BLACHE eefb1b1155 Get option descriptor 0 before trying to read the value for option 0. 2008-08-04 20:54:10 +00:00
Julien BLACHE 32b343dcea Set supplemental group list in addition to setting euid and egid. Reported by Cameron Hutchison. 2008-07-31 09:42:33 +00:00
Julien BLACHE 125ed414d4 Call setegid() before seteuid(), aka while we're still root. 2008-07-28 10:48:41 +00:00
Julien BLACHE 0ec211ef87 Rework error/exit path in process_request() to properly terminate the Avahi thread in debug mode. 2008-06-24 19:41:44 +00:00
Julien BLACHE 83365608d3 Terminate child processes before exiting in debug mode. 2008-06-22 08:47:59 +00:00
Julien BLACHE dd6537cf0a Fix function name in debug message. 2008-06-22 08:41:51 +00:00
m. allan noah 0acce974b2 add %n (newline) to -f option 2008-05-28 00:48:21 +00:00
Stéphane Voltz 78fc186543 - handling of SANE_STATUS_WARMING_UP 2008-05-26 04:56:41 +00:00
m. allan noah 084a18b0c4 remove undocumented and otherwise unused SANE_CAP_ALWAYS_SETTABLE 2008-05-21 01:20:35 +00:00
Julien BLACHE fde1551f68 Fix typo. 2008-04-13 14:21:59 +00:00
Julien BLACHE eff4892c1c Restrict protocol for service announcement/browsing/resolution to IPv4
unless IPv6 is enabled.
2008-04-11 17:43:16 +00:00
Julien BLACHE f4ff1b74f6 Add mDNS DNS-SD support to saned and the net backend so they can announce
and discover each other automatically.

Optional at configure time, requires Avahi >= 0.6.4.
2008-04-11 17:18:19 +00:00
Julien BLACHE 90a1c88e0d saned can now drop privileges when running in standalone mode. 2008-04-10 16:55:36 +00:00
Julien BLACHE cbb3833dbe Add a PID file. 2008-04-10 16:39:06 +00:00
Julien BLACHE ce7efefec7 Replace daemon() with an open-coded equivalent. 2008-04-10 16:31:17 +00:00
Julien BLACHE 26ffc6a211 Debug mode: close all sockets once we have accepted a connection. 2008-04-06 17:27:39 +00:00
Julien BLACHE f3756baa4a Close open file descriptors appropriately when spawning child process. 2008-04-06 17:23:36 +00:00
Julien BLACHE 9c6fea1943 Add standalone daemon mode, building upon the AF-indep/IPv6 debug mode.
Reorganize code by splitting the main() function into a series of functions.
Factorize common code between the old network code and the AF-indep code. There's now only one version of main().
2008-04-06 15:21:47 +00:00
Julien BLACHE ef2838234e Improve comment, once again. 2008-04-06 10:18:16 +00:00
Julien BLACHE 2330d122e0 Fix typo in comment. 2008-03-20 21:48:26 +00:00
Julien BLACHE 5ba1b2b917 Fix messages around getservbyname() in the IPv4 code to mention "sane-port" instead of "sane". 2008-03-20 21:47:14 +00:00
Mattias Ellert 22efa538b7 Fix warnings about ignored --datarootdir 2008-02-03 06:59:36 +00:00
m. allan noah 09f523defe remove support for SANE_FRAME_JPEG, add other frame types but commented out 2007-12-29 21:36:25 +00:00
m. allan noah b2666cada5 scanimage: bugfix, dont round up negative user input values
fujitsu.desc: add/consolidate new models
2007-08-08 12:46:02 +00:00
m. allan noah c8e8f2c41a scanimage.c: add default: blocks to switch statements so recent gcc will shutup
fujitsu.[ch]: update to backend v1.0.52:
- remove unused jpeg function
- reactivate look-up-table based brightness and contrast options
- change range of hardware brightness/contrast to match LUT versions
- call send_lut() from sane_control_option instead of sane_start
2007-07-31 18:07:53 +00:00
m. allan noah e343cc59cf * backend/fujitsu.[ch], backend/fujitsu-scsi.h: update to v1.0.50,
add JPEG support, usb command sending and scan params cleanups
* include/sane/sane.h: add SANE_FRAME_JPEG
* frontend/scanimage.c: dont crash on unknown frame types
2007-07-10 16:07:25 +00:00
Oliver Rauch 5b38d6f1d6 *** empty log message *** 2007-03-17 15:51:54 +00:00
Henning Geinitz 6bff1fdf4b Added examples on how to set the scan area in the manual page (bug
#303802). Mention how to separate parameters from options in --help and manpage
(bug #303819).
2006-10-03 18:39:35 +00:00
Jon Chambers b6f25c8971 flush the output buffer after each page (help prevent lost data on ctrl-C) 2006-06-15 20:10:15 +00:00
m. allan noah e5bb981d6a move sane_cancel outside of tight loop, only done at end of batch 2006-06-09 13:04:06 +00:00
Henning Geinitz de2c4fb484 If saned does not find any config file, it calls fclose with a NULL FILE*. The
code may also leak open file descriptors and FILE's if multiple config files are
found. (bug #303339). Fixed possible segfault on close_handle() (bug #303338).
2006-04-09 10:07:18 +00:00
Henning Geinitz 56ba575749 Don't create and delete a file in batch mode if the document feeder is empty or
if CTRL-D is pressed in prompt mode. This change avoids deleting existing
files. For an explanation, see bug #302797.
2006-01-02 23:00:23 +00:00
Henning Geinitz 947339db25 Run "makedepend" if it's available. This way "make" builds
backends correctly even if only included files (e.g. headers) are
	  changed. Don't be too verbose when running makedepend.
	  Create links libsane-*.so.1 to the real library files if the
	  links are not there. This fixes dynamic loading on OpenBSD. The
	  links are not created for MacOS X as they don't work there.
	  Remove any libsane.* links in /usr/local/lib/sane. Such links
	  are created by libtool. As they point to libsane-v4l.so,
	  scanimage -L doesn't find any scanner in case of ld.so
	  misconfigurations.
	  The install target is much quiter now and prints the libtool
	  message only once now.
2005-10-29 20:01:54 +00:00
Henning Geinitz 881756aff9 Added vendor "Lexmark". 2005-10-16 17:19:21 +00:00
Henning Geinitz 38087da06a Use correct size for fgets. Patch from Antoine Jacoutot <ajacoutot@lphp.org>. 2005-10-06 19:11:09 +00:00
Henning Geinitz e3e00e9d91 Added progress indicator to scanimage (based on patch from Mario Goppold
<mgoppold@tbz-pariv.de>). Updated copyright information, added links to
sane-devel mailing list.
2005-09-23 12:05:51 +00:00
Henning Geinitz 3ae9b03454 Don't exit with error when trying to set inactive options. This especially
happens in connection with geometry options and the v4l backend (bugs #300321,
#301977).
2005-08-14 14:51:06 +00:00
Henning Geinitz 6c3427c52d Changes to support SANE on ZETA. Not all
patches have been applied yet, but it's a start. The backends
	  are not installed as shared libs but as add-ons, which are shared libs
	  but in a specific folder in [/system|~]/config/add-ons/ named SANE/.
	  The install target has been changed to account for this,
	  Some files don't exist in BeOS/ZETA (ipc.h, ...).
	  Bbackend function names get a prefix, I suppose to avoid namespace clashes.
	  Though we do have a libdl to implement dl_open, the native way is prefered.
	  Added a --with-docdir= configure arg.
	  BeOS has a broken get[name|addr]info() from bind. This is fixed in ZETA R1.
	  libtool needs -no-undefined. Various VPATH fixes.
	  Check for <be/drivers/USB_scanner.h>, but not used yet.
	  No S_IFSOCK (sockets are fds to /dev/net/api). Stub pio code, untested.
	  Patch from Francois Revol <revol@free.fr>.
2005-07-15 21:59:25 +00:00
Frank Zago 483e472841 New email address. 2005-07-07 11:55:43 +00:00
Mattias Ellert 23b39a25f1 Missing braces 2005-04-28 12:49:01 +00:00
Gerard Klaver e9e045a44b -split up printf command to remove warning ISO C89 (string length > 509)
-patch for bugreport 300160, ranges for width and height are wrong

-added option -B -buffersize so instead of default input buffer of
32*1024 a buffer of 1024*1024 can be chosen, so for vidcams for example
640x480, usb 2.0, 30fps less time is needed to fill input buffer.
2005-04-15 21:09:56 +00:00
Henning Geinitz ee71d11e42 Fixed NULL string crash. 2004-10-16 13:49:16 +00:00
Julien BLACHE 746faf32c9 More auth_callback() fixes, although these ones aren't critical. 2004-09-05 09:27:28 +00:00
Julien BLACHE 91051e826f * frontend/saned.c: auth_callback(): arrays are passed as pointers, declaring parameters as arrays of fixed size is useless. memset() the correct length, not sizeof(pointer).
Caught while testing splint on the SANE sources, potential information leakage.
2004-09-01 21:03:35 +00:00
Frank Zago bf8369276c fixed a couple bugs. 2004-08-14 17:33:20 +00:00
Julien BLACHE c5f9d0d711 * frontend/scanimage.c: Added the possibility to cleanly stop a batch by pressing Ctrl+D when using --batch-prompt. 2004-07-31 17:26:02 +00:00
Henning Geinitz 7751b3b7eb Changed service name from "sane" to "sane-port". This is the
IANA registered service name for port 6566 (bug #300758).
2004-06-02 18:38:28 +00:00
Henning Geinitz 524d3f3c47 Added checks for bad handles for SANE_NET_CLOSE and SANE_NET_CANCEL. This is
intended to stop saned from segfaulting when a bad handle is used.
2004-03-03 19:13:04 +00:00
Henning Geinitz a2e686d667 Added support for asking for pressing a key before scanning a page in a batch
scan. Patch from Dominik Fischer <dom_fischer@web.de>.
2004-02-22 11:17:49 +00:00
Julien BLACHE 725e1c1940 * frontend/saned.c: Use strcasecmp() instead of strcmp() when matching IPv6 addresses. 2003-12-13 16:40:57 +00:00
Julien BLACHE 3d843bab44 * frontend/saned.c: fixed endianness issues in check_v{4,6}_in_range(), also
fixed portability issues to other UNIX platforms due to different representations
of IPv6 addresses.
2003-11-02 13:54:21 +00:00
Julien BLACHE e54e51f586 Forgot one of the two in_addr_t declarations, now replaced the
second one too (s/in_addr_t/u_int32_t/).
2003-10-22 19:44:14 +00:00
Julien BLACHE 97496000ce * frontend/saned.c: replaced in_addr_t mask; by u_int32_t mask; in
check_v4_in_range(). in_addr_t doesn't seem to exist on OS/2, and
it's nothing more than an unsigned 32 bits integer.
2003-10-22 16:58:58 +00:00
Julien BLACHE 9695362397 * frontend/saned.c: added subnet support to saned ; added
check_v4_in_range and check_v6_in_range functions.
* backend/saned.conf: updated the config file.
* doc/saned.man: updated the manpage for saned.
2003-10-19 10:36:28 +00:00
Henning Geinitz a4e842d946 Minor cleanup from the jpeg move. Reverted frontend link order. 2003-07-26 21:40:06 +00:00
Peter Fales 3b3bd83e17 Need to reorder libs to get static build to work 2003-07-26 18:27:05 +00:00
Henning Geinitz b59fc7f95a Updated email address of Andreas Beck. 2003-07-26 09:33:21 +00:00
Henning Geinitz 494e6a1cf4 When parsing string options whose arguments are too short, don't overwrite the
remaining command line arguments. Print "[inactive]" after every inactive
option.
2003-07-19 14:23:31 +00:00
Henning Geinitz 64ea3dfc5f Check if ss_family or __ss_family is in struct sockaddr_storage. Otherwise
diasbale ipv6. Patch from Julien BLACHE <jb@jblache.org>.
2003-06-04 19:49:48 +00:00
Henning Geinitz 562c9192ec Use u_int_* instead of uint_*. That fixes compilation for MacOS X (hopefully). 2003-05-26 23:34:07 +00:00
Henning Geinitz d3322e4519 Replaces a strncmp() call by a macro detecting V4-mapped address. This is a
lot safer than the strncmp, and doesn't break anything. Patch from Julien
BLACHE <jb@jblache.org>.
2003-05-12 16:40:05 +00:00
Henning Geinitz 0fc0f3f253 Added implementation of poll() for systems that don't provide it (patch from
Julien BLACHE <jb@jblache.org>).
2003-05-04 12:58:22 +00:00
Henning Geinitz 2fca468542 Remove -all_load again and try to use the correct link order for
libraries.
2003-05-03 20:48:15 +00:00
Henning Geinitz f642328f0f Try to get the correct port number when /etc/services doesn't list "sane" by
asking for "6566". Check result of socket(). Print ip faimily and port.
2003-05-03 20:43:04 +00:00
Henning Geinitz 69a101ef06 Add -all_load to linker flags on MacOS X to avoid linker errors. 2003-05-02 21:58:57 +00:00
Henning Geinitz e93322e28d Test for poll() and disable IPV6 if not found. 2003-05-02 09:41:12 +00:00
Henning Geinitz 749ceed2e6 Added a switch to disable libusb. Removed switch to enable ipv6
uncondinionally.  Check for sys/poll.h.
2003-04-02 16:21:07 +00:00
Henning Geinitz 966e3536da Include poll.h only if new saned code is used. Fixes compilation on
OS/2. Patch from Julien BLACHE <jb@jblache.org>.
2003-03-31 16:15:10 +00:00
Henning Geinitz 088281c4e1 Added support for IPv6. Updated manpages. Patch from Julien BLACHE
<jb@jblache.org>.
2003-03-30 19:07:18 +00:00
Frank Zago 711d1bb348 Added more sane_init/sane_exit tests. Added Fujistu and Relisys to the list of valid vendor names. 2003-02-22 19:41:08 +00:00
Henning Geinitz e3ceee04be Check the IP address of the remote host before any communication occurs.
Check for a errors before trsuting values that came from remote.  Make sure
that strings are 0-terminated.
2003-02-09 11:23:41 +00:00
Henning Geinitz 54faada982 Fixed severe bug in saned that allowed a remote frontend to crash saned (null
pointer derefence) if no scanners are connected.
2003-01-29 17:41:53 +00:00
Henning Geinitz 8088d3e59b Print version number. 2003-01-04 15:24:13 +00:00
Oliver Rauch 31d6f428e1 Oliver Rauch: added fclose(icc_file) to stiff.c 2002-11-29 17:06:36 +00:00
Henning Geinitz 85e0bb2735 Added option --dont-scan. Resorted usage output. 2002-09-11 19:20:43 +00:00
Oliver Rauch d054ded6c1 2002-08-18 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
* frontend/scanimage.c, frontend/stiff.h, frontend/stiff.c:
          Added option "-i filename"/"--icc-profile filename":
          When image is saved in tiff format then this icc-profile is
          added to the tiff file as tiff tag
2002-08-27 17:57:19 +00:00
Henning Geinitz df8b2a8460 Fixed 16 bit tiff output.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-07-24 19:41:34 +00:00
Henning Geinitz e96e066c2f Fail if there are arguments without a preceding option on the command line.
Fixed indenting.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-07-22 12:49:26 +00:00
Henning Geinitz 1bdbbf495f Use LIBS = @LIBS@ to make sure that -lsyslog and -lsocket are linked for OS/2.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-07-08 18:07:07 +00:00
Frank Zago 8ef5b16e85 add test for long long. 2002-05-29 05:37:30 +00:00