X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fother.c;h=7719c4ee70d15e81c1e1c65f9550842feea5650d;hb=4c9f177b2ea35eed95226e8c461855a927716418;hp=b5b9290e33eb23c4ae79c2516dbaea05018b4bbd;hpb=ed2266424d1803bcfb7fc4dacde1936765b10c4a;p=debian%2Fdhcpd-pools.git

diff --git a/src/other.c b/src/other.c
index b5b9290..7719c4e 100644
--- a/src/other.c
+++ b/src/other.c
@@ -41,7 +41,6 @@ extern char *malloc();
 void *safe_malloc(const size_t size)
 {
 	void *ret = malloc(size);
-
 	if (ret == NULL) {
 		err(EXIT_FAILURE,
 		    "safe_malloc: cannot allocate %lu bytes: ", size);
@@ -50,6 +49,17 @@ void *safe_malloc(const size_t size)
 	return ret;
 }
 
+/* Simple memory reallocation wrapper */
+void *safe_realloc(void *ptr, const size_t size)
+{
+	void *ret = realloc(ptr, size);
+
+	if (!ret && size)
+		err(EXIT_FAILURE,
+		    "safe_realloc: cannot allocate %zu bytes", size);
+	return ret;
+}
+
 /* Simple strdup wrapper */
 char *safe_strdup(const char *str)
 {
@@ -75,26 +85,22 @@ void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
 /* Free memory, flush buffers etc */
 void clean_up(void)
 {
-	int ret;
+	unsigned int i;
 
-	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);
-	}
 	/* Just in case there something in buffers */
-	ret = fflush(stdout);
-	if (errno || ret) {
-		warn("clean_up: stdout");
+	if (fflush(NULL)) {
+		warn("clean_up: fflush");
 	}
-	ret = fflush(stderr);
-	if (errno || ret) {
-		warn("clean_up: stderr");
+	num_shared_networks++;
+	for (i = 0; i < num_shared_networks; i++) {
+		free((shared_networks + i)->name);
 	}
-
 	free(config.dhcpdconf_file);
 	free(config.dhcpdlease_file);
 	free(config.output_file);
 	free(ranges);
-	free(shared_net_names);
+	free(leases);
+	free(touches);
 	free(shared_networks);
 }
 
@@ -109,6 +115,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)
@@ -116,38 +123,38 @@ void usage(int status)
 	FILE *out;
 	out = status != 0 ? stderr : stdout;
 
-	fprintf(out, "\
-Usage: %s [OPTIONS]\n", program_invocation_short_name);
+	fprintf(out, "\n\
+Usage: %s [OPTIONS]\n\n", program_invocation_short_name);
 	fprintf(out, "\
 This is ISC dhcpd pools usage analyzer.\n\
 \n");
 	fprintf(out, "\
-  -c --config   file    path to the dhcpd.conf file\n\
-  -l --leases   file    path to the dhcpd.leases file\n\
-  -f --format   [thcxX]   output format\n");
+  -c, --config=FILE      path to the dhcpd.conf file\n\
+  -l, --leases=FILE      path to the dhcpd.leases file\n\
+  -f, --format=[thHcxX]  output format\n");
 	fprintf(out, "\
-                          t for text\n\
-                          h for html table\n\
-                          H for full html page\n\
-                          x for xml\n\
-                          X for xml with active lease details\n\
-                          c for comma separated values\n");
+                           t for text\n\
+                           h for html table\n\
+                           H for full html page\n\
+                           x for xml\n\
+                           X for xml with active lease details\n\
+                           c for comma separated values\n");
 	fprintf(out, "\
-  -s --sort [nimcptTe]  sort ranges by\n\
-                          n name\n\
-                          i IP\n\
-                          m maxium\n\
-                          c current\n\
-                          p percent\n\
-                          t touched\n\
-                          T t+c\n\
-                          e t+c perc\n");
+  -s, --sort=[nimcptTe]  sort ranges by\n\
+                           n name\n\
+                           i IP\n\
+                           m maxium\n\
+                           c current\n\
+                           p percent\n\
+                           t touched\n\
+                           T t+c\n\
+                           e t+c perc\n");
 	fprintf(out, "\
-  -r --reverse		reverse order sort\n\
-  -o --output   file    output into a file\n\
-  -L --limit    nr      output limit mask 77 - 00\n\
-  -v --version          version information\n\
-  -h --help             this screen\n\
+  -r, --reverse		 reverse order sort\n\
+  -o, --output=FILE      output into a file\n\
+  -L, --limit=NR         output limit mask 77 - 00\n\
+  -v, --version          version information\n\
+  -h, --help             this screen\n\
 \n\
 Report bugs to <%s>\n\
 Homepage: %s\n", PACKAGE_BUGREPORT, PACKAGE_URL);