Fix a few memory leaks, DHCPv6 prefix definition and the -V option.

1 files changed, 22 insertions, 15 deletions

diff --git a/dhcpcd.c b/dhcpcd.c
index 5288ed7c..193c9a1a 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1155,21 +1155,8 @@ main(int argc, char **argv)
 			i = 2;
 			break;
 		case 'V':
-			printf("Interface options:\n");
-			if_printoptions();
-#ifdef INET
-			if (family == 0 || family == AF_INET) {
-				printf("\nDHCPv4 options:\n");
-				dhcp_printoptions();
-			}
-#endif
-#ifdef INET6
-			if (family == 0 || family == AF_INET6) {
-				printf("\nDHCPv6 options:\n");
-				dhcp6_printoptions();
-			}
-#endif
-			exit(EXIT_SUCCESS);
+			i = 3;
+			break;
 		case '?':
 			usage();
 			exit(EXIT_FAILURE);
@@ -1185,6 +1172,26 @@ main(int argc, char **argv)
 			usage();
 		exit(EXIT_FAILURE);
 	}
+	if (i == 3) {
+		printf("Interface options:\n");
+		if_printoptions();
+#ifdef INET
+		if (family == 0 || family == AF_INET) {
+			printf("\nDHCPv4 options:\n");
+			dhcp_printoptions();
+		}
+#endif
+#ifdef INET6
+		if (family == 0 || family == AF_INET6) {
+			printf("\nDHCPv6 options:\n");
+			dhcp6_printoptions();
+		}
+#endif
+#ifdef DEBUG_MEMORY
+		cleanup();
+#endif
+		exit(EXIT_SUCCESS);
+	}
 	options = if_options->options;
 	if (i != 0) {
 		if (i == 1)