This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to m...@docserver.cac.washington.edu for more info.
--168468480-720025824-1010680894=:6710 Content-Type: TEXT/PLAIN; charset=US-ASCII hello, I like to propose two small patches to the sane utilities scanimage and sane-find-scanner, which do some minor changes to the output of both tools. Please add it to cvs if you like. The change to scanimage does nothing else but changes the output format of the results of scanimage -L. While scanimage -L would for example print device `umax:/dev/sg0' is a UMAX Astra 2200 flatbed scanner scanimage -s prints "umax:/dev/sg0" "UMAX " "Astra 2200 " "flatbed scanner" and scanimage -S prints DEVICE_FILE[0]="umax:/dev/sg0"; DEVICE_VENDOR[0]="UMAX "; \ DEVICE_MODEL[0]="Astra 2200 "; DEVICE_TYPE[0]="flatbed scanner" both are easily to parse in shell scripts, scanimage -S produces bash syntax directly. A quite similar change I would propose for sane-find-scanner: A switch -s switches sane-find-scanner to silent mode, which produces a more compressed output: /space/temp/sane:$ sane-find-scanner -s /dev/sg0 SCSI "scanner" "UMAX" "Astra 2200" Both changes were done to make development of graphical installation tools for sane easier, because scanimage can be used to detect scanners already configured with sane, while sane-find-scanner is able to print out scan devices not yet configured for sane. Regards, Klaas -- ---------------------------------------------------------------------- Ja mach nur einen Plan und sei ein grosses Licht Klaas Freitag dann mach noch einen zweiten Plan * mail frei...@suse.de gehn tun sie beide nicht. - B. Brecht SuSE Labs, Nuernberg ---------------------------------------------------------------------- --168468480-720025824-1010680894=:6710 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="sane-backends-1.0.6.dif" Content-Transfer-Encoding: BASE64 Content-ID: <pine.lnx.4.33.0201101741340.6...@subbotin.suse.de> Content-Description: Content-Disposition: attachment; filename="sane-backends-1.0.6.dif" LS0tIGZyb250ZW5kL3NjYW5pbWFnZS5jDQorKysgZnJvbnRlbmQvc2Nhbmlt YWdlLmMJMjAwMi8wMS8wNyAxNDo0Nzo0NQ0KQEAgLTc1LDYgKzc1LDggQEAN CiBzdGF0aWMgc3RydWN0IG9wdGlvbiBiYXNpY19vcHRpb25zW10gPSB7DQog ICB7ImRldmljZS1uYW1lIiwgcmVxdWlyZWRfYXJndW1lbnQsIE5VTEwsICdk J30sDQogICB7Imxpc3QtZGV2aWNlcyIsIG5vX2FyZ3VtZW50LCBOVUxMLCAn TCd9LA0KKyAgeyJsaXN0LWRldmljZXMtbWFjaGluZSIsIG5vX2FyZ3VtZW50 LCBOVUxMLCAncyd9LA0KKyAgeyJsaXN0LWRldmljZXMtc2hlbGwiLCBub19h cmd1bWVudCwgTlVMTCwgJ1MnfSwNCiAgIHsiaGVscCIsIG5vX2FyZ3VtZW50 LCBOVUxMLCAnaCd9LA0KICAgeyJ2ZXJib3NlIiwgbm9fYXJndW1lbnQsIE5V TEwsICd2J30sDQogICB7InRlc3QiLCBub19hcmd1bWVudCwgTlVMTCwgJ1Qn fSwNCkBAIC05Miw3ICs5NCw3IEBADQogI2RlZmluZSBPVVRQVVRfUE5NICAg ICAgMA0KICNkZWZpbmUgT1VUUFVUX1RJRkYgICAgIDENCiANCi0jZGVmaW5l IEJBU0VfT1BUU1RSSU5HCSJkOmhMdlZUYiINCisjZGVmaW5lIEJBU0VfT1BU U1RSSU5HCSJkOmhMc1N2VlRiIg0KICNkZWZpbmUgU1RSSVBfSEVJR0hUCTI1 NgkvKiAjIGxpbmVzIHdlIGluY3JlbWVudCBpbWFnZSBoZWlnaHQgKi8NCiAN CiBzdGF0aWMgc3RydWN0IG9wdGlvbiAqYWxsX29wdGlvbnM7DQpAQCAtMTQz OSw2ICsxNDQxLDggQEANCiAJICBhY2NlcHRfb25seV9tZDVfYXV0aCA9IDE7 DQogCSAgYnJlYWs7DQogCWNhc2UgJ0wnOg0KKwljYXNlICdzJzoNCisJY2Fz ZSAnUyc6DQogCSAgew0KIAkgICAgaW50IGk7DQogDQpAQCAtMTQ1MiwxNyAr MTQ1NiwzOCBAQA0KIA0KIAkgICAgZm9yIChpID0gMDsgZGV2aWNlX2xpc3Rb aV07ICsraSkNCiAJICAgICAgew0KLQkJcHJpbnRmICgiZGV2aWNlIGAlcycg aXMgYSAlcyAlcyAlc1xuIiwNCi0JCQlkZXZpY2VfbGlzdFtpXS0+bmFtZSwg ZGV2aWNlX2xpc3RbaV0tPnZlbmRvciwNCi0JCQlkZXZpY2VfbGlzdFtpXS0+ bW9kZWwsIGRldmljZV9saXN0W2ldLT50eXBlKTsNCisJCSBpZiggY2ggPT0g J3MnICkNCisJCSB7DQorCQkgICAgcHJpbnRmKCAiXCIlc1wiIFwiJXNcIiBc IiVzXCIgXCIlc1wiXG4iLA0KKwkJCSAgICBkZXZpY2VfbGlzdFtpXS0+bmFt ZSwgZGV2aWNlX2xpc3RbaV0tPnZlbmRvciwNCisJCQkgICAgZGV2aWNlX2xp c3RbaV0tPm1vZGVsLCBkZXZpY2VfbGlzdFtpXS0+dHlwZSk7DQorCQkgfQ0K KwkJIGVsc2UNCisJCSBpZiggY2ggPT0gJ1MnICkNCisJCSB7DQorCQkgICAg cHJpbnRmICgiREVWSUNFX0ZJTEVbJWRdPVwiJXNcIjsgIiwNCisJCQkgICAg aSwgZGV2aWNlX2xpc3RbaV0tPm5hbWUgKTsNCisJCSAgICBwcmludGYgKCJE RVZJQ0VfVkVORE9SWyVkXT1cIiVzXCI7ICIsDQorCQkJICAgIGksIGRldmlj ZV9saXN0W2ldLT52ZW5kb3IgKTsNCisJCSAgICBwcmludGYgKCJERVZJQ0Vf TU9ERUxbJWRdPVwiJXNcIjsgIiwNCisJCQkgICAgaSwgZGV2aWNlX2xpc3Rb aV0tPm1vZGVsICk7DQorCQkgICAgcHJpbnRmICgiREVWSUNFX1RZUEVbJWRd PVwiJXNcIlxuIiwNCisJCQkgICAgaSwgZGV2aWNlX2xpc3RbaV0tPnR5cGUg KTsNCisJCSB9DQorCQkgZWxzZQ0KKwkJIHsNCisJCSAgICBwcmludGYgKCJk ZXZpY2UgYCVzJyBpcyBhICVzICVzICVzXG4iLA0KKwkJCSAgICBkZXZpY2Vf bGlzdFtpXS0+bmFtZSwgZGV2aWNlX2xpc3RbaV0tPnZlbmRvciwNCisJCQkg ICAgZGV2aWNlX2xpc3RbaV0tPm1vZGVsLCBkZXZpY2VfbGlzdFtpXS0+dHlw ZSk7DQorCQkgfQ0KIAkgICAgICB9DQotCSAgICBpZiAoaSA9PSAwKQ0KKwkg ICAgaWYgKGkgPT0gMCAmJiBjaCAhPSAncycgJiYgY2ggIT0gJ1MnICkNCiAJ ICAgICAgcHJpbnRmICgiXG5ObyBzY2FubmVycyB3ZXJlIGlkZW50aWZpZWQu IElmIHlvdSB3ZXJlIGV4cGVjdGluZyAiDQogCQkgICAgICAic29tZXRoaW5n IGRpZmZlcmVudCxcbmNoZWNrIHRoYXQgdGhlIHNjYW5uZXIgaXMgcGx1Z2dl ZCAiDQogCQkgICAgICAiaW4sIHR1cm5lZCBvbiBhbmQgZGV0ZWN0ZWQgYnkg dGhlXG5zYW5lLWZpbmQtc2Nhbm5lciB0b29sICINCiAJCSAgICAgICIoaWYg YXBwcm9wcmlhdGUpLiBQbGVhc2UgcmVhZCB0aGUgZG9jdW1lbnRhdGlvblxu d2hpY2ggY2FtZSAiDQogCQkgICAgICAid2l0aCB0aGlzIHNvZnR3YXJlIChS RUFETUUsIEZBUSwgbWFucGFnZXMpLlxuIik7DQotCSAgICBpZiAoZGVmZGV2 bmFtZSkNCisJICAgIGlmIChkZWZkZXZuYW1lICYmIGNoICE9ICdzJykNCiAJ ICAgICAgcHJpbnRmICgiZGVmYXVsdCBkZXZpY2UgaXMgYCVzJ1xuIiwgZGVm ZGV2bmFtZSk7DQogDQogCSAgICBleGl0ICgwKTsNCkBAIC0xNDk3LDYgKzE1 MjIsOCBAQA0KIC1kLCAtLWRldmljZS1uYW1lPURFVklDRSAgIHVzZSBhIGdp dmVuIHNjYW5uZXIgZGV2aWNlIChlLmcuIGhwOi9kZXYvc2Nhbm5lcilcblwN CiAtaCwgLS1oZWxwICAgICAgICAgICAgICAgICBkaXNwbGF5IHRoaXMgaGVs cCBtZXNzYWdlIGFuZCBleGl0XG5cDQogLUwsIC0tbGlzdC1kZXZpY2VzICAg ICAgICAgc2hvdyBhdmFpbGFibGUgc2Nhbm5lciBkZXZpY2VzXG5cDQorLXMs IC0tbGlzdC1kZXZpY2VzLW1hY2hpbmUgYSBiZXR0ZXIgcGFyc2VhYmxlIGZv cm1hdCBvZiB0aGUgc2Nhbm5lciBsaXN0aW5nIGxpa2UgLUxcblwNCistUywg LS1saXN0LWRldmljZXMtc2hlbGwgICBhIGJhc2ggZXZhbGFibGUgZm9ybWF0 IG9mIHRoZSAtTCBsaXN0XG5cDQogLVQsIC0tdGVzdCAgICAgICAgICAgICAg ICAgdGVzdCBiYWNrZW5kIHRob3JvdWdobHlcblwNCiAtdiwgLS12ZXJib3Nl ICAgICAgICAgICAgICBnaXZlIGV2ZW4gbW9yZSBzdGF0dXMgbWVzc2FnZXNc blwNCiAtViwgLS12ZXJzaW9uICAgICAgICAgICAgICBwcmludCB2ZXJzaW9u IGluZm9ybWF0aW9uXG5cDQotLS0gdG9vbHMvc2FuZS1maW5kLXNjYW5uZXIu Yw0KKysrIHRvb2xzL3NhbmUtZmluZC1zY2FubmVyLmMJMjAwMi8wMS8xMCAw OTowNTowMw0KQEAgLTM2LDYgKzM2LDcgQEANCiBzdGF0aWMgY29uc3QgY2hh ciAqcHJvZ19uYW1lOw0KIA0KIHN0YXRpYyBpbnQgdmVyYm9zZTsNCitzdGF0 aWMgaW50IHNpbGVudDsNCiANCiB0eXBlZGVmIHN0cnVjdA0KICAgew0KQEAg LTcxLDYgKzcyLDcgQEANCiAgIGZwcmludGYgKHN0ZGVyciwgIlVzYWdlOiAl cyBbLWh2XSBbZGV2bmFtZSAuLi5dXG4iLCBwcm9nX25hbWUpOw0KICAgZnBy aW50ZiAoc3RkZXJyLCAiXHQtaDogcHJpbnQgdGhpcyBoZWxwIG1lc3NhZ2Vc biIpOw0KICAgZnByaW50ZiAoc3RkZXJyLCAiXHQtdjogYmUgdmVyYm9zZVxu Iik7DQorICBmcHJpbnRmIChzdGRlcnIsICJcdC1zOiBiZSBzaWxlbnRcbiIg KTsNCiAgIGlmIChtc2cpDQogICAgIGZwcmludGYgKHN0ZGVyciwgIlx0JXNc biIsIG1zZyk7DQogfQ0KQEAgLTE2OCw5ICsxNzAsMjIgQEANCiAgIHdoaWxl IChwcCA+PSB2ZXJzaW9uICYmICgqcHAgPT0gJyAnIHx8ICoocHAgLSAxKSA+ PSAxMjcpKQ0KICAgICAqcHAtLSA9ICdcMCc7DQogDQotICBwcmludGYgKCIl czogZm91bmQgU0NTSSAlcyBcIiVzICVzICVzXCIgYXQgZGV2aWNlICVzXG4i LCBwcm9nX25hbWUsDQotCSAgZGV2dHlwZSA8IE5FTEVNUyhkZXZ0eXBlcykg PyBkZXZ0eXBlc1tkZXZ0eXBlXSA6ICJ1bmtub3duIGRldmljZSIsDQotCSAg dmVuZG9yLCBwcm9kdWN0LCB2ZXJzaW9uLCBkZXZpY2VuYW1lKTsNCisgIGlm KCBzaWxlbnQgKQ0KKyAgew0KKyAgICAgLyogcHJpbnQgb3V0IHRoZSBkZXZp Y2UgZmlsZSBmaXJzdCBmb3IgZWFzeSBwYXJzaW5nICovDQorICAgICBwcmlu dGYoICIlcyBTQ1NJIFwiJXNcIiBcIiVzXCIgXCIlc1wiXG4iLA0KKyAgICAg ICAgICAgIGRldmljZW5hbWUsIGRldnR5cGUgPCBORUxFTVMoZGV2dHlwZXMp ID8gZGV2dHlwZXNbZGV2dHlwZV0gOiAidW5rbm93biBkZXZpY2UiLA0KKyAg ICAgICAgICAgIHZlbmRvciwgcHJvZHVjdCApOw0KKyAgfQ0KKyAgZWxzZQ0K KyAgew0KKyAgICAgcHJpbnRmICgiJXM6IGZvdW5kIFNDU0kgJXMgXCIlcyAl cyAlc1wiIGF0IGRldmljZSAlc1xuIiwgcHJvZ19uYW1lLA0KKyAgICAgICAg ICAgIGRldnR5cGUgPCBORUxFTVMoZGV2dHlwZXMpID8gZGV2dHlwZXNbZGV2 dHlwZV0gOiAidW5rbm93biBkZXZpY2UiLA0KKyAgICAgICAgICAgIHZlbmRv ciwgcHJvZHVjdCwgdmVyc2lvbiwgZGV2aWNlbmFtZSk7DQorICB9DQorDQor DQorICANCiAgIHJldHVybjsNCiB9DQogDQpAQCAtMjAxLDYgKzIxNiwxMCBA QA0KIA0KIAljYXNlICd2JzoNCiAJICArK3ZlcmJvc2U7DQorCSAgYnJlYWs7 DQorCWNhc2UgJ3MnOg0KKwkgICsrc2lsZW50Ow0KKwkgIGJyZWFrOw0KIAl9 DQogICAgIH0NCiAgIGlmIChhcCA8IGFyZ3YgKyBhcmdjKQ0KQEAgLTQ0Nywx NSArNDY2LDE1IEBADQogICAgICAgZGV2X2xpc3QgPSBkZWZhdWx0X2Rldl9s aXN0Ow0KICAgICAgIHVzYl9kZXZfbGlzdCA9IHVzYl9kZWZhdWx0X2Rldl9s aXN0Ow0KICAgICB9DQorICBpZiggISBzaWxlbnQgKQ0KKyAgICAgcHJpbnRm ICgNCisJICAgICAiIyBOb3RlIHRoYXQgc2FuZS1maW5kLXNjYW5uZXIgd2ls bCBmaW5kIGFueSBzY2FubmVyIHRoYXQgaXMgY29ubmVjdGVkXG4iDQorCSAg ICAgIiMgdG8gYSBTQ1NJIGJ1cyBhbmQgc29tZSBzY2FubmVycyB0aGF0IGFy ZSBjb25uZWN0ZWQgdG8gdGhlIFVuaXZlcnNhbFxuIg0KKwkgICAgICIjIFNl cmlhbCBCdXMgKFVTQikgZGVwZW5kaW5nIG9uIHlvdXIgT1MuIEl0IHdpbGwg ZXZlbiBmaW5kIHNjYW5uZXJzXG4iDQorCSAgICAgIiMgdGhhdCBhcmUgbm90 IHN1cHBvcnRlZCBhdCBhbGwgYnkgU0FORS4gSXQgd29uJ3QgZmluZCBhIHNj YW5uZXIgdGhhdFxuIg0KKwkgICAgICIjIGlzIGNvbm5lY3RlZCB0byBhIHBh cmFsbGVsIG9yIHByb3ByaWV0YXJ5IHBvcnQuXG5cbiIpOw0KIA0KLSAgcHJp bnRmICgNCi0gICAgICAgIiMgTm90ZSB0aGF0IHNhbmUtZmluZC1zY2FubmVy IHdpbGwgZmluZCBhbnkgc2Nhbm5lciB0aGF0IGlzIGNvbm5lY3RlZFxuIg0K LSAgICAgICAiIyB0byBhIFNDU0kgYnVzIGFuZCBzb21lIHNjYW5uZXJzIHRo YXQgYXJlIGNvbm5lY3RlZCB0byB0aGUgVW5pdmVyc2FsXG4iDQotICAgICAg ICIjIFNlcmlhbCBCdXMgKFVTQikgZGVwZW5kaW5nIG9uIHlvdXIgT1MuIEl0 IHdpbGwgZXZlbiBmaW5kIHNjYW5uZXJzXG4iDQotICAgICAgICIjIHRoYXQg YXJlIG5vdCBzdXBwb3J0ZWQgYXQgYWxsIGJ5IFNBTkUuIEl0IHdvbid0IGZp bmQgYSBzY2FubmVyIHRoYXRcbiINCi0gICAgICAgIiMgaXMgY29ubmVjdGVk IHRvIGEgcGFyYWxsZWwgb3IgcHJvcHJpZXRhcnkgcG9ydC5cblxuIik7DQot DQotICBpZiAoZ2V0dWlkICgpKQ0KKyAgaWYgKGdldHVpZCAoKSAmJiAhIHNp bGVudCApDQogICAgIHByaW50ZiAoDQogICAgICAiIyBZb3UgbWF5IHdhbnQg dG8gcnVuIHRoaXMgcHJvZ3JhbSBhcyBzdXBlci11c2VyIHRvIGZpbmQgYWxs IGRldmljZXMuXG4iDQogICAgICAiIyBPbmNlIHlvdSBmb3VuZCB0aGUgc2Nh bm5lciBkZXZpY2VzLCBiZSBzdXJlIHRvIGFkanVzdCBhY2Nlc3NcbiINCkBA IC00ODgsMTEgKzUwNywxMiBAQA0KICAgICB9DQogICBpZiAoIWNoZWNrX3Nn KCkpDQogICAgIHsNCi0gICAgcHJpbnRmICgNCi0gICAgICAgIiMgSWYgeW91 ciBzY2FubmVyIHVzZXMgU0NTSSwgeW91IG11c3QgaGF2ZSBhIGRyaXZlciBm b3IgeW91ciBTQ1NJXG4iDQotICAgICAgICIjIGFkYXB0ZXIgYW5kIHN1cHBv cnQgZm9yIFNDU0kgR2VuZXJpYyAoc2cpIGluIHlvdXIgT3BlcmF0aW5nIFN5 c3RlbVxuIg0KLSAgICAgICAiIyBpbiBvcmRlciBmb3IgdGhlIHNjYW5uZXIg dG8gYmUgdXNlZCB3aXRoIFNBTkUuIElmIHlvdXIgc2Nhbm5lciBpc1xuIg0K LSAgICAgICAiIyBOT1QgbGlzdGVkIGFib3ZlLCBjaGVjayB0aGF0IHlvdSBo YXZlIGluc3RhbGxlZCB0aGUgZHJpdmVycy5cblxuIik7DQorICAgICAgIGlm KCAhIHNpbGVudCApDQorCSAgcHJpbnRmICgNCisJCSAgIiMgSWYgeW91ciBz Y2FubmVyIHVzZXMgU0NTSSwgeW91IG11c3QgaGF2ZSBhIGRyaXZlciBmb3Ig eW91ciBTQ1NJXG4iDQorCQkgICIjIGFkYXB0ZXIgYW5kIHN1cHBvcnQgZm9y IFNDU0kgR2VuZXJpYyAoc2cpIGluIHlvdXIgT3BlcmF0aW5nIFN5c3RlbVxu Ig0KKwkJICAiIyBpbiBvcmRlciBmb3IgdGhlIHNjYW5uZXIgdG8gYmUgdXNl ZCB3aXRoIFNBTkUuIElmIHlvdXIgc2Nhbm5lciBpc1xuIg0KKwkJICAiIyBO T1QgbGlzdGVkIGFib3ZlLCBjaGVjayB0aGF0IHlvdSBoYXZlIGluc3RhbGxl ZCB0aGUgZHJpdmVycy5cblxuIik7DQogICAgIH0NCiANCiAgIHNhbmVpX3Vz Yl9pbml0ICgpOw0KQEAgLTUyMSw2ICs1NDEsMTEgQEANCiAJICAgIHsNCiAJ ICAgICAgaWYgKHZlcmJvc2UpDQogCQlwcmludGYgKCIgb3BlbiBvaywgdmVu ZG9yIGFuZCBwcm9kdWN0IGlkcyB3ZXJlIGlkZW50aWZpZWRcbiIpOw0KKwkg ICAgICBpZiggc2lsZW50ICkNCisJICAgICAgewkNCisJCSBwcmludGYoICIl cyBVU0IgXCJzY2FubmVyXCIgXCIweCUwNHhcIiBcIjB4JTA0eFwiXG4iLCBk ZXZfbmFtZSwgdmVuZG9yLCBwcm9kdWN0ICk7DQorCSAgICAgIH0NCisJICAg ICAgZWxzZQ0KIAkgICAgICBwcmludGYgKCIlczogZm91bmQgVVNCIHNjYW5u ZXIgKHZlbmRvciA9IDB4JTA0eCwgIg0KIAkJICAgICAgInByb2R1Y3QgPSAw eCUwNHgpIGF0IGRldmljZSAlc1xuIiwgcHJvZ19uYW1lLCB2ZW5kb3IsDQog CQkgICAgICBwcm9kdWN0LCBkZXZfbmFtZSk7DQpAQCAtNTM3LDcgKzU2Miw3 IEBADQogCSAgc2FuZWlfdXNiX2Nsb3NlIChmZCk7DQogCX0NCiAgICAgfQ0K LSAgaWYgKHVua25vd25fZm91bmQpDQorICBpZiAodW5rbm93bl9mb3VuZCAm JiAhIHNpbGVudCApDQogICAgIHByaW50ZiAoIlxuIg0KICAgICAiIyBgVU5L Tk9XTiB2ZW5kb3IgYW5kIHByb2R1Y3QnIG1lYW5zIHRoYXQgdGhlcmUgc2Vl bXMgdG8gYmUgYSBzY2FubmVyXG4iDQogICAgICIjIGF0IHRoaXMgZGV2aWNl IGZpbGUgYnV0IHRoZSB2ZW5kb3IgYW5kIHByb2R1Y3QgaWRzIGNvdWxkbid0 IGJlIFxuIg0K --168468480-720025824-1010680894=:6710--
