Wykres commitów

42 Commity (15bdce9211fef76832a5cd892cea3ecf4bd1eb07)

Autor SHA1 Wiadomość Data
Chris Bagwell c8dde5e271 Make preload DLL backend's symbols make prototypes
Most errors were in return values. Some compilers, especially
64-bit ones, are picky about this and fail to compile.
2012-08-07 20:57:44 -05:00
Ruediger Meier 5311781404 cleanup, uniq PATH_SEP defines
Always use the same portable PATH_SEP define (note _WIN32
is not defined on cygwin).
2012-01-21 22:02:20 -06:00
Chris Bagwell 1dd768d534 Do not link in preload backends for libsane-dll
Current backend/Makefile.am states difference between libsane and
libsane-dll as:

> libsane.la and libsane-dll.la are the same thing except for
> the addition of backends listed by PRELOADABLE_BACKENDS that are
> statically linked in.

We were (mistakenly) linking in dll-preload.h and thus symbols
for all preload backends for both libraries but we were only
linking in those symbols for libsane.

This mistake became obvious on mingw which does not allow for
any unresolved symbols.  Resolve by forcing an empty preload
backend list for libsane-dll.
2011-11-06 16:39:06 -06:00
Reinhold Kainhofer 093fff631c Fix SANE_CONFIG_DIR handling, use it for dll.d/; Add sanei_config_get_paths
* include/sane/sanei_config.h sanei/sanei_config.c: Add function
        sanei_config_get_paths to obtain all configuration pathes (from env var
        SANE_CONFIG_DIR and default paths); fix pointers to invalid/freed
        strings when SANE_CONFIG_DIR is set

* backend/dll.c: When searching for the dll.d/ directory, also use
        the SANE_CONFIG_DIR env variable.
2010-09-18 10:35:35 +02:00
Julien BLACHE ca15c0fda2 Allow symlinks under SANE_CONFIG_DIR/dll.d 2010-07-09 18:57:44 +02:00
Julien BLACHE d3951b0734 SANE_CONFIG_DIR/dll.d isn't Debian-specific anymore
Fixup comment in the dll.d handling code, now that it's been merged into
SANE proper.
2010-07-09 18:55:14 +02:00
chris@cnpbagwell.com 4d9e8138af standardize including local sane/ include files.
Source code was inconsistent on how they were referencing
include files in include/sane.  In certain cases, sane/sane.h
and sane/saneopts.h was really including external copies (with
some preprocessor implementations anyways).
2009-05-07 22:06:20 -05: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
m. allan noah 91598aa800 * backend/*.[ch]: nearly every backend used V_MAJOR
instead of SANE_CURRENT_MAJOR in sane_init()
* backend/snapscan.c: remove EXPECTED_VERSION check
since new SANE standard is forward compatible
2008-11-26 21:21:31 +00:00
Julien BLACHE 341363843a By popular demand, merge my Debian patch adding support for dll.conf
snippets under $configdir/dll.d.
2008-05-07 17:04:40 +00:00
Mattias Ellert 71f9081904 MacOS X updates 2007-11-10 11:35:34 +00:00
Mattias Ellert 49d756ca44 Fixing compiler warnings 2007-01-20 23:02:53 +00:00
Henning Geinitz 5168206e4b With cygwin, use ":" as DIR_SEP (patch from Philip Aston <paston@bea.com>). 2006-02-04 20:52:53 +00:00
Mattias Ellert 6f301b10ed Fixing compilation warnings 2006-01-22 09:04:41 +00:00
Henning Geinitz df2a8b6180 Fixed dynamic loading on current HP/UX systems (bug #302732). 2005-12-20 17:15:39 +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
Gerhard Jaeger b0dd4470cc Fixed OS/2 restriction for dlopening DLLs on OS/2, as
it only works for 7.3 filenames for some reason
(patches by Franz Bakan <fbakan@gmx.net>.
2005-06-30 08:18:29 +00:00
Henning Geinitz da5773b8cb Work around 8 char limit for dynamic loading on OS/2 (patch from Franz Bakan
<fbakan@gmx.net>).
2004-05-24 19:16:41 +00:00
Oliver Rauch a28bd84350 Added DIR_SEP and PATH_SEP defintions for windows 2004-05-16 22:08:03 +00:00
Henning Geinitz c824c6de2d Patch from Franz Bakan <fbakan@gmx.net>. 2004-04-23 15:21:14 +00:00
Henning Geinitz e7484c515e Silenced some compilation warnings. 2003-12-27 17:48:39 +00:00
Frank Zago 3bda0d541d Port to Cygwin. 2003-09-24 03:41:48 +00:00
Henning Geinitz dfe765e251 Fixed some compilation warnings. 2003-04-13 13:25:15 +00:00
Henning Geinitz 4d4f8a4c64 Added some missing debug messages. Fixed a warning. 2003-04-04 10:26:20 +00:00
Henning Geinitz f2cce09238 Intented according GNU coding standards. 2002-12-04 20:30:48 +00:00
Henning Geinitz 9e0f5f2a58 Ignore comments that are in the same line as the backend entries. Minor
manpage fixes.
2002-12-04 20:25:13 +00:00
Henning Geinitz 46fcee60aa Add dynamic loading support for MacOS X/Darwin (from Peter O'Gorman
<peter@pogma.com>).
2002-12-01 12:42:01 +00:00
Henning Geinitz 991bd09675 Fixed PACKAGE_VERSION breakage. PACKAGE_VERSION was redefined by autoconf 2.5
with a different meaning. Use PACKAGE_STRING instead.
2002-11-29 18:19:58 +00:00
Frank Zago 4851b683c3 Fixed some warnings. 2002-11-19 05:06:08 +00:00
Henning Geinitz 41e7fdda5f Don't call sane_exit twice. Call sane_init after sane_exit. Try to load from
$LD_LIBRARY_PATH ($SHLIB_PATH, $LIBPATH) first and only check LIBDIR if
opening failed. New version: 1.0.6.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2002-04-21 14:02:58 +00:00
Henning Geinitz 7e4cd23e45 Added some debug messages (e.g. if dll.conf isn't found). Some adjustments concerning
debug levels. Removed some compilation warnings. New version: 1.0.5.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2001-11-11 19:55:49 +00:00
Henning Geinitz 4c2ff8e61c HP/UX uses .sl for shared libs. Changed status to "stable". Increased
version number.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2001-10-02 20:35:08 +00:00
Henning Geinitz a9218c2311 Fixed minor bugs in debug output and documentation.
Henning Meier-Geinitz <henning@meier-geinitz.de>
2001-08-26 10:39:54 +00:00
Henning Geinitz be8f64a8d6 Removed access to uninitialized memory. Increased version number. 2001-05-06 09:18:11 +00:00
Henning Geinitz c7366e2d3c 2001-04-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
* PROBLEMS: Point to pnm/saned security risks.
	* TODO: Removed the entries about epson usb mis-detection and check
	  for installed sane versions.
	* configure configure.in backend/Makefile.in: Added detection of older
	  versions of SANE. The pnm backend is now disabled by default.
	* backend/dll.c backend/dll.desc: Fixed file descriptor leak (found by
	  Douglas Gilbert). New version: 1.0.2.
	* backend/net.desc: Added Jochen Eisinger's email address as contact
	  for the net backend.
	* doc/sane-pnm.man: Point to pnm/saned security risks.
2001-04-22 20:01:30 +00:00
Henning Geinitz e1767e5ea9 2001-04-16 Henning Meier-Geinitz <hmg@gmx.de>
* README: Updated xsane link.
	* configure configure.in backend/dll.c backend/dll.desc
	  backend/net.c backend/net.desc include/sane/config.h.in
	  Yet another change in the version system for dll and net.
	  For sane_init return the version of the package but use
	  own internal version number in the source (printed with
	  debugging enabled) and in *.desc. The internal versions
	  of both net and dll are set to 1.0.1. Please increase the
	  build number with every change on the source files.
	* doc/realeases.txt -> doc/releases.txt. Fixed spelling error.
	  Added entries about sane-backends.html, sane.ps, man pages,
	  platforms page.
2001-04-16 12:21:41 +00:00
Henning Geinitz 30b517b433 2001-04-13 Henning Meier-Geinitz <hmg@gmx.de>
* PROJECTS TODO: Added entry about E3 USB chipset.
	* backend/dll.c backend/dll.desc: New version is 1.0.5. Version and
	  PACKAGE_VERSION is printed with debug level set to 1 or higher.
	  The version numbers of all backends that are loaded are printed
	  at debug level 3 or higher. Print error if backend with wrong
	  major version number is loaded. Some standardization changes
	  concerning the DBG messages.
	* backend/net.c backend/net.desc: New version is 1.0.5. Version and
	  PACKAGE_VERSION is printed with debug level set to 1 or higher.
	  Some standardization changes concerning the DBG messages.
	* backend/pnm.c: Return SANE_INFO_RELOAD_PARAMS even if the pnm
	  file doesn't exist or can't be loaded (from mh <crapsite@gmx.net>).
	* doc/backend-writing.txt: Added AUTHORS to the list of things that
	  should be updated when including a new backend. Added points about
	  avoiding printf and exit in backends.
	* doc/releases.txt: New file. This text summarizes some points to
	  pay attention to when a new release of sane-backends is made.
	  Additions and corrections are appreciated.
	* doc/scanimage.man: Add some more information about the -V option.
	* frontend/scanimage.c: The option -V now also prints the version of
	  the backend (ususally dll).
2001-04-13 17:04:51 +00:00
Petter Reinholdtsen 7e318fb164 Get rid of small memory leak when using 'scanimage -L'. 2001-02-12 19:31:01 +00:00
Jochen Eisinger 3f3911fdb8 2000-10-23 Jochen Eisinger <jochen.eisinger@gmx.net>
* backend/dll.c: added test for ``dll'' in dll.conf
2000-10-23 15:03:08 +00:00
Petter Reinholdtsen b4a1a513c9 Merge devel (v1.0.3) into head branch. 2000-08-12 15:11:46 +00:00
Petter Reinholdtsen 760423d864 Merged main branch with current DEVEL_1_9. 2000-03-05 13:57:25 +00:00
Petter Reinholdtsen 30ab5e718a Initial revision 1999-08-09 18:06:01 +00:00