Clean up file headers

- Separate copyright information from file summaries
- Say to visit http://gnu.org/licenses instead of writing a letter.

diff --git a/programs/imagex.c b/programs/imagex.c
index d6d57d19b56c06cc87c0de465bdb02d393a8e095..fb9201cb330889776eb1cc75030e5dd98dff1837 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -3,7 +3,9 @@
  *
  * Use wimlib to create, modify, extract, mount, unmount, or display information
  * about a WIM file
  *
  * Use wimlib to create, modify, extract, mount, unmount, or display information
  * about a WIM file

- *
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  *
  * This program is free software: you can redistribute it and/or modify
  * Copyright (C) 2012 Eric Biggers
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/programs/mkwinpeimg b/programs/mkwinpeimg
index 5b721c6ca5a9bce6dba95762c460c6f74b23495a..a21651af049a4091db93073406e75da34c93b413 100755 (executable)
--- a/programs/mkwinpeimg
+++ b/programs/mkwinpeimg
@@ -1,7 +1,8 @@
 #!/bin/bash
 #!/bin/bash

-
+#

 # This script can make a customized bootable image of Windows PE.
 #
 # This script can make a customized bootable image of Windows PE.
 #

+

 # Copyright (C) 2012 Eric Biggers
 #
 # This program is free software: you can redistribute it and/or modify
 # Copyright (C) 2012 Eric Biggers
 #
 # This program is free software: you can redistribute it and/or modify


@@ -9,6 +10,13 @@
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # 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/>.

 
 script_name="$(basename $0)"
 PREFIX_REG="::"
 
 script_name="$(basename $0)"
 PREFIX_REG="::"

diff --git a/src/comp.c b/src/comp.c
index c18dbd091f47c3baf2221ed9c72c412f4898abe4..2db66022d4a33432e58810754887cc5d2044e02c 100644 (file)
--- a/src/comp.c
+++ b/src/comp.c
@@ -1,24 +1,26 @@
 /*
  * comp.c
  *
 /*
  * comp.c
  *

- * Functions too long to declare as inline in comp.h.
- *
+ * Functions used for compression.
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "comp.h"
  */
 
 #include "comp.h"

diff --git a/src/comp.h b/src/comp.h
index 7b28e511d637ac8f15aa80c9cb434186e25453e5..c60fd886e3ea17d112c499cce015b13555971444 100644 (file)
--- a/src/comp.h
+++ b/src/comp.h
@@ -2,23 +2,6 @@
  * comp.h
  *
  * Functions useful for compression, mainly bitstreams.
  * comp.h
  *
  * Functions useful for compression, mainly bitstreams.

- *
- * Copyright (C) 2012 Eric Biggers
- *
- * wimlib - Library for working with WIM files 
- *
- * This library 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 library 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 

  */
 
 #ifndef _WIMLIB_COMP_H
  */
 
 #ifndef _WIMLIB_COMP_H

diff --git a/src/decomp.c b/src/decomp.c
index 20f11030ee1562ae9fdeb80014949ef7be2f2069..998ffd568e6f13ea9c7466930f4e8d4abd08b75b 100644 (file)
--- a/src/decomp.c
+++ b/src/decomp.c
@@ -1,24 +1,26 @@
 /*
  * decomp.c
  *
 /*
  * decomp.c
  *

- * Functions too long to declare as inline in decomp.h.
- *
+ * Functions used for decompression.
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "decomp.h"
  */
 
 #include "decomp.h"

diff --git a/src/decomp.h b/src/decomp.h
index 4cd04fd7b67e22c4c742768c944549b68bf725c5..7351e253f7106a03806d4317869cf00ca497ffc9 100644 (file)
--- a/src/decomp.h
+++ b/src/decomp.h
@@ -2,23 +2,6 @@
  * decomp.h
  *
  * Functions useful for decompression, mainly bitstreams.
  * decomp.h
  *
  * Functions useful for decompression, mainly bitstreams.

- *
- * Copyright (C) 2012 Eric Biggers
- *
- * wimlib - Library for working with WIM files 
- *
- * This library 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 library 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 

  */
 
 #ifndef _WIMLIB_DECOMP_H
  */
 
 #ifndef _WIMLIB_DECOMP_H

diff --git a/src/dentry.c b/src/dentry.c
index d2a45990aee830d810673b13a1ab518d7563f406..9cd9af02927a64901a2486cc080b7e54e0563a4f 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -7,24 +7,27 @@
  * resource with its own security data and dentry tree.  Dentries in different
  * images may share file resources by referring to the same lookup table
  * entries.
  * resource with its own security data and dentry tree.  Dentries in different
  * images may share file resources by referring to the same lookup table
  * entries.

+ */
+
+/*

  *
  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *
  *
  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/endianness.h b/src/endianness.h
index fc00e5416d9db5143cb908d8c3305723384dec87..55a832ded50c3767fc884ed3036b581dc952ca34 100644 (file)
--- a/src/endianness.h
+++ b/src/endianness.h
@@ -1,24 +1,3 @@
-/*
- * endianness.h
- *
- * Copyright (C) 2012 Eric Biggers
- *
- * wimlib - Library for working with WIM files 
- *
- * This library 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 library 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 
- */
-

 #ifndef _WIMLIB_ENDIANNESS_H
 #define _WIMLIB_ENDIANNESS_H
 
 #ifndef _WIMLIB_ENDIANNESS_H
 #define _WIMLIB_ENDIANNESS_H
 

diff --git a/src/extract.c b/src/extract.c
index 53dc9ec2d43569e1f0e6b80875a96aac21e91313..8873683f48302efbbeebb5bd7ef92ae0e4ae5595 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -2,24 +2,26 @@
  * extract.c
  *
  * Support for extracting WIM files.
  * extract.c
  *
  * Support for extracting WIM files.

- *
+ */
+
+/*

  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/header.c b/src/header.c
index 6f9668a5d6c9f15d738f2d59dd831bc6659472b6..b39f9fcc5d2ec47e823a348d583736394a174d40 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -2,24 +2,26 @@
  * header.c
  *
  * Read, write, or create a WIM header.
  * header.c
  *
  * Read, write, or create a WIM header.

- *
+ */
+
+/*

  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/integrity.c b/src/integrity.c
index ce05906a133f2637dccd40676a5ed67aad4c5e5b..ade79f4808e77105b4cb24f844d0752c90b6c2ff 100644 (file)
--- a/src/integrity.c
+++ b/src/integrity.c
@@ -4,23 +4,25 @@
  * WIM files can optionally contain an array of SHA1 message digests at the end,
  * one digest for each 1 MB of the file.  This file implements the checking of
  * the digests, and the writing of the digests for new WIM files.
  * WIM files can optionally contain an array of SHA1 message digests at the end,
  * one digest for each 1 MB of the file.  This file implements the checking of
  * the digests, and the writing of the digests for new WIM files.

- *
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/io.h b/src/io.h
index 81144f7b333b597d4d02e3ed4bf1cf45cac5ae3e..ac5ea506a1f43d7232bd64d52d4780a8f7ed51fd 100644 (file)
--- a/src/io.h
+++ b/src/io.h
@@ -3,23 +3,6 @@
  *
  * A few endianness-aware macros for reading and writing data from in-memory
  * buffers.
  *
  * A few endianness-aware macros for reading and writing data from in-memory
  * buffers.

- *
- * Copyright (C) 2012 Eric Biggers
- *
- * wimlib - Library for working with WIM files 
- *
- * This library 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 library 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 

  */
 
 #ifndef _WIMLIB_IO_H
  */
 
 #ifndef _WIMLIB_IO_H

diff --git a/src/join.c b/src/join.c
index 94ce400b78bb4a41bb1705752b06172e36c0205b..3b96695fa8626c0390a99679ec691dcf8c7ddf46 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -2,23 +2,25 @@
  * join.c
  *
  * Join split WIMs (sometimes named as .swm files) together into one WIM.
  * join.c
  *
  * Join split WIMs (sometimes named as .swm files) together into one WIM.

- *
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/lookup_table.c b/src/lookup_table.c
index 46ab456198dba57caf6a88b77e73caa1953343bd..828c183048a7d55aec46f5a9844a37cbac3784eb 100644 (file)
--- a/src/lookup_table.c
+++ b/src/lookup_table.c
@@ -3,23 +3,25 @@
  *
  * Lookup table, implemented as a hash table, that maps dentries to file
  * resources.
  *
  * Lookup table, implemented as a hash table, that maps dentries to file
  * resources.

- *
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/lz.c b/src/lz.c
index ee3a8c7dc47ea3191b8ba6c5d8058415b9555d98..94cfc69655f21dcd86bdfb983bcda22efdf7c1dc 100644 (file)
--- a/src/lz.c
+++ b/src/lz.c
@@ -4,24 +4,26 @@
  * This file provides the code to analyze a buffer of uncompressed data for
  * matches, as per the LZ77 algorithm.  It uses a hash table to accelerate the
  * process.  This is based on code from zlib (v. 1.2.5).
  * This file provides the code to analyze a buffer of uncompressed data for
  * matches, as per the LZ77 algorithm.  It uses a hash table to accelerate the
  * process.  This is based on code from zlib (v. 1.2.5).

- *
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
  *
  * Copyright (C) 2012 Eric Biggers
  * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "comp.h"
  */
 
 #include "comp.h"

diff --git a/src/lzx-comp.c b/src/lzx-comp.c
index caedc9a1e5d80d59d2b972b44d7614761985a1cb..9115ddf90b44a501437c86a1c4a43c63cc428094 100644 (file)
--- a/src/lzx-comp.c
+++ b/src/lzx-comp.c
@@ -5,24 +5,26 @@
  *
  * This code was originally based on code written by Matthew T. Russotto
  *     (liblzxcomp).
  *
  * This code was originally based on code written by Matthew T. Russotto
  *     (liblzxcomp).

- *
+ */
+
+/*

  * Copyright (C) 2002 Matthew T. Russotto
  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2002 Matthew T. Russotto
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 
  */
 
 

diff --git a/src/lzx-decomp.c b/src/lzx-decomp.c
index 55f0f61234a298122e9941753757cbaf0b7d5242..267320ab507f427aa0d9f5b8508d835cb7551cd4 100644 (file)
--- a/src/lzx-decomp.c
+++ b/src/lzx-decomp.c
@@ -4,29 +4,31 @@
  * Routines for LZX decompression.  The LZX format has many similarities to the
  * DEFLATE format used in zlib and gzip, but it's not quite the same.
  *
  * Routines for LZX decompression.  The LZX format has many similarities to the
  * DEFLATE format used in zlib and gzip, but it's not quite the same.
  *

- *  source:     modified lzx.c from cabextract v0.5                        
- *  notes:      This file has been modified from code taken from cabextract
- *                     v0.5, which was, itself, a modified version of the 
- *                     lzx decompression code from unlzx.                                               
+ */
+
+/*
+ * Copyright (C) 2012 Eric Biggers

  *
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 /* 
  */
 
 /* 

- * This file has been customized for WIMLIB.
+ * This file has been modified from code taken from cabextract v0.5, which was,
+ * itself, a modified version of the lzx decompression code from unlzx.  The
+ * code has been customized for wimlib.

  *
  * Some notes on the LZX compression format as used in Windows Imaging (WIM)
  * files:
  *
  * Some notes on the LZX compression format as used in Windows Imaging (WIM)
  * files:

diff --git a/src/lzx.h b/src/lzx.h
index 2e89ec986660a3cfa31ed16317d87068ce155eb2..b44fecffb74c0c1710923bb45b75e5699a257703 100644 (file)
--- a/src/lzx.h
+++ b/src/lzx.h
@@ -1,24 +1,3 @@
-/*
- * lzx.h
- *
- * Copyright (C) 2012 Eric Biggers
- *
- * wimlib - Library for working with WIM files 
- *
- * This library 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 library 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 
- */
-

 #ifndef _WIMLIB_LZX_H
 #define _WIMLIB_LZX_H
 
 #ifndef _WIMLIB_LZX_H
 #define _WIMLIB_LZX_H
 

diff --git a/src/modify.c b/src/modify.c
index dbf2a503c2726047b553bd8118e14734028b6641..2ad0357602134deea224fc7579aebaf7421d1fdc 100644 (file)
--- a/src/modify.c
+++ b/src/modify.c
@@ -5,23 +5,25 @@
  * add an image, export an imagex from one WIM to another.)  There is nothing
  * here that lets you change individual files in the WIM; for that you will need
  * to look at the filesystem implementation in mount.c.
  * add an image, export an imagex from one WIM to another.)  There is nothing
  * here that lets you change individual files in the WIM; for that you will need
  * to look at the filesystem implementation in mount.c.

- *
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/mount.c b/src/mount.c
index c313de83374428d28cda27fa04a3ba22fc7b8661..10e5d7de1b2c8deb420343b4342fa1224cc9341f 100644 (file)
--- a/src/mount.c
+++ b/src/mount.c
@@ -5,23 +5,25 @@
  * Filesystem in Userspace.  FUSE allows a filesystem to be implemented in a
  * userspace process by implementing the filesystem primitives--- read(),
  * write(), readdir(), etc.
  * Filesystem in Userspace.  FUSE allows a filesystem to be implemented in a
  * userspace process by implementing the filesystem primitives--- read(),
  * write(), readdir(), etc.

- *
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/resource.c b/src/resource.c
index bd28ffc9d8d396451955ad87657a174b21f6881e..2f984d13be8ca2487f9e5c5fd031bac88ba88faa 100644 (file)
--- a/src/resource.c
+++ b/src/resource.c
@@ -2,24 +2,26 @@
  * resource.c
  *
  * Read uncompressed and compressed metadata and file resources.
  * resource.c
  *
  * Read uncompressed and compressed metadata and file resources.

- *
+ */
+
+/*

  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/security.c b/src/security.c
index 3a17ab3386b03d44d4fe5b153362f54bcf59ae55..089067dc433f5152cd6cd4fd15261744d56eb48d 100644 (file)
--- a/src/security.c
+++ b/src/security.c
@@ -3,23 +3,25 @@
  *
  * Read the security data from the WIM.  Doing anything with the security data
  * is not yet implemented other than printing some information about it.
  *
  * Read the security data from the WIM.  Doing anything with the security data
  * is not yet implemented other than printing some information about it.

- *
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/sha1.c b/src/sha1.c
index cc92ae1ce582995ed3214726e35dee4d0b1c7d42..b65d25d6c57c1a31f8912664c9b64de1fbb3a020 100644 (file)
--- a/src/sha1.c
+++ b/src/sha1.c
@@ -1,24 +1,26 @@
 /*
  * sha1.c
  *
 /*
  * sha1.c
  *

- * Copyright (C) 2012 Eric Biggers
- *

  * Parts of this file are based on public domain code written by Steve Reid.
  * Parts of this file are based on public domain code written by Steve Reid.

+ */
+
+/* 
+ * Copyright (C) 2012 Eric Biggers

  *
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "util.h"
  */
 
 #include "util.h"

diff --git a/src/split.c b/src/split.c
index f22780bbae654b73eb7d6a3c6c5299c3c183eb14..0321492e7d7cfddc49aec925ba695859039dfaa3 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -2,23 +2,25 @@
  * split.c
  *
  * Split a WIM file into parts.
  * split.c
  *
  * Split a WIM file into parts.

- *
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/util.c b/src/util.c
index 3f8a0b4873c5017c2b004c8e85edc97d14359b0c..690fd4d2496095879463dbb8cbad81b239437f3a 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1,23 +1,25 @@
 /*
  * util.c
 /*
  * util.c

- *
+ */
+
+/*

  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/util.h b/src/util.h
index 40ef9a0a3b0f2b5322ba48604cfbc61a331d2ccd..09a64db328fa14856ed834b9fe8107a0deba3b2c 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -1,26 +1,3 @@
-/*
- * util.h
- *
- * Header for util.c.
- *
- * Copyright (C) 2012 Eric Biggers
- *
- * wimlib - Library for working with WIM files 
- *
- * This library 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 library 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 
- */
-

 #ifndef _WIMLIB_UTIL_H
 #define _WIMLIB_UTIL_H
 
 #ifndef _WIMLIB_UTIL_H
 #define _WIMLIB_UTIL_H
 

diff --git a/src/wim.c b/src/wim.c
index f9a6851c0c4a4a18dbb3c2d2ab6e9ab7e2df9c9a..2f008f8f44cd6f849c03d642debdd5cabd5e996f 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -1,24 +1,27 @@
 /*
  * wim.c
 /*
  * wim.c

- *
- *
+ */
+
+/*

  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *
  * wimlib - Library for working with WIM files 
  *
  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *
  * wimlib - Library for working with WIM files 
  *

- * This library 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 file is part of wimlib, a library for working with WIM files.
+ *
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/wimlib.h b/src/wimlib.h
index fa27fc1c27d0f55f667c70c7761584a78ae07b36..4ac00328bc1d5f16e5423dd741fa031171f3710c 100644 (file)
--- a/src/wimlib.h
+++ b/src/wimlib.h
@@ -2,23 +2,25 @@
  * wimlib.h
  *
  * External header for wimlib.
  * wimlib.h
  *
  * External header for wimlib.

- *
+ */
+
+/* 

  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 /** \mainpage
  */
 
 /** \mainpage

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 86b22f769993b2e1bc823cb7ec6dc998e62a1ec4..157a11748d14e6ab47b385e124375f5a67bd770b 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -2,24 +2,26 @@
  * wimlib_internal.h
  *
  * Internal header for wimlib.
  * wimlib_internal.h
  *
  * Internal header for wimlib.

- *
- * wimlib - Library for working with WIM files 
- *
+ */
+
+/*

  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *

- * This library 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 file is part of wimlib, a library for working with WIM files.
+ *
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #ifndef _WIMLIB_INTERNAL_H
  */
 
 #ifndef _WIMLIB_INTERNAL_H

diff --git a/src/write.c b/src/write.c
index 470ab146ebfb42d0399ee17d71c485c54c062a12..3bd2f7804137d8b63a0c33062aeb893967de90ac 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -3,25 +3,28 @@
  *
  * Support for writing WIM files; write a WIM file, overwrite a WIM file, write
  * compressed file resources, etc.
  *
  * Support for writing WIM files; write a WIM file, overwrite a WIM file, write
  * compressed file resources, etc.

- *
+ */
+
+/*

  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
  */

+

 #include "wimlib_internal.h"
 #include "io.h"
 #include "dentry.h"
 #include "wimlib_internal.h"
 #include "io.h"
 #include "dentry.h"

diff --git a/src/xml.c b/src/xml.c
index a214f35f0f92647194be7df1715ea85ac74d8a80..3969202981419befeb8866e294700db5d98e8b80 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -2,23 +2,25 @@
  * xml.c
  *
  * Deals with the XML information in WIM files.  Uses the C library libxml2.
  * xml.c
  *
  * Deals with the XML information in WIM files.  Uses the C library libxml2.

- *
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 #include "wimlib_internal.h"
  */
 
 #include "wimlib_internal.h"

diff --git a/src/xpress-comp.c b/src/xpress-comp.c
index 9252eee1af21e9e0e9e8826645859d0a278d5643..b5cf85eaf92a78df2acd5e839abd4b8a1efdd7ee 100644 (file)
--- a/src/xpress-comp.c
+++ b/src/xpress-comp.c
@@ -3,27 +3,28 @@
  *
  * XPRESS compression routines.
  *
  *
  * XPRESS compression routines.
  *

+ * See the comments in xpress-decomp.c about the XPRESS format.
+ */
+
+/*

  * Copyright (C) 2012 Eric Biggers
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
  */
 

-/* See the comments in xpress-decomp.c about the XPRESS format. */
-
-

 #include "xpress.h"
 #include "comp.h"
 #include <stdlib.h>
 #include "xpress.h"
 #include "comp.h"
 #include <stdlib.h>

diff --git a/src/xpress-decomp.c b/src/xpress-decomp.c
index e67637d65b9a8894eb0cbee49d83cfe64ed84a6b..f885c1d39787dfae1f277aa5da78cdb2c759ecf0 100644 (file)
--- a/src/xpress-decomp.c
+++ b/src/xpress-decomp.c
@@ -2,23 +2,26 @@
  * xpress-decomp.c
  *
  * XPRESS decompression routines.
  * xpress-decomp.c
  *
  * XPRESS decompression routines.

+ */
+
+/*

  *
  * Copyright (C) 2012 Eric Biggers
  *
  *
  * Copyright (C) 2012 Eric Biggers
  *

- * wimlib - Library for working with WIM files 
+ * This file is part of wimlib, a library for working with WIM files.

  *
  *

- * This library 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.
+ * wimlib 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 library 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.
+ * wimlib 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 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.

  */
 
 
  */
 
 

diff --git a/src/xpress.h b/src/xpress.h
index 89e2345ea366f3b684d1ec671bfece6003823177..a4dd756072440f0f2f7fc534820e3ae3df9863d0 100644 (file)
--- a/src/xpress.h
+++ b/src/xpress.h
@@ -1,22 +1,3 @@
-/*
- * xpress.h
- *
- * wimlib - Library for working with WIM files 
- *
- * This library 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 library 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 
- */
-

 #ifndef _WIMLIB_XPRESS_H
 #define _WIMLIB_XPRESS_H
 
 #ifndef _WIMLIB_XPRESS_H
 #define _WIMLIB_XPRESS_H