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

diff --git a/src/other.c b/src/other.c
index 15bcdd2..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
@@ -51,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;
@@ -67,9 +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);
-	}
+
 	/* Just in case there something in buffers */
 	ret = fflush(stdout);
 	if (errno || ret) {
@@ -79,10 +86,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);
 }
@@ -98,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)