[sane-devel] [patch] sane-find-scanner

Frank Zago fzago@greshamstorage.com
Sun, 28 Apr 2002 02:39:00 -0500 (CDT)


  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 mime@docserver.cac.washington.edu for more info.

---171960392-1441467780-1019979540=:12909
Content-Type: TEXT/PLAIN; charset=US-ASCII


This patch fixes a bug where the return of sanei_scsi_cmd() wasn't checked.
It also displays the inquiry buffer if -v is enabled:

$ ./sane-find-scanner -v
...
sane-find-scanner: checking /dev/scanner... failed to open
sane-find-scanner: checking /dev/sg0... open ok
  Inquiry for device:
    000: 06 31 14 01 1f 00 00 00 41 43 52 4f 53 53 20 20    .1......ACROSS
    016: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
    032: 31 2e 31 36                                        1.16
sane-find-scanner: found SCSI scanner "ACROSS  1.16" at device /dev/sg0
sane-find-scanner: checking /dev/sg1... failed to open
sane-find-scanner: checking /dev/sg2... failed to open
...

That might be usefull for debug purposes. Should I add to cvs?

Frank.

---171960392-1441467780-1019979540=:12909
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="sane-find-scanner-1.diff"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.LNX.4.33.0204280239000.12909@janus.openmic.com>
Content-Description: 
Content-Disposition: attachment; filename="sane-find-scanner-1.diff"

SW5kZXg6IHNhbmUtZmluZC1zY2FubmVyLmMNCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9leHRlcm5hbC9zYW5lL3NhbmUt
YmFja2VuZHMvdG9vbHMvc2FuZS1maW5kLXNjYW5uZXIuYyx2DQpyZXRyaWV2
aW5nIHJldmlzaW9uIDEuOA0KZGlmZiAtdSAtQiAtYiAtcjEuOCBzYW5lLWZp
bmQtc2Nhbm5lci5jDQotLS0gc2FuZS1maW5kLXNjYW5uZXIuYwkyMDAxLzEy
LzI1IDE2OjA3OjM1CTEuOA0KKysrIHNhbmUtZmluZC1zY2FubmVyLmMJMjAw
Mi8wNC8yOCAwNzo0OTowNw0KQEAgLTEwNywyMyArMTA3LDg3IEBADQogICBy
ZXR1cm4gMTsgLyogR2l2ZSB1cCwgYW5kIGFzc3VtZSB5ZXMgdG8gYXZvaWQg
ZmFsc2UgbmVnYXRpdmVzICovDQogfQ0KIA0KKy8qIERpc3BsYXkgYSBidWZm
ZXIgaW4gdGhlIGxvZy4gRGlzcGxheSBieSBsaW5lcyBvZiAxNiBieXRlcy4g
Ki8NCiBzdGF0aWMgdm9pZCANCitoZXhkdW1wIChjb25zdCBjaGFyICpjb21t
ZW50LCB1bnNpZ25lZCBjaGFyICpidWYsIGNvbnN0IGludCBsZW5ndGgpDQor
ew0KKyAgaW50IGk7DQorICBjaGFyIGxpbmVbMTI4XTsNCisgIGNoYXIgKnB0
cjsNCisgIGNoYXIgYXNjX2J1ZlsxN107DQorICBjaGFyICphc2NfcHRyOw0K
Kw0KKyAgcHJpbnRmICgiICAlc1xuIiwgY29tbWVudCk7DQorDQorICBpID0g
MDsNCisgIGdvdG8gc3RhcnQ7DQorDQorICBkbw0KKyAgICB7DQorICAgICAg
aWYgKGkgPCBsZW5ndGgpDQorCXsNCisJICBwdHIgKz0gc3ByaW50ZiAocHRy
LCAiICUyLjJ4IiwgKmJ1Zik7DQorDQorCSAgaWYgKCpidWYgPj0gMzIgJiYg
KmJ1ZiA8PSAxMjcpDQorCSAgICB7DQorCSAgICAgIGFzY19wdHIgKz0gc3By
aW50ZiAoYXNjX3B0ciwgIiVjIiwgKmJ1Zik7DQorCSAgICB9DQorCSAgZWxz
ZQ0KKwkgICAgew0KKwkgICAgICBhc2NfcHRyICs9IHNwcmludGYgKGFzY19w
dHIsICIuIik7DQorCSAgICB9DQorCX0NCisgICAgICBlbHNlDQorCXsNCisJ
ICAvKiBBZnRlciB0aGUgbGVuZ3RoOyBkbyBub3RoaW5nLiAqLw0KKwkgIHB0
ciArPSBzcHJpbnRmIChwdHIsICIgICAiKTsNCisJfQ0KKw0KKyAgICAgIGkr
KzsNCisgICAgICBidWYrKzsNCisNCisgICAgICBpZiAoKGkgJSAxNikgPT0g
MCkNCisJew0KKwkgIC8qIEl0J3MgYSBuZXcgbGluZSAqLw0KKwkgIHByaW50
ZiAoIiAgJXMgICAgJXNcbiIsIGxpbmUsIGFzY19idWYpOw0KKw0KKwlzdGFy
dDoNCisJICBwdHIgPSBsaW5lOw0KKwkgICpwdHIgPSAnXDAnOw0KKwkgIGFz
Y19wdHIgPSBhc2NfYnVmOw0KKwkgICphc2NfcHRyID0gJ1wwJzsNCisNCisJ
ICBwdHIgKz0gc3ByaW50ZiAocHRyLCAiICAlMy4zZDoiLCBpKTsNCisJfQ0K
Kw0KKyAgICB9DQorICB3aGlsZSAoaSA8ICgobGVuZ3RoICsgMTUpICYgfjE1
KSk7DQorfQ0KKw0KK3N0YXRpYyBTQU5FX1N0YXR1cw0KIHNjYW5uZXJfZG9f
aW5xdWlyeSAodW5zaWduZWQgY2hhciAqYnVmZmVyLCBpbnQgc2ZkKQ0KIHsN
CiAgIHNpemVfdCBzaXplOw0KKyAgU0FORV9TdGF0dXMgc3RhdHVzOw0KIA0K
ICAgREJHICg1LCAiZG9faW5xdWlyeVxuIik7DQogICBtZW1zZXQgKGJ1ZmZl
ciwgJ1wwJywgMjU2KTsJLyogY2xlYXIgYnVmZmVyICovDQogDQogICBzaXpl
ID0gNTsgLyogZmlyc3QgZ2V0IG9ubHkgNSBieXRlcyB0byBnZXQgc2l6ZSBv
ZiBpbnF1aXJ5X3JldHVybl9ibG9jayAqLw0KICAgc2V0X2lucXVpcnlfcmV0
dXJuX3NpemUgKGlucXVpcnkuY21kLCBzaXplKTsNCi0gIHNhbmVpX3Njc2lf
Y21kIChzZmQsIGlucXVpcnkuY21kLCBpbnF1aXJ5LnNpemUsIGJ1ZmZlciwg
JnNpemUpOw0KKyAgc3RhdHVzID0gc2FuZWlfc2NzaV9jbWQgKHNmZCwgaW5x
dWlyeS5jbWQsIGlucXVpcnkuc2l6ZSwgYnVmZmVyLCAmc2l6ZSk7DQogDQor
ICBpZiAoc3RhdHVzICE9IFNBTkVfU1RBVFVTX0dPT0QpIHsNCisJICByZXR1
cm4oc3RhdHVzKTsNCisgIH0NCisNCiAgIHNpemUgPSBnZXRfaW5xdWlyeV9h
ZGRpdGlvbmFsX2xlbmd0aCAoYnVmZmVyKSArIDU7DQogDQogICAvKiB0aGVu
IGdldCBpbnF1aXJ5IHdpdGggYWN0dWFsIHNpemUgKi8NCiAgIHNldF9pbnF1
aXJ5X3JldHVybl9zaXplIChpbnF1aXJ5LmNtZCwgc2l6ZSk7DQotICBzYW5l
aV9zY3NpX2NtZCAoc2ZkLCBpbnF1aXJ5LmNtZCwgaW5xdWlyeS5zaXplLCBi
dWZmZXIsICZzaXplKTsNCisgIHN0YXR1cyA9IHNhbmVpX3Njc2lfY21kIChz
ZmQsIGlucXVpcnkuY21kLCBpbnF1aXJ5LnNpemUsIGJ1ZmZlciwgJnNpemUp
Ow0KKw0KKyAgcmV0dXJuKHN0YXR1cyk7DQogfQ0KIA0KIHN0YXRpYyB2b2lk
IA0KQEAgLTE0MCw4ICsyMDQsMTcgQEANCiAgICAgICAiQ0QtZHJpdmUiLCAi
c2Nhbm5lciIsICJvcHRpY2FsLWRyaXZlIiwgImp1a2Vib3giLA0KICAgICAg
ICJjb21tdW5pY2F0b3IiDQogICAgIH07DQorDQorICBpZiAoc2Nhbm5lcl9k
b19pbnF1aXJ5IChidWZmZXIsIHNmZCkgIT0gU0FORV9TVEFUVVNfR09PRCkN
CisgICAgew0KKyAgICAgIHJldHVybjsNCisgICAgfQ0KKw0KKyAgaWYgKHZl
cmJvc2UpIHsNCisJICBoZXhkdW1wICgiSW5xdWlyeSBmb3IgZGV2aWNlOiIs
IGJ1ZmZlciwNCisJCQkgICBnZXRfaW5xdWlyeV9hZGRpdGlvbmFsX2xlbmd0
aCAoYnVmZmVyKSArIDUpOw0KKyAgfQ0KIA0KLSAgc2Nhbm5lcl9kb19pbnF1
aXJ5IChidWZmZXIsIHNmZCk7CS8qIGdldCBpbnF1aXJ5ICovDQogICBkZXZ0
eXBlID0gZ2V0X2lucXVpcnlfcGVyaXBoX2RldnR5cGUgKGJ1ZmZlcik7DQog
ICBpZiAoIXZlcmJvc2UNCiAgICAgICAmJiBkZXZ0eXBlICE9IElOX3Blcmlw
aF9kZXZ0eXBlX3NjYW5uZXINCg==
---171960392-1441467780-1019979540=:12909--