aboutsummaryrefslogtreecommitdiff
path: root/toys
diff options
context:
space:
mode:
Diffstat (limited to 'toys')
-rw-r--r--toys/lsmod.c5
-rw-r--r--toys/modinfo.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/toys/lsmod.c b/toys/lsmod.c
index 07ef7f89..82dbb589 100644
--- a/toys/lsmod.c
+++ b/toys/lsmod.c
@@ -22,7 +22,8 @@ config LSMOD
void lsmod_main(void)
{
- FILE * file = xfopen("/proc/modules", "r");
+ char *modfile = "/proc/modules";
+ FILE * file = xfopen(modfile, "r");
xprintf("%-23s Size Used by\n", "Module");
@@ -35,7 +36,7 @@ void lsmod_main(void)
if (users[len] == ',' || users[len] == '-')
users[len] = 0;
xprintf("%-19s %8s %s %s\n", name, size, refcnt, users);
- } else perror_exit("unrecognized input");
+ } else perror_exit("bad %s", modfile);
}
fclose(file);
}
diff --git a/toys/modinfo.c b/toys/modinfo.c
index 0e32fc66..c878fc4e 100644
--- a/toys/modinfo.c
+++ b/toys/modinfo.c
@@ -86,8 +86,7 @@ static int check_module(struct dirtree *new)
char **s;
for (s = toys.optargs; *s; s++) {
int len = strlen(*s);
- if (strncmp(*s, new->name, len) == 0 &&
- strcmp(&new->name[len], ".ko") == 0)
+ if (!strncmp(*s, new->name, len) && !strcmp(new->name+len, ".ko"))
modinfo_file(new);
}
}
@@ -98,8 +97,7 @@ static int check_module(struct dirtree *new)
void modinfo_main(void)
{
struct utsname uts;
- if (uname(&uts) < 0)
- perror_exit("unable to determine uname");
+ if (uname(&uts) < 0) perror_exit("bad uname");
sprintf(toybuf, "/lib/modules/%s", uts.release);
dirtree_read(toybuf, check_module);
}