Merge branch 'misc'

7 files changed, 64 insertions, 75 deletions

diff --git a/include/misc.h b/include/misc.h
index b66f6e2..58c2640 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -1,25 +1,19 @@
 /*
-  Copyright (C) 2009  Andreas Gruenbacher, <agruen@suse.de>
+  Copyright (C) 2009  Andreas Gruenbacher <agruen@suse.de>
 
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 2.1 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
-  Lesser General Public License for more details.
+  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 Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-extern int high_water_alloc(void **buf, size_t *bufsize, size_t newsize);
-
-extern const char *quote(const char *str);
-extern char *unquote(char *str);
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 extern int high_water_alloc(void **buf, size_t *bufsize, size_t newsize);
 
diff --git a/include/walk_tree.h b/include/walk_tree.h
index 2c0102f..53a8fc5 100644
--- a/include/walk_tree.h
+++ b/include/walk_tree.h
@@ -3,19 +3,18 @@
 
   Copyright (C) 2007 Andreas Gruenbacher <a.gruenbacher@computer.org>
 
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+  This program is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2.1 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
-  Lesser General Public License for more details.
+  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 Lesser General Public
+  License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __WALK_TREE_H
diff --git a/libmisc/Makefile b/libmisc/Makefile
index 323f047..e64a287 100644
--- a/libmisc/Makefile
+++ b/libmisc/Makefile
@@ -1,19 +1,19 @@
 #
 # Copyright (c) 2000, 2002 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (C) 2009  Andreas Gruenbacher <agruen@suse.de>
 #
-# 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
+# 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
+# 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/>.
 #
 
 TOPDIR = ..
diff --git a/libmisc/high_water_alloc.c b/libmisc/high_water_alloc.c
index 4228021..c127dc1 100644
--- a/libmisc/high_water_alloc.c
+++ b/libmisc/high_water_alloc.c
@@ -3,19 +3,18 @@
 
   Copyright (C) 2001-2002 Silicon Graphics, Inc.  All Rights Reserved.
 
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+  This program is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2.1 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
-  Lesser General Public License for more details.
+  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 Lesser General Public
+  License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <stdio.h>
@@ -37,7 +36,7 @@ int high_water_alloc(void **buf, size_t *bufsize, size_t newsize)
 		newbuf = realloc(*buf, newsize);
 		if (!newbuf)
 			return 1;
-		
+
 		*buf = newbuf;
 		*bufsize = newsize;
 	}
diff --git a/libmisc/quote.c b/libmisc/quote.c
index 8ef8c4e..4fb7035 100644
--- a/libmisc/quote.c
+++ b/libmisc/quote.c
@@ -1,21 +1,20 @@
 /*
   File: quote.c
 
-  Copyright (C) 2003 Andreas Gruenbacher <a.gruenbacher@computer.org>
+  Copyright (C) 2003 Andreas Gruenbacher <a.gruenbacher@bestbits.at>
 
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+  This program is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2.1 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
-  Lesser General Public License for more details.
+  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 Lesser General Public
+  License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <stdio.h>
diff --git a/libmisc/unquote.c b/libmisc/unquote.c
index aceb774..bffebf9 100644
--- a/libmisc/unquote.c
+++ b/libmisc/unquote.c
@@ -3,19 +3,18 @@
 
   Copyright (C) 2003 Andreas Gruenbacher <a.gruenbacher@bestbits.at>
 
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+  This program is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2.1 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
-  Lesser General Public License for more details.
+  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 Lesser General Public
+  License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <stdio.h>
diff --git a/libmisc/walk_tree.c b/libmisc/walk_tree.c
index 1dc5d80..2777145 100644
--- a/libmisc/walk_tree.c
+++ b/libmisc/walk_tree.c
@@ -3,19 +3,18 @@
 
   Copyright (C) 2007 Andreas Gruenbacher <a.gruenbacher@computer.org>
 
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
+  This program is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2.1 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
-  Lesser General Public License for more details.
+  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 Lesser General Public
+  License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <sys/types.h>
@@ -58,7 +57,7 @@ static int walk_tree_visited(dev_t dev, ino_t ino)
 
 static int walk_tree_rec(const char *path, int walk_flags,
 			 int (*func)(const char *, const struct stat *, int,
-			 	     void *), void *arg, int depth)
+				     void *), void *arg, int depth)
 {
 	int follow_symlinks = (walk_flags & WALK_TREE_LOGICAL) ||
 			      (!(walk_flags & WALK_TREE_PHYSICAL) &&