2000-12-31 Henning Meier-Geinitz <hmg@gmx.de>

* tools/find-scanner.c: Removed. Now called sane-find-scanner.
	* tools/sane-find-scanner: New file (was find-scanner).
	* tools/.cvsignore tools/Makefile.in tools/README: Updated because
	  of name change. sane-find-scanner is installed now.
	* README README.linux: Updated because of sane-find-scanner.
	* frontend/scanimage.man: Updated because of sane-find-scanner.
	* doc/sane-find-scanner.man: New file.
	* doc/.cvsignore doc/Makefile.in: Added sane-find-scanner(1).
	* TODO: Updated concerning sane-find-scanner. Added entry about
	  qcam /tmp file handling. Some spelling corrections.

README

@@ -191,16 +191,16 @@ If this works, you could try to acquire an image with:
 	scanimage -d mustek:/dev/scanner >t.pnm
 
 If you are not sure what generic SCSI device your scanner is connected to, try
-the command tools/find-scanner.  It is normally sufficient to invoke the
+the command sane-find-scanner.  It is normally sufficient to invoke the
 program without any arguments.  Invoking this command should produce output
 similar to this:
 
-  $ tools/find-scanner
-  find-scanner: found "MUSTEK MFC-06000CZ 1.01" at device /dev/scanner
-  find-scanner: found "MUSTEK MFC-06000CZ 1.01" at device /dev/sge
+  $ sane-find-scanner
+  sane-find-scanner: found "MUSTEK MFC-06000CZ 1.01" at device /dev/scanner
+  sane-find-scanner: found "MUSTEK MFC-06000CZ 1.01" at device /dev/sge
 
-Note that find-scanner will find any scanner that is connected to a SCSI bus.
-It will even find scanners that are not supported at all by SANE.
+Note that sane-find-scanner will find any scanner that is connected to a SCSI
+bus.  It will even find scanners that are not supported at all by SANE.
 
 There may be several causes for the following messages from the frontends:
 "scanimage: no SANE devices found" or "xscanimage: no devices available.".

README.linux

@@ -33,12 +33,12 @@ device mustek:/dev/scanner' is a Mustek ScanExpress 12000SP flatbed scanner
 
 If this doesn't work you may have to add the right SCSI generic device name
 to the configuration file. This should be documented in the man page for
-your backend. To find out about the right SCSI device use tools/find-scanner:
+your backend. To find out about the right SCSI device use sane-find-scanner:
 
-# tools/find-scanner
-find-scanner: found scanner "SCANNER  2.02" at device /dev/scanner
-find-scanner: found scanner "SCANNER  2.02" at device /dev/sg0
-find-scanner: found scanner "SCANNER  2.02" at device /dev/sga 
+# sane-find-scanner
+sane-find-scanner: found scanner "SCANNER  2.02" at device /dev/scanner
+sane-find-scanner: found scanner "SCANNER  2.02" at device /dev/sg0
+sane-find-scanner: found scanner "SCANNER  2.02" at device /dev/sga 
 
 It may help to set a soft link /dev/scanner to the respective device.
 

doc/Makefile.in

@@ -30,7 +30,7 @@ LN_S = @LN_S@
 
 @SET_MAKE@
 
-SECT1	= saned.1 scanimage.1
+SECT1	= saned.1 scanimage.1 sane-find-scanner.1
 SECT5	= sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 sane-dll.5 \
           sane-dc25.5 sane-dmc.5 sane-epson.5 sane-hp.5 sane-microtek.5 \
           sane-microtek2.5 sane-mustek.5 sane-nec.5 sane-net.5 sane-pie.5 \

doc/sane-find-scanner.man

@@ -0,0 +1,44 @@
+.TH sane-find-scanner 1 "31 December 2000"
+.IX sane-find-scanner
+.SH NAME
+sane-find-scanner - find SCSI scanners and their device files
+.SH SYNOPSIS
+.B sane-find-scanner
+.RB [\-h|\-?]
+.RB [\-v]
+.RI [devname]
+.SH DESCRIPTION
+.B sane-find-scanner
+is a command-line tool to find SCSI scanners and determine their Unix device
+files. It's part of the sane-backends package. It checks the default generic
+SCSI devices, e.g. /dev/sg? for Linux.  Also /dev/scanner is checked. The test
+is done by sending a SCSI inquiry command and looking for a device type of
+"scanner" or "processor" (some old HP scanners seem to send "processor"). So
+sane-find-scanner will find any SCSI scanner even if it isn't supported by any
+SANE backend. It won't find parallel port, USB, or other non-SCSI scanners.
+
+.SH OPTIONS
+.TP 8
+.B \-h, \-?
+Prints a short usage message.
+.TP 8
+.B \-v
+Verbose output. Show every device name and the test result.
+.TP 8
+.B devname
+Test device file "devname". No other devices are checked if devname is given.
+.SH EXAMPLE
+.B sane-find-scanner -v
+.br
+Check all SCSI devices for available scanners and print a line for every
+device file.
+.PP
+.B sane-find-scanner /dev/scanner
+.br
+Look for a scanner (only) at /dev/scanner and print the result.
+.SH "SEE ALSO"
+sane-scsi(5), scanimage(1), xscanimage(1), xsane(1), sane-"backendname"(5)
+.SH AUTHOR
+Oliver Rauch and others. Manual page by Henning Meier-Geinitz.
+.SH BUGS
+No support for non-SCSI scanners yet.

frontend/scanimage.c

@@ -1419,8 +1419,8 @@ main (int argc, char **argv)
 	    if (i == 0)
 	      printf ("\nNo scanners were identified. If you were expecting "
 		      "something different,\ncheck that the scanner is plugged "
-		      "in, turned on and detected by the\nfind-scanner tool (if "
-		      "appropriate). Please read the documentation which came\n"
+		      "in, turned on and detected by the\nsane-find-scanner tool "
+		      "(if appropriate). Please read the documentation which came\n"
 		      "with this software (README, FAQ, manpages).\n");
 	    if (defdevname)
 	      printf ("default device is `%s'\n", defdevname);

tools/Makefile.in

@@ -47,7 +47,7 @@ LINK = $(CC) $(LDFLAGS) -o $@
 
 @SET_MAKE@
 
-DESTINATIONS = find-scanner sane-config
+DESTINATIONS = sane-find-scanner sane-config
 
 EXTRA = sane_strstatus.lo ../sanei/sanei_init_debug.lo \
 	../sanei/sanei_config.lo ../sanei/sanei_config2.lo \
@@ -65,16 +65,17 @@ LIBLIB = ../lib/liblib.a
 
 all:	$(DESTINATIONS)
 
-install: sane-config
+install: sane-config sane-find-scanner
 	$(INSTALL_SCRIPT) sane-config $(bindir)/sane-config
+	$(INSTALL_PROGRAM) sane-find-scanner $(bindir)/sane-find-scanner
 
 sane-config: sane-config.in $(top_builddir)/config.status 
 	cd $(top_builddir) \
           && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-find-scanner: find-scanner.o \
+sane-find-scanner: sane-find-scanner.o \
 	../sanei/sanei_scsi.lo ../sanei/sanei_init_debug.lo
-	@$(LIBTOOL) $(MLINK) $(LINK) find-scanner.o $(LIBSANEI) $(LIBLIB) \
+	@$(LIBTOOL) $(MLINK) $(LINK) sane-find-scanner.o $(LIBSANEI) $(LIBLIB) \
 		$(LIBS)
 
 depend:

tools/README

@@ -1,32 +1,33 @@
-Mon Sep 18 19:38:21 CEST 2000
+2000-12-31
 
 This directory contains various tools that may be useful:
 
- find-scanner:
-	Attempts to find a SCSI scanner attached to your system.
-	Invoke with "find-scanner -h" to get command-line
-	syntax. Note that find-scanner will find any scanner that
-        is connected to a SCSI bus.  It will even find scanners
-        that are not supported at all by SANE.
+ sane-find-scanner (previous name: "find-scanner"):
+        Attempts to find a SCSI scanner attached to your system.
+        Invoke with "sane-find-scanner -h" to get command-line
+        syntax. Note that sane-find-scanner will find any scanner
+        that is connected to a SCSI bus.  It will even find scanners
+        that are not supported at all by SANE. More details can be
+        found in the man page sane-find-scanner(1).
 
  xerox:
-	A simple script to make photocopies ("xeroxing").  In
-	the script, you may need to adjust the device name
-	assigned to variable DEV and the resolution assigned
-	to variable RES as well as the paper with and height
-	(variables WIDTH and HEIGHT, respectively.
+        A simple script to make photocopies ("xeroxing").  In
+        the script, you may need to adjust the device name
+        assigned to variable DEV and the resolution assigned
+        to variable RES as well as the paper with and height
+        (variables WIDTH and HEIGHT, respectively.
 
  mustek600iin-off:
-	Allows you to turn off a Mustek 600 II N scanner.
-	Use "make mustek600iin-off" to compile.
+        Allows you to turn off a Mustek 600 II N scanner.
+        Use "make mustek600iin-off" to compile.
 
 Maybe usefull for SANE developers:
 
  sane-desc.el:
- 	Some handy elisp stuff to automagically generate descriptive
-	SANE webpages from backend .desc files with emacs. Look at the
+        Some handy elisp stuff to automagically generate descriptive
+        SANE webpages from backend .desc files with emacs. Look at the
         top of the file for more details.
 
  sane-config:
-	Show SANE version, linker flags etc. Might be usefull for 
-	frontend developers.
+        Show SANE version, linker flags etc. Might be usefull for 
+        frontend developers.

tools/sane-find-scanner.c

@@ -1,4 +1,4 @@
-/* find-scanner.c
+/* sane-find-scanner.c
 
    Copyright (C) 1997-2000 Oliver Rauch and others.
 
@@ -410,7 +410,7 @@ main (int argc, char **argv)
     }
 
   printf (
-       "# Note that find-scanner will find any scanner that is connected\n"
+       "# Note that sane-find-scanner will find any scanner that is connected\n"
        "# to a SCSI bus.  It will even find scanners that are not supported\n"
        "# at all by SANE. It won't find a scanner that is connected to a\n"
        "# parallel, USB or other non-SCSI port.\n\n");