From 9e4127b85a9764f3bf1c2cdcc02e6bdec6021eaf Mon Sep 17 00:00:00 2001 From: Kyle Morgan Date: Wed, 18 Aug 2021 09:06:42 -0700 Subject: [PATCH] Bug fix for camshr, when hostID > 9 and sg device > 7 --- Makefile.in | 4 ++-- camshr/QueryHighwayType.c | 2 +- camshr/parse_crate_db.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index f2133a739f..6269c6a53e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -221,7 +221,7 @@ tests-env: # Interdependent directories: actions: mdsshr tdishr treeshr xmdsshr mdstcpip servershr -camshr: mdsdcl +camshr: mdsdcl mdstcpip ccl: camshr mdsshr mdsdcl tcl: mdsshr treeshr tdishr mdstcpip servershr mdsdcl dwscope: xmdsshr @@ -234,7 +234,7 @@ java/jdispatcher: java/mdsobjects java/jtraverser: java/mdsobjects java/jscope java/jtraverser2: java/mdsplus-api math: mdsshr -mdsdcl: mdsshr +mdsdcl: mdsshr treeshr mdslib: mdstcpip mdslibidl: tdishr mdsmisc: tdishr xtreeshr diff --git a/camshr/QueryHighwayType.c b/camshr/QueryHighwayType.c index 05bafc8391..3d62b027f0 100644 --- a/camshr/QueryHighwayType.c +++ b/camshr/QueryHighwayType.c @@ -115,7 +115,7 @@ int QueryHighwayType(char *serial_hwy_driver) { if (strstr(line, "Host:")) { - sscanf(line, "Host: scsi%1d Channel: %*2d Id: %2d", &tmpHost, &tmpId); + sscanf(line, "Host: scsi%d Channel: %*2d Id: %2d", &tmpHost, &tmpId); if (tmpHost == host_adapter && tmpId == scsi_id) { diff --git a/camshr/parse_crate_db.c b/camshr/parse_crate_db.c index 1ddde8b140..a6535dd6f8 100644 --- a/camshr/parse_crate_db.c +++ b/camshr/parse_crate_db.c @@ -83,7 +83,7 @@ void parse_crate_db(struct CRATE *in, struct Crate_ *out) ); out->device = (in->DSFname[0] != '.') - ? strtol(in->DSFname, NULL, 0) // valid /dev/sg# + ? strtol(in->DSFname, NULL, 10) // valid /dev/sg# : -1; // in-valid out->type = in->HwyType; // highway type