aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2014-02-28 23:04:57 -0600
committerRob Landley <rob@landley.net>2014-02-28 23:04:57 -0600
commitda60b9b163a598ae97d7566f095d5d69f53a6dab (patch)
tree7ee3058cf19dbf707d1ed7ea10c3761416a76b61
parent170c397576f7d34f41dc7579a3ed5bd6a2f30c1a (diff)
downloadtoybox-da60b9b163a598ae97d7566f095d5d69f53a6dab.tar.gz
Fix two bugs reported by Ashwini Sharma.
-rw-r--r--Makefile2
-rw-r--r--toys/other/ifconfig.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 13c8ec42..c5118e0c 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ uninstall:
clean::
rm -rf toybox toybox_unstripped generated/config.h generated/Config.in \
- generated/newtoys.h generated/globals.htestdir \
+ generated/newtoys.h generated/globals.h testdir \
generated/Config.probed generated/oldtoys.h generated/flags.h \
generated/portability.h .singleconfig .singleconfig.old \
generated/instlist generated/mkflags generated/config2help \
diff --git a/toys/other/ifconfig.c b/toys/other/ifconfig.c
index 36529c95..2542d791 100644
--- a/toys/other/ifconfig.c
+++ b/toys/other/ifconfig.c
@@ -395,7 +395,7 @@ void ifconfig_main(void)
ptr = p = (char *)sock->sa_data;
memset(sock, 0, sizeof(struct sockaddr));
- if (!argv[1]) {
+ if (argv[1]) {
if (!strcmp("ether", *++argv)) sock->sa_family = ARPHRD_ETHER;
else if (!strcmp("infiniband", *argv)) {
sock->sa_family = ARPHRD_INFINIBAND;