debian/: Move ipif into -utils

[userv-utils.git] / www-cgi / ucgicommon.c

diff --git a/www-cgi/ucgicommon.c b/www-cgi/ucgicommon.c
index 2fa6260af02d4373a6d430df489e7b113eccdfd7..c3eb4b3e2bae64a33d2c32e23709aafe55f62811 100644 (file)
--- a/www-cgi/ucgicommon.c
+++ b/www-cgi/ucgicommon.c
@@ -1,9 +1,14 @@
 /*
- * Copyright (C) 1998-1999,2003 Ian Jackson
+ * Copyright 1996-2013,2016 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * Copyright 1998 David Damerell <damerell@chiark.greenend.org.uk>
+ * Copyright 1999,2003
+ *    Chancellor Masters and Scholars of the University of Cambridge
+ * Copyright 2010 Tony Finch <fanf@dotat.at>
+ * Copyright 2013,2016 Mark Wooding <mdw@distorted.org.uk>
  *
  * This 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
@@ -12,10 +17,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with userv-utils; if not, write to the Free Software
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
+ * along with userv-utils; if not, see http://www.gnu.org/licenses/.
  */
 
 #include <assert.h>
@@ -74,8 +76,7 @@ void xsetenv(const char *en, const char *ev, int overwrite) {
   if (setenv(en,ev,overwrite)) syserror("setenv");
 }
 
-const char **load_filters(unsigned flags, const char *first, ...)
-{
+const char **load_filters(unsigned flags, const char *first, ...) {
   va_list ap;
   const char *name, *p, *q, **v;
   char *pp;
@@ -130,8 +131,7 @@ opened:
 static int envvar_match(unsigned flags, const char *en,
                        const char *const *patv,
                        const char *const *defaults,
-                       const char **ev)
-{
+                       const char **ev) {
   const char *const *patp;
   const char *q, *pat;
   int acceptp;
@@ -193,8 +193,7 @@ void filter_environment(unsigned flags, const char *prefix_in,
                        void (*foundone)(const char *fulln,
                                         const char *en, const char *ev,
                                         void *p),
-                       void *p)
-{
+                       void *p) {
   char *const *ep;
   const char *en, *ev;
   char enbuf[MAX_ENVVAR_NAME];