Copyright notice change to GNU license 3

[debian/dhcpd-pools.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 613078d..657af88 100644 (file)
--- a/src/output.c
+++ b/src/output.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
@@ -24,6 +23,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <err.h>
 
 #include "dhcpd-pools.h"
 
@@ -39,8 +39,8 @@ int output_txt(void)
        if (config.output_file[0]) {
                outfile = fopen(config.output_file, "w+");
                if (outfile == NULL) {
-                       eprintf("output_txt: %s:", config.output_file);
-                       exit(EXIT_FAILURE);
+                       err(EXIT_FAILURE, "output_txt: %s",
+                           config.output_file);
                }
        } else {
                outfile = stdout;
@@ -172,12 +172,12 @@ int output_txt(void)
        if (outfile == stdout) {
                ret = fflush(stdout);
                if (ret) {
-                       eprintf("output_txt: fflush:");
+                       warn("output_txt: fflush");
                }
        } else {
                ret = fclose(outfile);
                if (ret) {
-                       eprintf("output_txt: fclose:");
+                       warn("output_txt: fclose");
                }
        }
 
@@ -196,8 +196,8 @@ int output_xml(void)
        if (config.output_file[0]) {
                outfile = fopen(config.output_file, "w+");
                if (outfile == NULL) {
-                       eprintf("output_xml: %s:", config.output_file);
-                       exit(EXIT_FAILURE);
+                       err(EXIT_FAILURE, "output_xml: %s",
+                           config.output_file);
                }
        } else {
                outfile = stdout;
@@ -276,12 +276,12 @@ int output_xml(void)
        if (outfile == stdout) {
                ret = fflush(stdout);
                if (ret) {
-                       eprintf("output_xml: fflush:");
+                       warn("output_xml: fflush");
                }
        } else {
                ret = fclose(outfile);
                if (ret) {
-                       eprintf("output_xml: fclose:");
+                       warn("output_xml: fclose");
                }
        }
 
@@ -425,8 +425,8 @@ int output_html(void)
        if (config.output_file[0]) {
                outfile = fopen(config.output_file, "w+");
                if (outfile == NULL) {
-                       eprintf("output_html: %s:", config.output_file);
-                       exit(EXIT_FAILURE);
+                       err(EXIT_FAILURE, "output_html: %s",
+                           config.output_file);
                }
        } else {
                outfile = stdout;
@@ -607,12 +607,12 @@ int output_html(void)
        if (outfile == stdout) {
                ret = fflush(stdout);
                if (ret) {
-                       eprintf("output_html: fflush:");
+                       warn("output_html: fflush");
                }
        } else {
                ret = fclose(outfile);
                if (ret) {
-                       eprintf("output_html: fclose:");
+                       warn("output_html: fclose");
                }
        }
        return 0;
@@ -630,8 +630,8 @@ int output_csv(void)
        if (config.output_file[0]) {
                outfile = fopen(config.output_file, "w+");
                if (outfile == NULL) {
-                       eprintf("output_csv: %s:", config.output_file);
-                       exit(EXIT_FAILURE);
+                       err(EXIT_FAILURE, "output_csv: %s",
+                           config.output_file);
                }
        } else {
                outfile = stdout;
@@ -763,13 +763,13 @@ int output_csv(void)
        if (outfile == stdout) {
                ret = fflush(stdout);
                if (ret) {
-                       eprintf("output_cvs: fflush:");
+                       warn("output_cvs: fflush");
                }
 
        } else {
                ret = fclose(outfile);
                if (ret) {
-                       eprintf("output_cvs: fclose:");
+                       warn("output_cvs: fclose");
                }
 
        }