From fafb8ead9d68b671f754c8c5089f127058dc6916 Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Wed, 30 Jan 2008 09:33:43 +0000 Subject: [PATCH] Bump /lib to GPLv3 git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1913 f882894a-f735-0410-b71e-b25c423dba1c --- lib/parse_ini.c | 17 +++++------ lib/utils_base.c | 39 ++++++++++++++++-------- lib/utils_cmd.c | 79 ++++++++++++++++++++++++------------------------ lib/utils_disk.c | 33 ++++++++++---------- lib/utils_tcp.c | 33 ++++++++++---------- 5 files changed, 107 insertions(+), 94 deletions(-) diff --git a/lib/parse_ini.c b/lib/parse_ini.c index f22a147..ef56be9 100644 --- a/lib/parse_ini.c +++ b/lib/parse_ini.c @@ -1,30 +1,29 @@ /***************************************************************************** -* +* * Nagios-plugins parse_ini library * * License: GPL -* Copyright (c) 2007 nagios-plugins team +* Copyright (c) 2007 Nagios Plugins Development Team * * Last Modified: $Date$ -* -* This file is part of Nagios-plugins. * -* Nagios-plugins is free software: you can redistribute it and/or modify +* +* 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 3 of the License, or * (at your option) any later version. * -* Nagios-plugins is distributed in the hope that it will be useful, +* 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 Nagios-plugins. If not, see . +* along with this program. If not, see . * * $Id$ -* -****************************************************************************/ +* +*****************************************************************************/ #include "common.h" #include "parse_ini.h" diff --git a/lib/utils_base.c b/lib/utils_base.c index fbed360..c0bc4dc 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c @@ -1,16 +1,31 @@ /***************************************************************************** - * - * utils_base.c - * - * Library of useful functions for plugins - * These functions are tested with libtap. See tests/ directory - * - * Copyright (c) 2006 Nagios Plugin Development Team - * License: GPL - * - * $Revision$ - * $Date$ - ****************************************************************************/ +* +* utils_base.c +* +* License: GPL +* Copyright (c) 2006 Nagios Plugins Development Team +* +* Last Modified: $Date$ +* +* Library of useful functions for plugins +* +* +* 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 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, see . +* +* $Id$ +* +*****************************************************************************/ #include #include "common.h" diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c index c4ceb97..aaf055a 100644 --- a/lib/utils_cmd.c +++ b/lib/utils_cmd.c @@ -1,42 +1,43 @@ -/**************************************************************************** - * Nagios run command utilities - * - * License: GPL - * Copyright (c) 2005 nagios-plugins team - * - * $Id: utils_cmd.c 1434 2006-06-18 19:36:48Z opensides $ - * - * Description : - * - * A simple interface to executing programs from other programs, using an - * optimized and safe popen()-like implementation. It is considered safe - * in that no shell needs to be spawned and the environment passed to the - * execve()'d program is essentially empty. - * - * - * The code in this file is a derivative of popen.c which in turn was taken - * from "Advanced Programming for the Unix Environment" by W. Richard Stevens. - * - * Care has been taken to make sure the functions are async-safe. The one - * function which isn't is cmd_init() which it doesn't make sense to - * call twice anyway, so the api as a whole should be considered async-safe. - * - * License Information: - * - * 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 - * (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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ +/***************************************************************************** +* +* Nagios run command utilities +* +* License: GPL +* Copyright (c) 2005-2006 Nagios Plugins Development Team +* +* Last Modified: $Date$ +* +* Description : +* +* A simple interface to executing programs from other programs, using an +* optimized and safe popen()-like implementation. It is considered safe +* in that no shell needs to be spawned and the environment passed to the +* execve()'d program is essentially empty. +* +* The code in this file is a derivative of popen.c which in turn was taken +* from "Advanced Programming for the Unix Environment" by W. Richard Stevens. +* +* Care has been taken to make sure the functions are async-safe. The one +* function which isn't is cmd_init() which it doesn't make sense to +* call twice anyway, so the api as a whole should be considered async-safe. +* +* +* 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 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, see . +* +* $Id$ +* +*****************************************************************************/ #define NAGIOSPLUG_API_C 1 diff --git a/lib/utils_disk.c b/lib/utils_disk.c index 9324f5f..c92b850 100644 --- a/lib/utils_disk.c +++ b/lib/utils_disk.c @@ -1,31 +1,30 @@ -/**************************************************************************** -* Utils for check_disk -* +/***************************************************************************** +* +* Library for check_disk +* * License: GPL -* Copyright (c) 1999-2006 nagios-plugins team -* +* Copyright (c) 1999-2007 nagios-plugins team +* * Last Modified: $Date$ -* +* * Description: -* +* * This file contains utilities for check_disk. These are tested by libtap -* -* License Information: -* -* This program is free software; you can redistribute it and/or modify +* +* +* 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., 675 Mass Ave, Cambridge, MA 02139, USA. -* +* along with this program. If not, see . +* * $Id$ * *****************************************************************************/ diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c index 2fefaf3..d3475d3 100644 --- a/lib/utils_tcp.c +++ b/lib/utils_tcp.c @@ -1,33 +1,32 @@ -/**************************************************************************** -* Utils for check_tcp -* +/***************************************************************************** +* +* Library for check_tcp +* * License: GPL * Copyright (c) 1999-2007 nagios-plugins team -* +* * Last Modified: $Date$ -* +* * Description: -* +* * This file contains utilities for check_tcp. These are tested by libtap -* -* License Information: -* -* This program is free software; you can redistribute it and/or modify +* +* +* 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., 675 Mass Ave, Cambridge, MA 02139, USA. -* +* along with this program. If not, see . +* * $Id$ -* +* *****************************************************************************/ #include "common.h" -- 2.30.2