diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-06 21:53:39 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-06 21:53:39 +0200 |
| commit | bfc66d49806a4305014b12bbe078484b2da6f93f (patch) | |
| tree | a8dafa2ba1bb61d3fbe37fbeb03c68ee31180757 /networking/nbd-client.c | |
| parent | 9536ef7c9855172d25223242eba7b7692339e3d8 (diff) | |
| download | busybox-w32-bfc66d49806a4305014b12bbe078484b2da6f93f.tar.gz busybox-w32-bfc66d49806a4305014b12bbe078484b2da6f93f.tar.bz2 busybox-w32-bfc66d49806a4305014b12bbe078484b2da6f93f.zip | |
nbd-client: make it NOEXEC, stop using argc
function old new delta
nbdclient_main 484 492 +8
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/nbd-client.c')
| -rw-r--r-- | networking/nbd-client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/nbd-client.c b/networking/nbd-client.c index a5e25e6aa..cf1857231 100644 --- a/networking/nbd-client.c +++ b/networking/nbd-client.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include <netinet/tcp.h> | 7 | #include <netinet/tcp.h> |
| 8 | #include <linux/fs.h> | 8 | #include <linux/fs.h> |
| 9 | 9 | ||
| 10 | //applet:IF_NBDCLIENT(APPLET_ODDNAME(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient)) | 10 | //applet:IF_NBDCLIENT(APPLET_NOEXEC(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient)) |
| 11 | 11 | ||
| 12 | //kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o | 12 | //kbuild:lib-$(CONFIG_NBDCLIENT) += nbd-client.o |
| 13 | 13 | ||
| @@ -43,7 +43,7 @@ | |||
| 43 | //blocksizes other than 1024 without patches | 43 | //blocksizes other than 1024 without patches |
| 44 | 44 | ||
| 45 | int nbdclient_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 45 | int nbdclient_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
| 46 | int nbdclient_main(int argc, char **argv) | 46 | int nbdclient_main(int argc UNUSED_PARAM, char **argv) |
| 47 | { | 47 | { |
| 48 | unsigned long timeout = 0; | 48 | unsigned long timeout = 0; |
| 49 | #if BB_MMU | 49 | #if BB_MMU |
| @@ -61,7 +61,7 @@ int nbdclient_main(int argc, char **argv) | |||
| 61 | BUILD_BUG_ON(offsetof(struct nbd_header_t, data) != 8+8+8+4); | 61 | BUILD_BUG_ON(offsetof(struct nbd_header_t, data) != 8+8+8+4); |
| 62 | 62 | ||
| 63 | // Parse command line stuff (just a stub now) | 63 | // Parse command line stuff (just a stub now) |
| 64 | if (argc != 4) | 64 | if (!argv[1] || !argv[2] || !argv[3] || argv[4]) |
| 65 | bb_show_usage(); | 65 | bb_show_usage(); |
| 66 | 66 | ||
| 67 | #if !BB_MMU | 67 | #if !BB_MMU |