cleanup whitespace and comments -- no functional changes

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

24 files changed, 49 insertions, 475 deletions

diff --git a/libsandbox/wrapper-funcs/__xmknod.c b/libsandbox/wrapper-funcs/__xmknod.c
index ec63c4c..98da369 100644
--- a/libsandbox/wrapper-funcs/__xmknod.c
+++ b/libsandbox/wrapper-funcs/__xmknod.c
@@ -3,29 +3,13 @@
  *
  * __xmknod() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(int, const char *, __mode_t, __dev_t *);
 static int (*WRAPPER_TRUE_NAME) (int, const char *, __mode_t, __dev_t *) = NULL;
 
@@ -41,4 +25,3 @@ int WRAPPER_NAME(int ver, const char *pathname, __mode_t mode, __dev_t *dev)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/access.c b/libsandbox/wrapper-funcs/access.c
index c4cd670..acc1e4b 100644
--- a/libsandbox/wrapper-funcs/access.c
+++ b/libsandbox/wrapper-funcs/access.c
@@ -3,29 +3,13 @@
  *
  * access() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, int);
 static int (*WRAPPER_TRUE_NAME) (const char *, int) = NULL;
 
@@ -41,4 +25,3 @@ int WRAPPER_NAME(const char *pathname, int mode)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/chmod.c b/libsandbox/wrapper-funcs/chmod.c
index f49bd57..49f7acc 100644
--- a/libsandbox/wrapper-funcs/chmod.c
+++ b/libsandbox/wrapper-funcs/chmod.c
@@ -3,29 +3,13 @@
  *
  * chmod() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, mode_t);
 static int (*WRAPPER_TRUE_NAME) (const char *, mode_t) = NULL;
 
@@ -41,4 +25,3 @@ int WRAPPER_NAME(const char *path, mode_t mode)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/chown.c b/libsandbox/wrapper-funcs/chown.c
index 6d07bce..1cd95cd 100644
--- a/libsandbox/wrapper-funcs/chown.c
+++ b/libsandbox/wrapper-funcs/chown.c
@@ -3,29 +3,13 @@
  *
  * chown() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, uid_t, gid_t);
 static int (*WRAPPER_TRUE_NAME) (const char *, uid_t, gid_t) = NULL;
 
@@ -41,4 +25,3 @@ int WRAPPER_NAME(const char *path, uid_t owner, gid_t group)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/creat.c b/libsandbox/wrapper-funcs/creat.c
index 19170e6..7d908e7 100644
--- a/libsandbox/wrapper-funcs/creat.c
+++ b/libsandbox/wrapper-funcs/creat.c
@@ -3,29 +3,13 @@
  *
  * creat() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, mode_t);
 /* XXX: We use the open() call to simulate create() */
 /* static int (*WRAPPER_TRUE_NAME) (const char *, mode_t) = NULL; */
@@ -42,4 +26,3 @@ int WRAPPER_NAME(const char *pathname, mode_t mode)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/creat64.c b/libsandbox/wrapper-funcs/creat64.c
index 728e782..cfd3798 100644
--- a/libsandbox/wrapper-funcs/creat64.c
+++ b/libsandbox/wrapper-funcs/creat64.c
@@ -3,29 +3,13 @@
  *
  * creat64() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, __mode_t);
 /* XXX: We use the open64() call to simulate create64() */
 /* static int (*WRAPPER_TRUE_NAME) (const char *, __mode_t) = NULL; */
@@ -42,4 +26,3 @@ int WRAPPER_NAME(const char *pathname, __mode_t mode)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/execve.c b/libsandbox/wrapper-funcs/execve.c
index 89f8b4a..757f179 100644
--- a/libsandbox/wrapper-funcs/execve.c
+++ b/libsandbox/wrapper-funcs/execve.c
@@ -3,29 +3,13 @@
  *
  * execve() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, char *const[], char *const[]);
 static int (*WRAPPER_TRUE_NAME) (const char *, char *const[], char *const[]) = NULL;
 
@@ -104,4 +88,3 @@ error:
 
 	return -1;
 }
-
diff --git a/libsandbox/wrapper-funcs/fopen.c b/libsandbox/wrapper-funcs/fopen.c
index ec8de36..4962eee 100644
--- a/libsandbox/wrapper-funcs/fopen.c
+++ b/libsandbox/wrapper-funcs/fopen.c
@@ -3,29 +3,13 @@
  *
  * fopen() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern FILE *WRAPPER_NAME(const char *, const char *);
 static FILE * (*WRAPPER_TRUE_NAME) (const char *, const char *) = NULL;
 
@@ -52,4 +36,3 @@ FILE *WRAPPER_NAME(const char *pathname, const char *mode)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/fopen64.c b/libsandbox/wrapper-funcs/fopen64.c
index fad5a9a..5134822 100644
--- a/libsandbox/wrapper-funcs/fopen64.c
+++ b/libsandbox/wrapper-funcs/fopen64.c
@@ -3,29 +3,13 @@
  *
  * fopen64() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern FILE *WRAPPER_NAME(const char *, const char *);
 static FILE * (*WRAPPER_TRUE_NAME) (const char *, const char *) = NULL;
 
@@ -52,4 +36,3 @@ FILE *WRAPPER_NAME(const char *pathname, const char *mode)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/getcwd.c b/libsandbox/wrapper-funcs/getcwd.c
index bb49953..5cfc50d 100644
--- a/libsandbox/wrapper-funcs/getcwd.c
+++ b/libsandbox/wrapper-funcs/getcwd.c
@@ -3,29 +3,13 @@
  *
  * getcwd() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern char *WRAPPER_NAME(char *, size_t);
 static char * (*WRAPPER_TRUE_NAME) (char *, size_t) = NULL;
 
@@ -45,4 +29,3 @@ char *WRAPPER_NAME(char *buf, size_t size)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/lchown.c b/libsandbox/wrapper-funcs/lchown.c
index 67e6a27..11de578 100644
--- a/libsandbox/wrapper-funcs/lchown.c
+++ b/libsandbox/wrapper-funcs/lchown.c
@@ -3,29 +3,13 @@
  *
  * lchown() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, uid_t, gid_t);
 static int (*WRAPPER_TRUE_NAME) (const char *, uid_t, gid_t) = NULL;
 
@@ -41,4 +25,3 @@ int WRAPPER_NAME(const char *path, uid_t owner, gid_t group)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/link.c b/libsandbox/wrapper-funcs/link.c
index 4386c7e..46cbbe0 100644
--- a/libsandbox/wrapper-funcs/link.c
+++ b/libsandbox/wrapper-funcs/link.c
@@ -3,29 +3,10 @@
  *
  * link() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
- *
- *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
- *  as some of the InstallWatch code was used.
- *
- * $Header$
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  */
 
-
 extern int EXTERN_NAME(const char *, const char *);
 static int (*WRAPPER_TRUE_NAME) (const char *, const char *) = NULL;
 
@@ -41,4 +22,3 @@ int WRAPPER_NAME(const char *oldpath, const char *newpath)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/mkdir.c b/libsandbox/wrapper-funcs/mkdir.c
index 8aded02..0c54de4 100644
--- a/libsandbox/wrapper-funcs/mkdir.c
+++ b/libsandbox/wrapper-funcs/mkdir.c
@@ -3,29 +3,10 @@
  *
  * mkdir() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
- *
- *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
- *  as some of the InstallWatch code was used.
- *
- * $Header$
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  */
 
-
 extern int EXTERN_NAME(const char *, mode_t);
 static int (*WRAPPER_TRUE_NAME) (const char *, mode_t) = NULL;
 
@@ -36,7 +17,7 @@ int WRAPPER_NAME(const char *pathname, mode_t mode)
 	char canonic[SB_PATH_MAX];
 
 	if (-1 == canonicalize(pathname, canonic))
-		/* Path is too long to canonicalize, do not fail, but just let 
+		/* Path is too long to canonicalize, do not fail, but just let
 		 * the real function handle it (see bug #94630 and #21766). */
 		if (ENAMETOOLONG != errno)
 			return -1;
@@ -58,4 +39,3 @@ int WRAPPER_NAME(const char *pathname, mode_t mode)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/mkfifo.c b/libsandbox/wrapper-funcs/mkfifo.c
index 2c17fd6..94c183c 100644
--- a/libsandbox/wrapper-funcs/mkfifo.c
+++ b/libsandbox/wrapper-funcs/mkfifo.c
@@ -3,29 +3,13 @@
  *
  * mkfifo() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, mode_t);
 static int (*WRAPPER_TRUE_NAME) (const char *, mode_t) = NULL;
 
@@ -41,4 +25,3 @@ int WRAPPER_NAME(const char *pathname, mode_t mode)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/mknod.c b/libsandbox/wrapper-funcs/mknod.c
index f488e47..1aef84c 100644
--- a/libsandbox/wrapper-funcs/mknod.c
+++ b/libsandbox/wrapper-funcs/mknod.c
@@ -3,29 +3,13 @@
  *
  * mknod() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, mode_t, dev_t);
 static int (*WRAPPER_TRUE_NAME) (const char *, mode_t, dev_t) = NULL;
 
@@ -41,4 +25,3 @@ int WRAPPER_NAME(const char *pathname, mode_t mode, dev_t dev)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/open.c b/libsandbox/wrapper-funcs/open.c
index 084a700..0b4f04d 100644
--- a/libsandbox/wrapper-funcs/open.c
+++ b/libsandbox/wrapper-funcs/open.c
@@ -3,29 +3,13 @@
  *
  * open() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, int, ...);
 static int (*WRAPPER_TRUE_NAME) (const char *, int, ...) = NULL;
 
@@ -62,4 +46,3 @@ int WRAPPER_NAME(const char *pathname, int flags, ...)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/open64.c b/libsandbox/wrapper-funcs/open64.c
index 144045f..ff76247 100644
--- a/libsandbox/wrapper-funcs/open64.c
+++ b/libsandbox/wrapper-funcs/open64.c
@@ -3,29 +3,13 @@
  *
  * open64() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, int, ...);
 static int (*WRAPPER_TRUE_NAME) (const char *, int, ...) = NULL;
 
@@ -62,4 +46,3 @@ int WRAPPER_NAME(const char *pathname, int flags, ...)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/opendir.c b/libsandbox/wrapper-funcs/opendir.c
index c757865..6aa6db0 100644
--- a/libsandbox/wrapper-funcs/opendir.c
+++ b/libsandbox/wrapper-funcs/opendir.c
@@ -3,29 +3,10 @@
  *
  * opendir() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
- *
- *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
- *  as some of the InstallWatch code was used.
- *
- * $Header$
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  */
 
-
 extern DIR *WRAPPER_NAME(const char *);
 static DIR * (*WRAPPER_TRUE_NAME) (const char *) = NULL;
 
@@ -41,4 +22,3 @@ DIR *WRAPPER_NAME(const char *name)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/rename.c b/libsandbox/wrapper-funcs/rename.c
index cf13738..d7e0fa1 100644
--- a/libsandbox/wrapper-funcs/rename.c
+++ b/libsandbox/wrapper-funcs/rename.c
@@ -3,29 +3,13 @@
  *
  * rename() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, const char *);
 static int (*WRAPPER_TRUE_NAME) (const char *, const char *) = NULL;
 
@@ -42,4 +26,3 @@ int WRAPPER_NAME(const char *oldpath, const char *newpath)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/rmdir.c b/libsandbox/wrapper-funcs/rmdir.c
index ae4aed7..cc736fd 100644
--- a/libsandbox/wrapper-funcs/rmdir.c
+++ b/libsandbox/wrapper-funcs/rmdir.c
@@ -3,29 +3,10 @@
  *
  * rmdir() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
- *
- *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
- *  as some of the InstallWatch code was used.
- *
- * $Header$
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  */
 
-
 extern int EXTERN_NAME(const char *);
 static int (*WRAPPER_TRUE_NAME) (const char *) = NULL;
 
@@ -41,4 +22,3 @@ int WRAPPER_NAME(const char *pathname)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/symlink.c b/libsandbox/wrapper-funcs/symlink.c
index 2eecc81..1c7372f 100644
--- a/libsandbox/wrapper-funcs/symlink.c
+++ b/libsandbox/wrapper-funcs/symlink.c
@@ -3,29 +3,10 @@
  *
  * symlink() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
- *
- *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
- *  as some of the InstallWatch code was used.
- *
- * $Header$
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  */
 
-
 extern int EXTERN_NAME(const char *, const char *);
 static int (*WRAPPER_TRUE_NAME) (const char *, const char *) = NULL;
 
@@ -41,4 +22,3 @@ int WRAPPER_NAME(const char *oldpath, const char *newpath)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/truncate.c b/libsandbox/wrapper-funcs/truncate.c
index ca15893..5d59bc0 100644
--- a/libsandbox/wrapper-funcs/truncate.c
+++ b/libsandbox/wrapper-funcs/truncate.c
@@ -3,29 +3,13 @@
  *
  * truncate() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, TRUNCATE_T);
 static int (*WRAPPER_TRUE_NAME) (const char *, TRUNCATE_T) = NULL;
 
@@ -41,4 +25,3 @@ int WRAPPER_NAME(const char *path, TRUNCATE_T length)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/truncate64.c b/libsandbox/wrapper-funcs/truncate64.c
index 058a1cb..a5669f6 100644
--- a/libsandbox/wrapper-funcs/truncate64.c
+++ b/libsandbox/wrapper-funcs/truncate64.c
@@ -3,29 +3,13 @@
  *
  * truncate64() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  *
  *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
  *  as some of the InstallWatch code was used.
- *
- * $Header$
  */
 
-
 extern int EXTERN_NAME(const char *, __off64_t);
 static int (*WRAPPER_TRUE_NAME) (const char *, __off64_t) = NULL;
 
@@ -41,4 +25,3 @@ int WRAPPER_NAME(const char *path, __off64_t length)
 
 	return result;
 }
-
diff --git a/libsandbox/wrapper-funcs/unlink.c b/libsandbox/wrapper-funcs/unlink.c
index 75e341f..a8570ce 100644
--- a/libsandbox/wrapper-funcs/unlink.c
+++ b/libsandbox/wrapper-funcs/unlink.c
@@ -3,29 +3,10 @@
  *
  * unlink() wrapper.
  *
- * Copyright 1999-2006 Gentoo Foundation
- *
- *
- *      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 version 2 of the License.
- *
- *      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.
- *
- *  Partly Copyright (C) 1998-9 Pancrazio `Ezio' de Mauro <p@demauro.net>,
- *  as some of the InstallWatch code was used.
- *
- * $Header$
+ * Copyright 1999-2008 Gentoo Foundation
+ * Licensed under the GPL-2
  */
 
-
 extern int EXTERN_NAME(const char *);
 static int (*WRAPPER_TRUE_NAME) (const char *) = NULL;
 
@@ -57,4 +38,3 @@ int WRAPPER_NAME(const char *pathname)
 
 	return result;
 }
-