From: Eric Andersen Date: Sat, 24 Feb 2001 19:51:54 +0000 (-0000) Subject: Make output match the real lsmod -- print (autoclean) type X-Git-Tag: 0_50~144 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=afeb96547fabc8c63e883f7c24aab5638cafbd50;p=oweals%2Fbusybox.git Make output match the real lsmod -- print (autoclean) type stuff first not last. -Erik --- diff --git a/lsmod.c b/lsmod.c index c97d199a6..a853db888 100644 --- a/lsmod.c +++ b/lsmod.c @@ -103,12 +103,6 @@ extern int lsmod_main(int argc, char **argv) deps = xrealloc(deps, bufsize = count); } printf("%-20s%8lu%4ld ", mn, info.size, info.usecount); - if (count) printf("["); - for (j = 0, dn = deps; j < count; dn += strlen(dn) + 1, j++) { - printf("%s%s", dn, (j==count-1)? "":" "); - } - if (count) printf("] "); - if (info.flags & NEW_MOD_DELETED) printf("(deleted)"); else if (info.flags & NEW_MOD_INITIALIZING) @@ -121,6 +115,12 @@ extern int lsmod_main(int argc, char **argv) if (!(info.flags & NEW_MOD_USED_ONCE)) printf("(unused)"); } + if (count) printf("["); + for (j = 0, dn = deps; j < count; dn += strlen(dn) + 1, j++) { + printf("%s%s", dn, (j==count-1)? "":" "); + } + if (count) printf("] "); + printf("\n"); } diff --git a/modutils/lsmod.c b/modutils/lsmod.c index c97d199a6..a853db888 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c @@ -103,12 +103,6 @@ extern int lsmod_main(int argc, char **argv) deps = xrealloc(deps, bufsize = count); } printf("%-20s%8lu%4ld ", mn, info.size, info.usecount); - if (count) printf("["); - for (j = 0, dn = deps; j < count; dn += strlen(dn) + 1, j++) { - printf("%s%s", dn, (j==count-1)? "":" "); - } - if (count) printf("] "); - if (info.flags & NEW_MOD_DELETED) printf("(deleted)"); else if (info.flags & NEW_MOD_INITIALIZING) @@ -121,6 +115,12 @@ extern int lsmod_main(int argc, char **argv) if (!(info.flags & NEW_MOD_USED_ONCE)) printf("(unused)"); } + if (count) printf("["); + for (j = 0, dn = deps; j < count; dn += strlen(dn) + 1, j++) { + printf("%s%s", dn, (j==count-1)? "":" "); + } + if (count) printf("] "); + printf("\n"); }