diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:44:07 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:44:07 -0800 |
| commit | 13f797da7f190e9ea52f2f3d235210b8a4963b21 (patch) | |
| tree | c821e95502ab1ab9096a11e7488e224e319a46b4 /toolbox/insmod.c | |
| parent | dcf3ce247e13fe0a982ed2ada35cdee1f0ac626a (diff) | |
| download | system_core-13f797da7f190e9ea52f2f3d235210b8a4963b21.zip system_core-13f797da7f190e9ea52f2f3d235210b8a4963b21.tar.gz system_core-13f797da7f190e9ea52f2f3d235210b8a4963b21.tar.bz2 | |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'toolbox/insmod.c')
| -rw-r--r-- | toolbox/insmod.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/toolbox/insmod.c b/toolbox/insmod.c index d084403..44b9847 100644 --- a/toolbox/insmod.c +++ b/toolbox/insmod.c @@ -45,10 +45,12 @@ bail: return buffer; } +#define min(x,y) ((x) < (y) ? (x) : (y)) int insmod_main(int argc, char **argv) { void *file; - ssize_t size; + ssize_t size = 0; + char opts[1024]; int ret; /* make sure we've got an argument */ @@ -64,9 +66,24 @@ int insmod_main(int argc, char **argv) return -1; } + opts[0] = '\0'; + if (argc > 2) { + int i, len; + char *end = opts + sizeof(opts) - 1; + char *ptr = opts; + + for (i = 2; (i < argc) && (ptr < end); i++) { + len = min(strlen(argv[i]), end - ptr); + memcpy(ptr, argv[i], len); + ptr += len; + *ptr++ = ' '; + *ptr++ = '\0'; + } + *(ptr - 1) = '\0'; + } + /* pass it to the kernel */ - /* XXX options */ - ret = init_module(file, size, ""); + ret = init_module(file, size, opts); if (ret != 0) { fprintf(stderr, "insmod: init_module '%s' failed (%s)\n", |