diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:25:42 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:25:42 +0100 |
| commit | 64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch) | |
| tree | 4303648095deff998ae20c2393b56db527742ac9 /tools/sane-desc.c | |
| parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
| parent | ecaaf250cb33ff61f37a7b441f2337584a655350 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tools/sane-desc.c')
| -rw-r--r-- | tools/sane-desc.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/tools/sane-desc.c b/tools/sane-desc.c index 191c6e5..7a8645d 100644 --- a/tools/sane-desc.c +++ b/tools/sane-desc.c @@ -20,9 +20,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include <../include/sane/config.h> @@ -268,7 +266,7 @@ static const char *device_type_name[] = {"Unknown", "Scanners", "Still cameras", "Video Cameras", "Meta backends", "APIs"}; static const char *device_type_aname[] = - {"UKNOWN", "SCANNERS", "STILL", "VIDEO", "META", + {"UNKNOWN", "SCANNERS", "STILL", "VIDEO", "META", "API"}; static const char *status_color[] = {COLOR_UNKNOWN, COLOR_UNSUPPORTED, COLOR_UNTESTED, COLOR_MINIMAL, @@ -783,7 +781,7 @@ check_hex (SANE_String string) return SANE_TRUE; } -/* Read and interprete the .desc files */ +/* Read and interpret the .desc files */ static SANE_Bool read_files (void) { @@ -1698,7 +1696,7 @@ update_model_record_list (model_record_entry * first_model_record, /* Insert manufacturer into list at the alphabetically correct position, */ -/* create new record if neccessary */ +/* create new record if necessary */ static mfg_record_entry * update_mfg_record_list (mfg_record_entry * first_mfg_record, mfg_entry * mfg, backend_entry * be) @@ -3496,7 +3494,7 @@ print_udev (void) int i; print_udev_header (); - printf("ACTION!=\"add\", GOTO=\"libsane_rules_end\"\n" + printf("ACTION==\"remove\", GOTO=\"libsane_rules_end\"\n" "ENV{DEVTYPE}==\"usb_device\", GOTO=\"libsane_create_usb_dev\"\n" "SUBSYSTEMS==\"scsi\", GOTO=\"libsane_scsi_rules_begin\"\n" "SUBSYSTEM==\"usb_device\", GOTO=\"libsane_usb_rules_begin\"\n" @@ -3546,10 +3544,10 @@ print_udev (void) printf ("\n"); if (mode == output_mode_udevacl) - printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", ENV{libsane_matched}=\"yes\"\n", + printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", ENV{libsane_matched}=\"yes\"\n", usbid->usb_vendor_id + 2, usbid->usb_product_id + 2); else - printf ("ATTRS{idVendor}==\"%s\", ATTRS{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n", + printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n", usbid->usb_vendor_id + 2, usbid->usb_product_id + 2, DEVMODE, DEVGROUP); usbid = usbid->next; @@ -3679,7 +3677,7 @@ print_udevhwdb (void) int i; print_udevhwdb_header (); - printf("ACTION!=\"add\", GOTO=\"libsane_rules_end\"\n\n"); + printf("ACTION==\"remove\", GOTO=\"libsane_rules_end\"\n\n"); printf("# The following rule will disable USB autosuspend for the device\n"); printf("ENV{DEVTYPE}==\"usb_device\", ENV{libsane_matched}==\"yes\", TEST==\"power/control\", ATTR{power/control}=\"on\"\n\n"); |