X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fother.c;h=fe5f34cc745b9fcc58e17d05161f8e2beb8912ab;hb=d54721b3a44a87be75b83860a955ddc7a0ec6b3d;hp=4ad6b012f9ff7eb00faaef0cedbaa5684c708381;hpb=17429ef85bfb4bdf51f4a659443fe4c31c972928;p=debian%2Fdhcpd-pools.git

diff --git a/src/other.c b/src/other.c
index 4ad6b01..fe5f34c 100644
--- a/src/other.c
+++ b/src/other.c
@@ -50,6 +50,16 @@ void *safe_malloc(const size_t size)
 	return ret;
 }
 
+/* Simple strdup wrapper */
+char *safe_strdup(const char *str)
+{
+	char *ret = strdup(str);
+
+	if (!ret && str)
+		err(EXIT_FAILURE, "cannot duplicate string");
+	return ret;
+}
+
 void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
 {
 	unsigned int i = num_ranges - 1, j;
@@ -66,6 +76,7 @@ void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
 void clean_up(void)
 {
 	int ret;
+
 	if (errno) {
 		warn("clean_up: errno (%d) set but not checked in correct place.\nif this is repeatable send strace output as a bug report", errno);
 	}
@@ -78,10 +89,13 @@ void clean_up(void)
 	if (errno || ret) {
 		warn("clean_up: stderr");
 	}
+
 	free(config.dhcpdconf_file);
 	free(config.dhcpdlease_file);
 	free(config.output_file);
 	free(ranges);
+	free(leases);
+	free(touches);
 	free(shared_net_names);
 	free(shared_networks);
 }
@@ -97,6 +111,7 @@ void print_version(void)
 		"This is free software: you are free to change and redistribute it.\n");
 	fprintf(stdout,
 		"There is NO WARRANTY, to the extent permitted by law.\n");
+        exit(EXIT_SUCCESS);
 }
 
 void usage(int status)