X-Git-Url: http://git.asbjorn.biz/?p=debian%2Fdhcpd-pools.git;a=blobdiff_plain;f=src%2Fother.c;h=d8f9ac421e4b4b3dab0694860a53cca60d23b469;hp=d3bb0f4b59ca91de521920464fc3d883a2ace08d;hb=f6880ed5f48e1591007246760a64cfc33d5f1eb4;hpb=74aef1c34e31699595b4b198bcde5ac1af694260

diff --git a/src/other.c b/src/other.c
index d3bb0f4..d8f9ac4 100644
--- a/src/other.c
+++ b/src/other.c
@@ -1,19 +1,18 @@
-/*
-** Copyright (C) 2006- Sami Kerola <kerolasa@iki.fi>
-**  
-** This program is free software; you can redistribute it and/or modify
+/* http://dhcpd-pools.sourceforge.net/
+** Copyright 2006- Sami Kerola <kerolasa@iki.fi>
+**
+** This program is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation, either version 3 of the License, or
 ** (at your option) any later version.
-** 
+**
 ** This program is distributed in the hope that it will be useful,
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
-** 
+**
 ** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -30,6 +29,7 @@ extern void exit();
 extern char *malloc();
 #endif				/* STDC_HEADERS */
 #include <errno.h>
+#include <err.h>
 #include <stdarg.h>
 #ifdef  HAVE_STRING_H
 #include <string.h>
@@ -38,40 +38,26 @@ extern char *malloc();
 #endif
 
 /* Simple memory allocation wrapper */
-void *safe_malloc(size_t size)
+void *safe_malloc(const size_t size)
 {
 	void *ret = malloc(size);
+
 	if (ret == NULL) {
-		eprintf("safe_malloc: malloc: ");
-		exit(EXIT_FAILURE);
+		err(EXIT_FAILURE,
+		    "safe_malloc: cannot allocate %lu bytes: ", size);
 	}
+
 	return ret;
 }
 
-/* Copyright (C) 1999 Lucent Technologies
- * Excerpted from 'The Practice of Programming'
- * by Brian W. Kernighan and Rob Pike
- * slight modifications by Sami Kerola.
- * eprintf: print error message and exit */
-void eprintf(char *fmt, ...)
+/* Simple strdup wrapper */
+char *safe_strdup(const char *str)
 {
-	va_list args;
-
-	fflush(stdout);
-	fprintf(stderr, "%s: ", program_name);
-
-	va_start(args, fmt);
-	vfprintf(stderr, fmt, args);
-	va_end(args);
-
-	if (fmt[0] != '\0' && fmt[strlen(fmt) - 1] == ':')
-		fprintf(stderr, " %s", strerror(errno));
-	/* Should be safe, after all dhcpd-pools has only one
-	 * thread. */
-	errno = 0;
+	char *ret = strdup(str);
 
-	fprintf(stderr, "\n");
-	fflush(stderr);
+	if (!ret && str)
+		err(EXIT_FAILURE, "cannot duplicate string");
+	return ret;
 }
 
 void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
@@ -86,29 +72,27 @@ void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
 	memcpy(ranges, tmp_ranges, num_ranges * sizeof(struct range_t));
 }
 
-
 /* Free memory, flush buffers etc */
 void clean_up(void)
 {
 	int ret;
-	if (errno) {
-		eprintf
-		    ("clean_up: errno (%d) set but not checked in correct place; if this is repeatable send strace output as a bug report:",
-		     errno);
-	}
+
 	/* Just in case there something in buffers */
 	ret = fflush(stdout);
 	if (errno || ret) {
-		eprintf("clean_up: stdout:");
+		warn("clean_up: stdout");
 	}
 	ret = fflush(stderr);
 	if (errno || ret) {
-		eprintf("clean_up: stderr:");
+		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);
 }
@@ -124,6 +108,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)
@@ -132,7 +117,7 @@ void usage(int status)
 	out = status != 0 ? stderr : stdout;
 
 	fprintf(out, "\
-Usage: %s [OPTIONS]\n", program_name);
+Usage: %s [OPTIONS]\n", program_invocation_short_name);
 	fprintf(out, "\
 This is ISC dhcpd pools usage analyzer.\n\
 \n");
@@ -147,9 +132,6 @@ This is ISC dhcpd pools usage analyzer.\n\
                           x for xml\n\
                           X for xml with active lease details\n\
                           c for comma separated values\n");
-/* TODO
-                        s for snmp\n");
- */
 	fprintf(out, "\
   -s --sort [nimcptTe]  sort ranges by\n\
                           n name\n\
@@ -170,5 +152,5 @@ This is ISC dhcpd pools usage analyzer.\n\
 Report bugs to <%s>\n\
 Homepage: %s\n", PACKAGE_BUGREPORT, PACKAGE_URL);
 
-        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }