From: Hauke Mehrtens Date: Wed, 13 Jul 2016 14:55:20 +0000 (+0200) Subject: kmodloader: fix lsmod depends output X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=commitdiff_plain;h=aead2c0cbffdda9b46d74a998a4c6aeef423b21a kmodloader: fix lsmod depends output Without this patch only the first dependency is shown, with this patch all module dependencies are show. Signed-off-by: Hauke Mehrtens --- diff --git a/kmodloader.c b/kmodloader.c index ad1f1c0..e32e6af 100644 --- a/kmodloader.c +++ b/kmodloader.c @@ -658,15 +658,26 @@ static int main_rmmod(int argc, char **argv) static int main_lsmod(int argc, char **argv) { struct module *m; + char *dep; if (scan_loaded_modules()) return -1; avl_for_each_element(&modules, m, avl) - if (m->state == LOADED) - printf("%-20s%8d%3d %s\n", - m->name, m->size, m->usage, - (*m->depends == '-') ? ("") : (m->depends)); + if (m->state == LOADED) { + printf("%-20s%8d%3d ", + m->name, m->size, m->usage); + if (m->depends && strcmp(m->depends, "-") && strcmp(m->depends, "")) { + dep = m->depends; + while (*dep) { + printf("%s", dep); + dep = dep + strlen(dep) + 1; + if (*dep) + printf(","); + } + } + printf("\n"); + } free_modules();