5 files changed, 107 insertions, 94 deletions
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index f22a1476..ef56be95 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 <http://www.gnu.org/licenses/>.
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * 
 * $Id$
-*
+* 
-****************************************************************************/
+*****************************************************************************/
 #include "common.h"
 #include "parse_ini.h"
diff --git a/lib/utils_base.c b/lib/utils_base.c
index fbed3607..c0bc4dc5 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -1,16 +1,31 @@
 /*****************************************************************************
- *
+*
- * utils_base.c
+* utils_base.c
- *
+*
- * Library of useful functions for plugins
+* License: GPL
- * These functions are tested with libtap. See tests/ directory
+* Copyright (c) 2006 Nagios Plugins Development Team
- *
+*
- * Copyright (c) 2006 Nagios Plugin Development Team
+* Last Modified: $Date$
- * License: GPL
+*
- *
+* Library of useful functions for plugins
- * $Revision$
+* 
- * $Date$
+*
- ****************************************************************************/
+* 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 <http://www.gnu.org/licenses/>.
+* 
+* $Id$
+*
+*****************************************************************************/
 #include <stdarg.h>
 #include "common.h"
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index c4ceb97e..aaf055a9 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -1,42 +1,43 @@
-/****************************************************************************
+/*****************************************************************************
- * Nagios run command utilities
+*
- *
+* Nagios run command utilities
- * License: GPL
+*
- * Copyright (c) 2005 nagios-plugins team
+* License: GPL
- *
+* Copyright (c) 2005-2006 Nagios Plugins Development Team
- * $Id: utils_cmd.c 1434 2006-06-18 19:36:48Z opensides $
+*
- *
+* Last Modified: $Date$
- * Description :
+*
- *
+* Description :
- * A simple interface to executing programs from other programs, using an
+*
- * optimized and safe popen()-like implementation. It is considered safe
+* A simple interface to executing programs from other programs, using an
- * in that no shell needs to be spawned and the environment passed to the
+* optimized and safe popen()-like implementation. It is considered safe
- * execve()'d program is essentially empty.
+* 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
+* 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.
+* 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
+* 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
+* 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.
+* 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
- * 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
- * it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
- * the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
- * (at your option) any later version.
+* 
- *
+* This program 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
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
- * GNU General Public License for more details.
+* 
- *
+* You should have received a copy of the GNU General Public License
- * You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * along with this program; if not, write to the Free Software
+*
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+* $Id$
- */
+*
+*****************************************************************************/
 #define NAGIOSPLUG_API_C 1
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index 9324f5f3..c92b8506 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
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+* 
-*
 * $Id$
 * 
 *****************************************************************************/
diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c
index 2fefaf3c..d3475d3d 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
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+* 
-*
 * $Id$
-*
+* 
 *****************************************************************************/
 #include "common.h"

diff --git a/lib/parse_ini.c b/lib/parse_ini.c index f22a1476..ef56be95 100644 --- a/lib/parse_ini.c +++ b/lib/parse_ini.c
@@ -1,30 +1,29 @@
1	/*****************************************************************************	1	/*****************************************************************************
2	*	2	*
3	* Nagios-plugins parse_ini library	3	* Nagios-plugins parse_ini library
4	*	4	*
5	* License: GPL	5	* License: GPL
6	* Copyright (c) 2007 nagios-plugins team	6	* Copyright (c) 2007 Nagios Plugins Development Team
7	*	7	*
8	* Last Modified: $Date$	8	* Last Modified: $Date$
9	*
10	* This file is part of Nagios-plugins.
11	*	9	*
12	* Nagios-plugins is free software: you can redistribute it and/or modify	10	*
		11	* This program is free software: you can redistribute it and/or modify
13	* it under the terms of the GNU General Public License as published by	12	* it under the terms of the GNU General Public License as published by
14	* the Free Software Foundation, either version 3 of the License, or	13	* the Free Software Foundation, either version 3 of the License, or
15	* (at your option) any later version.	14	* (at your option) any later version.
16	*	15	*
17	* Nagios-plugins is distributed in the hope that it will be useful,	16	* This program is distributed in the hope that it will be useful,
18	* but WITHOUT ANY WARRANTY; without even the implied warranty of	17	* but WITHOUT ANY WARRANTY; without even the implied warranty of
19	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	18	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20	* GNU General Public License for more details.	19	* GNU General Public License for more details.
21	*	20	*
22	* You should have received a copy of the GNU General Public License	21	* You should have received a copy of the GNU General Public License
23	* along with Nagios-plugins. If not, see <http://www.gnu.org/licenses/>.	22	* along with this program. If not, see <http://www.gnu.org/licenses/>.
24	*	23	*
25	* $Id$	24	* $Id$
26	*	25	*
27	****************************************************************************/	26	*****************************************************************************/
28		27
29	#include "common.h"	28	#include "common.h"
30	#include "parse_ini.h"	29	#include "parse_ini.h"


diff --git a/lib/utils_base.c b/lib/utils_base.c index fbed3607..c0bc4dc5 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c
@@ -1,16 +1,31 @@
1	/*****************************************************************************	1	/*****************************************************************************
2	*	2	*
3	* utils_base.c	3	* utils_base.c
4	*	4	*
5	* Library of useful functions for plugins	5	* License: GPL
6	* These functions are tested with libtap. See tests/ directory	6	* Copyright (c) 2006 Nagios Plugins Development Team
7	*	7	*
8	* Copyright (c) 2006 Nagios Plugin Development Team	8	* Last Modified: $Date$
9	* License: GPL	9	*
10	*	10	* Library of useful functions for plugins
11	* $Revision$	11	*
12	* $Date$	12	*
13	****************************************************************************/	13	* This program is free software: you can redistribute it and/or modify
		14	* it under the terms of the GNU General Public License as published by
		15	* the Free Software Foundation, either version 3 of the License, or
		16	* (at your option) any later version.
		17	*
		18	* This program is distributed in the hope that it will be useful,
		19	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		20	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		21	* GNU General Public License for more details.
		22	*
		23	* You should have received a copy of the GNU General Public License
		24	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		25	*
		26	* $Id$
		27	*
		28	*****************************************************************************/
14		29
15	#include <stdarg.h>	30	#include <stdarg.h>
16	#include "common.h"	31	#include "common.h"


diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c index c4ceb97e..aaf055a9 100644 --- a/lib/utils_cmd.c +++ b/lib/utils_cmd.c
@@ -1,42 +1,43 @@
1	/****************************************************************************	1	/*****************************************************************************
2	* Nagios run command utilities	2	*
3	*	3	* Nagios run command utilities
4	* License: GPL	4	*
5	* Copyright (c) 2005 nagios-plugins team	5	* License: GPL
6	*	6	* Copyright (c) 2005-2006 Nagios Plugins Development Team
7	* $Id: utils_cmd.c 1434 2006-06-18 19:36:48Z opensides $	7	*
8	*	8	* Last Modified: $Date$
9	* Description :	9	*
10	*	10	* Description :
11	* A simple interface to executing programs from other programs, using an	11	*
12	* optimized and safe popen()-like implementation. It is considered safe	12	* A simple interface to executing programs from other programs, using an
13	* in that no shell needs to be spawned and the environment passed to the	13	* optimized and safe popen()-like implementation. It is considered safe
14	* execve()'d program is essentially empty.	14	* in that no shell needs to be spawned and the environment passed to the
15	*	15	* execve()'d program is essentially empty.
16	*	16	*
17	* The code in this file is a derivative of popen.c which in turn was taken	17	* The code in this file is a derivative of popen.c which in turn was taken
18	* from "Advanced Programming for the Unix Environment" by W. Richard Stevens.	18	* from "Advanced Programming for the Unix Environment" by W. Richard Stevens.
19	*	19	*
20	* Care has been taken to make sure the functions are async-safe. The one	20	* Care has been taken to make sure the functions are async-safe. The one
21	* function which isn't is cmd_init() which it doesn't make sense to	21	* function which isn't is cmd_init() which it doesn't make sense to
22	* call twice anyway, so the api as a whole should be considered async-safe.	22	* call twice anyway, so the api as a whole should be considered async-safe.
23	*	23	*
24	* License Information:	24	*
25	*	25	* This program is free software: you can redistribute it and/or modify
26	* This program is free software; you can redistribute it and/or modify	26	* it under the terms of the GNU General Public License as published by
27	* it under the terms of the GNU General Public License as published by	27	* the Free Software Foundation, either version 3 of the License, or
28	* the Free Software Foundation; either version 2 of the License, or	28	* (at your option) any later version.
29	* (at your option) any later version.	29	*
30	*	30	* This program is distributed in the hope that it will be useful,
31	* This program is distributed in the hope that it will be useful,	31	* but WITHOUT ANY WARRANTY; without even the implied warranty of
32	* but WITHOUT ANY WARRANTY; without even the implied warranty of	32	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
33	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	33	* GNU General Public License for more details.
34	* GNU General Public License for more details.	34	*
35	*	35	* You should have received a copy of the GNU General Public License
36	* You should have received a copy of the GNU General Public License	36	* along with this program. If not, see <http://www.gnu.org/licenses/>.
37	* along with this program; if not, write to the Free Software	37	*
38	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	38	* $Id$
39	*/	39	*
		40	*****************************************************************************/
40		41
41	#define NAGIOSPLUG_API_C 1	42	#define NAGIOSPLUG_API_C 1
42		43


diff --git a/lib/utils_disk.c b/lib/utils_disk.c index 9324f5f3..c92b8506 100644 --- a/lib/utils_disk.c +++ b/lib/utils_disk.c
@@ -1,31 +1,30 @@
1	/****************************************************************************	1	/*****************************************************************************
2	* Utils for check_disk	2	*
3	*	3	* Library for check_disk
		4	*
4	* License: GPL	5	* License: GPL
5	* Copyright (c) 1999-2006 nagios-plugins team	6	* Copyright (c) 1999-2007 nagios-plugins team
6	*	7	*
7	* Last Modified: $Date$	8	* Last Modified: $Date$
8	*	9	*
9	* Description:	10	* Description:
10	*	11	*
11	* This file contains utilities for check_disk. These are tested by libtap	12	* This file contains utilities for check_disk. These are tested by libtap
12	*	13	*
13	* License Information:	14	*
14	*	15	* This program is free software: you can redistribute it and/or modify
15	* This program is free software; you can redistribute it and/or modify
16	* it under the terms of the GNU General Public License as published by	16	* it under the terms of the GNU General Public License as published by
17	* the Free Software Foundation; either version 2 of the License, or	17	* the Free Software Foundation, either version 3 of the License, or
18	* (at your option) any later version.	18	* (at your option) any later version.
19	*	19	*
20	* This program is distributed in the hope that it will be useful,	20	* This program is distributed in the hope that it will be useful,
21	* but WITHOUT ANY WARRANTY; without even the implied warranty of	21	* but WITHOUT ANY WARRANTY; without even the implied warranty of
22	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	22	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23	* GNU General Public License for more details.	23	* GNU General Public License for more details.
24	*	24	*
25	* You should have received a copy of the GNU General Public License	25	* You should have received a copy of the GNU General Public License
26	* along with this program; if not, write to the Free Software	26	* along with this program. If not, see <http://www.gnu.org/licenses/>.
27	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	27	*
28	*
29	* $Id$	28	* $Id$
30	*	29	*
31	*****************************************************************************/	30	*****************************************************************************/


diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c index 2fefaf3c..d3475d3d 100644 --- a/lib/utils_tcp.c +++ b/lib/utils_tcp.c
@@ -1,33 +1,32 @@
1	/****************************************************************************	1	/*****************************************************************************
2	* Utils for check_tcp	2	*
3	*	3	* Library for check_tcp
		4	*
4	* License: GPL	5	* License: GPL
5	* Copyright (c) 1999-2007 nagios-plugins team	6	* Copyright (c) 1999-2007 nagios-plugins team
6	*	7	*
7	* Last Modified: $Date$	8	* Last Modified: $Date$
8	*	9	*
9	* Description:	10	* Description:
10	*	11	*
11	* This file contains utilities for check_tcp. These are tested by libtap	12	* This file contains utilities for check_tcp. These are tested by libtap
12	*	13	*
13	* License Information:	14	*
14	*	15	* This program is free software: you can redistribute it and/or modify
15	* This program is free software; you can redistribute it and/or modify
16	* it under the terms of the GNU General Public License as published by	16	* it under the terms of the GNU General Public License as published by
17	* the Free Software Foundation; either version 2 of the License, or	17	* the Free Software Foundation, either version 3 of the License, or
18	* (at your option) any later version.	18	* (at your option) any later version.
19	*	19	*
20	* This program is distributed in the hope that it will be useful,	20	* This program is distributed in the hope that it will be useful,
21	* but WITHOUT ANY WARRANTY; without even the implied warranty of	21	* but WITHOUT ANY WARRANTY; without even the implied warranty of
22	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	22	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23	* GNU General Public License for more details.	23	* GNU General Public License for more details.
24	*	24	*
25	* You should have received a copy of the GNU General Public License	25	* You should have received a copy of the GNU General Public License
26	* along with this program; if not, write to the Free Software	26	* along with this program. If not, see <http://www.gnu.org/licenses/>.
27	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	27	*
28	*
29	* $Id$	28	* $Id$
30	*	29	*
31	*****************************************************************************/	30	*****************************************************************************/
32		31
33	#include "common.h"	32	#include "common.h"