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

Fix infinite loop and reallocate if too many modules.

Browse Source
This commit is contained in:
Matt Kraai 2001-04-13 14:40:15 +00:00
parent 445fb952b8
commit 0f50bca9aa
2 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lsmod.c
View File

@ -69,19 +69,36 @@ static const int NEW_MOD_VISITED = 8;
static const int NEW_MOD_USED_ONCE = 16; static const int NEW_MOD_USED_ONCE = 16;
static const int NEW_MOD_INITIALIZING = 64; static const int NEW_MOD_INITIALIZING = 64;
static int my_query_module(const char *name, int which, void **buf,
size_t *bufsize, size_t *ret)
{
int my_ret;
my_ret = query_module(name, which, *buf, *bufsize, ret);
if (my_ret == -1 && errno == ENOSPC) {
*buf = xrealloc(*buf, *ret);
*bufsize = *ret;
my_ret = query_module(name, which, *buf, *bufsize, ret);
}
return my_ret;
}
extern int lsmod_main(int argc, char **argv) extern int lsmod_main(int argc, char **argv)
{ {
struct module_info info; struct module_info info;
char *module_names, *mn, *deps, *dn; char *module_names, *mn, *deps, *dn;
size_t bufsize, nmod, count, i, j; size_t bufsize, depsize, nmod, count, i, j;
module_names = xmalloc(bufsize = 256); module_names = xmalloc(bufsize = 256);
deps = xmalloc(bufsize); if (my_query_module(NULL, QM_MODULES, (void **)&module_names, &bufsize,
if (query_module(NULL, QM_MODULES, module_names, bufsize, &nmod)) { &nmod)) {
perror_msg_and_die("QM_MODULES"); perror_msg_and_die("QM_MODULES");
} }
deps = xmalloc(depsize = 256);
printf("Module Size Used by\n"); printf("Module Size Used by\n");
for (i = 0, mn = module_names; i < nmod; mn += strlen(mn) + 1, i++) { for (i = 0, mn = module_names; i < nmod; mn += strlen(mn) + 1, i++) {
if (query_module(mn, QM_INFO, &info, sizeof(info), &count)) { if (query_module(mn, QM_INFO, &info, sizeof(info), &count)) {
@ -92,15 +109,12 @@ extern int lsmod_main(int argc, char **argv)
/* else choke */ /* else choke */
perror_msg_and_die("module %s: QM_INFO", mn); perror_msg_and_die("module %s: QM_INFO", mn);
} }
while (query_module(mn, QM_REFS, deps, bufsize, &count)) { if (my_query_module(mn, QM_REFS, (void **)&deps, &depsize, &count)) {
if (errno == ENOENT) { if (errno == ENOENT) {
/* The module was removed out from underneath us. */ /* The module was removed out from underneath us. */
continue; continue;
} }
if (errno != ENOSPC) { perror_msg_and_die("module %s: QM_REFS", mn);
error_msg_and_die("module %s: QM_REFS", mn);
}
deps = xrealloc(deps, bufsize = count);
} }
printf("%-20s%8lu%4ld ", mn, info.size, info.usecount); printf("%-20s%8lu%4ld ", mn, info.size, info.usecount);
if (info.flags & NEW_MOD_DELETED) if (info.flags & NEW_MOD_DELETED)

30
modutils/lsmod.c
View File

@ -69,19 +69,36 @@ static const int NEW_MOD_VISITED = 8;
static const int NEW_MOD_USED_ONCE = 16; static const int NEW_MOD_USED_ONCE = 16;
static const int NEW_MOD_INITIALIZING = 64; static const int NEW_MOD_INITIALIZING = 64;
static int my_query_module(const char *name, int which, void **buf,
size_t *bufsize, size_t *ret)
{
int my_ret;
my_ret = query_module(name, which, *buf, *bufsize, ret);
if (my_ret == -1 && errno == ENOSPC) {
*buf = xrealloc(*buf, *ret);
*bufsize = *ret;
my_ret = query_module(name, which, *buf, *bufsize, ret);
}
return my_ret;
}
extern int lsmod_main(int argc, char **argv) extern int lsmod_main(int argc, char **argv)
{ {
struct module_info info; struct module_info info;
char *module_names, *mn, *deps, *dn; char *module_names, *mn, *deps, *dn;
size_t bufsize, nmod, count, i, j; size_t bufsize, depsize, nmod, count, i, j;
module_names = xmalloc(bufsize = 256); module_names = xmalloc(bufsize = 256);
deps = xmalloc(bufsize); if (my_query_module(NULL, QM_MODULES, (void **)&module_names, &bufsize,
if (query_module(NULL, QM_MODULES, module_names, bufsize, &nmod)) { &nmod)) {
perror_msg_and_die("QM_MODULES"); perror_msg_and_die("QM_MODULES");
} }
deps = xmalloc(depsize = 256);
printf("Module Size Used by\n"); printf("Module Size Used by\n");
for (i = 0, mn = module_names; i < nmod; mn += strlen(mn) + 1, i++) { for (i = 0, mn = module_names; i < nmod; mn += strlen(mn) + 1, i++) {
if (query_module(mn, QM_INFO, &info, sizeof(info), &count)) { if (query_module(mn, QM_INFO, &info, sizeof(info), &count)) {
@ -92,15 +109,12 @@ extern int lsmod_main(int argc, char **argv)
/* else choke */ /* else choke */
perror_msg_and_die("module %s: QM_INFO", mn); perror_msg_and_die("module %s: QM_INFO", mn);
} }
while (query_module(mn, QM_REFS, deps, bufsize, &count)) { if (my_query_module(mn, QM_REFS, (void **)&deps, &depsize, &count)) {
if (errno == ENOENT) { if (errno == ENOENT) {
/* The module was removed out from underneath us. */ /* The module was removed out from underneath us. */
continue; continue;
} }
if (errno != ENOSPC) { perror_msg_and_die("module %s: QM_REFS", mn);
error_msg_and_die("module %s: QM_REFS", mn);
}
deps = xrealloc(deps, bufsize = count);
} }
printf("%-20s%8lu%4ld ", mn, info.size, info.usecount); printf("%-20s%8lu%4ld ", mn, info.size, info.usecount);
if (info.flags & NEW_MOD_DELETED) if (info.flags & NEW_MOD_DELETED)