emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lsscsi: code shrink

Browse Source 
function                                             old     new   delta
lsscsi_main                                          298     302      +4
get_line                                              56      45     -11
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 4/-11)              Total: -7 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-07-20 02:03:02 +02:00
parent 9a2d899273
commit 2dd82f465e
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
miscutils/lsscsi.c
View File

@ -27,25 +27,21 @@
static const char scsi_dir[] ALIGN1 = "/sys/bus/scsi/devices"; static const char scsi_dir[] ALIGN1 = "/sys/bus/scsi/devices";
static char *get_line(const char *filename, char *buf, unsigned *bufsize_p) static char *get_line(const char *filename, char *buf, char *bufend)
{ {
unsigned bufsize = *bufsize_p; ssize_t sz = bufend - buf - 2; /* -2 for two NULs */
ssize_t sz;
if ((int)(bufsize - 2) <= 0) if (sz <= 0)
return buf; return buf;
sz = open_read_close(filename, buf, bufsize - 2); sz = open_read_close(filename, buf, sz);
if (sz < 0) if (sz < 0)
sz = 0; sz = 0;
buf[sz] = '\0'; buf[sz] = '\0';
sz = (trim(buf) - buf) + 1; buf = trim(buf) + 1;
bufsize -= sz;
buf += sz;
buf[0] = '\0'; buf[0] = '\0';
*bufsize_p = bufsize;
return buf; return buf;
} }
@ -61,7 +57,6 @@ int lsscsi_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
while ((de = readdir(dir)) != NULL) { while ((de = readdir(dir)) != NULL) {
char buf[256]; char buf[256];
char *ptr; char *ptr;
unsigned bufsize;
const char *vendor; const char *vendor;
const char *type_str; const char *type_str;
const char *type_name; const char *type_name;
@ -76,15 +71,17 @@ int lsscsi_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
if (chdir(de->d_name) != 0) if (chdir(de->d_name) != 0)
continue; continue;
bufsize = sizeof(buf);
vendor = buf; vendor = buf;
ptr = get_line("vendor", buf, &bufsize); ptr = get_line("vendor", buf, buf + sizeof(buf));
type_str = ptr; type_str = ptr;
ptr = get_line("type", ptr, &bufsize); ptr = get_line("type", ptr, buf + sizeof(buf));
model = ptr; model = ptr;
ptr = get_line("model", ptr, &bufsize); ptr = get_line("model", ptr, buf + sizeof(buf));
rev = ptr; rev = ptr;
ptr = get_line("rev", ptr, &bufsize); /*ptr =*/ get_line("rev", ptr, buf + sizeof(buf));
printf("[%s]\t", de->d_name); printf("[%s]\t", de->d_name);