David Frascone <dave@frascone.com> noticed two problems. First, modprobe was

trying to call 'insmod -q', which wasn't supported.  Secondly, when modprobe
was fed blank lines from modules.dep, we ended up calling xstrndup(ptr, -1),
which with suitably bad results.  David provided a patch to catch the blank
lines, and I have added insmod -q support.  So modprobe should work again.
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@4984 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 4 insertions, 0 deletions

diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index fbe18b640..b05158ac0 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -178,6 +178,10 @@ static struct dep_t *build_dep ( void )
                         
                         if (( *(end-1) == '.' ) && ( *end == 'o' ))
                                 ext = 2;
+
+                        /* Cope with blank lines */
+                        if ((end-deps-ext+1) <= 0)
+                                continue;
                         
                         dep = xstrndup ( deps, end - deps - ext + 1 );