From 08ebb3df1523759ff6bdffcd2f43e1e45e58d4c2 Mon Sep 17 00:00:00 2001 From: Julien BLACHE Date: Sun, 16 Jul 2006 11:05:15 +0000 Subject: [PATCH] Split very long comment lines in the udev rules file. --- ChangeLog | 5 +++++ tools/sane-desc.c | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c4fa621db..dbde3b164 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-07-16 Julien Blache + * tools/sane-desc.c: split very long comment lines in the + generated udev rules file. Some comment lines very overly long, + and udev produced warning messages while loading the rules file. + 2006-07-15 m. allan noah * backend/fujitsu.c: backend v1.0.38, add 'useless noise' diff --git a/tools/sane-desc.c b/tools/sane-desc.c index beff29e8c..e7085c660 100644 --- a/tools/sane-desc.c +++ b/tools/sane-desc.c @@ -3176,6 +3176,7 @@ static void print_udev (void) { usbid_type *usbid = create_usbids_table (); + int i; print_udev_header (); printf ("\nACTION!=\"add\", GOTO=\"libsane_rules_end\"\n"); @@ -3184,13 +3185,27 @@ print_udev (void) { manufacturer_model_type * name = usbid->name; + i = 0; printf ("# "); while (name) { - if (name != usbid->name) + if ((name != usbid->name) && (i > 0)) printf (" | "); printf ("%s", name->name); name = name->next; + + i++; + + /* + * Limit the number of model names on the same line to 3, + * as udev cannot handle very long lines and prints a warning + * message while loading the rules files. + */ + if ((i == 3) && (name != NULL)) + { + printf("\n# "); + i = 0; + } } printf ("\n"); printf ("SYSFS{idVendor}==\"%s\", SYSFS{idProduct}==\"%s\", MODE=\"660\", GROUP=\"scanner\"\n",