From: Eric Biggers Date: Thu, 30 Aug 2012 00:34:12 +0000 (-0500) Subject: License and documentation X-Git-Tag: v1.0.0~42 X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=60b8f54df8fed44136bdc8ec615ee62703d87b69 License and documentation Change license LGPLv2.1 to GPLv3+ and begin updating documentation --- diff --git a/COPYING.LIB b/COPYING.LIB deleted file mode 100644 index 65c5ca88..00000000 --- a/COPYING.LIB +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/README b/README index f723f93f..6542e251 100644 --- a/README +++ b/README @@ -1,24 +1,46 @@ WIMLIB -This is wimlib version 0.7.2 (May 2012). wimlib can be used to read, write, -and mount files in the Windows Imaging Format (WIM files). These files are -normally created by using the `imagex.exe' utility on Windows, but this library -provides a free implementetion of imagex for UNIX-based systems. +This is wimlib version 1.0.0 (September 2012). wimlib can be used to read, +write, and mount files in the Windows Imaging Format (WIM files). These +files are normally created by using the `imagex.exe' utility on Windows, +but this library provides a free implementetion of imagex for UNIX-based +systems. -The main use of this library is to create customized images of Windows PE, the + WINDOWS PE + +A major use for this library is to create customized images of Windows PE, the Windows Preinstallation Environment, without having to rely on Windows. Windows PE is a lightweight version of Windows that can run entirely from memory and can be used to install Windows from local media or a network drive or perform maintenance. Windows PE is the operating system that runs when you boot from -the Windows DVD. +the Windows installation media. + +You can find Windows PE on the installation DVD for Windows Vista, Windows 7, or +Windows 8, in the file `sources/boot.wim'. Windows PE can also be found in the +Windows Automated Installation Kit (WAIK), which is free to download from +Microsoft, inside the `WinPE.cab' file, which you can extract if you install +either the `cabextract' or `p7zip' programs. + +In addition, Windows installations and recovery partitions frequently contain a +WIM containing an image of the Windows Recovery Environment, which is similar to +Windows PE. + + NTFS SUPPORT + +As of version 1.0.0, wimlib supports capturing and applying images directly to +NTFS volumes. This was made possible with the help of libntfs-3g from the +NTFS-3g project. This feature supports capturing and restoring NTFS-specific +data such as security descriptors, alternate data streams, and reparse point +data. + +The code for NTFS image capture and image application is complete enough that it +is possible to apply an image from the "install.wim" contained in recent Windows +installation media (Vista, Windows 7, or Windows 8) directly to a NTFS volume, +and then boot Windows from it after preparing the Boot Configuration Data. In +addition, a Windows installation can be captured (or backed up) into a WIM file, +and then re-applied later. -You can find Windows PE on the ISO filesystem on the installation DVD for both -Windows 7 and Windows 8. I don't have a DVD for Vista but it should be on there -too. The Windows PE image is a WIM file, `sources/boot.wim', on the ISO -filesystem. Windows PE can also be found in the Windows Automated Installation -Kit (WAIK), which is free to download from Microsoft, inside the `WinPE.cab' -file, which you can extract if you install either the `cabextract' or `p7zip' -programs. + PROGRAMS wimlib provides a public API for other programs to use, but also comes with two programs: `imagex' and `mkwinpeimg'. @@ -32,20 +54,53 @@ details. image of Windows PE that can be put on a CD or USB drive, or published on a server for PXE booting. See the main page `doc/mkwinpeiso.1' for more details. -wimlib can also be used to handle larger WIM files such as the `install.wim' -file that comes on the Windows DVD. You may not, however, losslessly capture -and apply Windows installations using wimlib because of issues with NTFS and -Windows-specific information. + DEPENDENCIES + +* libxml2 + This is a commonly used free library to read and write XML files. You + likely already have it installed as a dependency for some other program. + For more information see http://xmlsoft.org/. + +* libfuse + Unless configured with --without-fuse, wimlib requires a non-ancient + version of libfuse to be installed. see above). Most GNU/Linux + distributions already include this, but make sure you have the libfuse + package installed (libfuse-dev if your distribution distributes header + files separately). FUSE also requires a kernel module. + If the kernel module is available it will automatically be loaded if you + try to mount a WIM file. For more information see + http://fuse.sourceforge.net/. FUSE is also available for FreeBSD. + +* libntfs-3g + Unless configured with --without-ntfs-3g, wimlib requires the library + and headers for libntfs-3g to be installed. Currently, the version + dated 2012-1-15 is required because I've cloned some of the code from + the library. + +* cdrkit (optional) +* mtools (optional) +* syslinux (optional) +* cabextract (optional) + The `mkwinpeimg' shell script will look for several other programs + depending on what options are given to it. Depending on your GNU/Linux + distribution, you may already have these programs installed, or they may + be in the software repository. Making an ISO filesystem requires + `mkisofs' from `cdrkit' (http://www.cdrkit.org). Making a disk image + requires `mtools' (http://www.gnu.org/software/mtools) and `syslinux' + (http://www.syslinux.org). Retrieving files from the Windows Automated + Installation Kit requires `cabextract' (http://www.cabextract.org.uk). -An earlier version of Wimlib is being used to deploy Windows 7 from the Ultimate -Deployment Appliance. For more information see -http://www.ultimatedeployment.org/. CONFIGURATION Besides the various well-known options, the following options can be passed to wimlib's `configure' script: +--without-ntfs-3g + If libntfs-3g is not available or is not the correct version, we can + build without it. wimlib will then not be able to apply or capture + images directly to NTFS volumes. + --without-fuse If libfuse or the FUSE kernel module is not available, wimlib can be compiled with --without-fuse. This will remove the ability to mount and @@ -57,6 +112,12 @@ wimlib's `configure' script: from libcrypto (part of OpenSSL). The default is to use libcrypto if it is found on the system. +--enable-xattr, --disable-xattr + Enable or disable support for the extended-attributes interface to NTFS + alternate data streams in mounted WIMs. To support these, we require + the setxattr() function and the attr/xattr.h header be available. The + default is to autodetect whether support is possible. + --enable-ssse3-sha1 Use a very fast assembly language implementation of SHA1 from Intel. Only use this if the build target supports the SSSE3 instructions. @@ -72,12 +133,6 @@ wimlib's `configure' script: with an error message if the decompressed data does not exactly match the original data. This is to find bugs. ---disable-security-data - Wimlib cannot create or modify WIM security data, but by default it will - copy existing security data when modifying a WIM or exporting an image. - Passing this flag will disable this support; then wimlib will always - write WIMs without security data. - --disable-error-messages Removes all error messages from the library. If left in, they still have to explicitly turned on with wimlib_set_print_errors() in order to @@ -101,36 +156,14 @@ wimlib's `configure' script: Include more debugging messages. Only use this option if you have found a bug in the library. - DEPENDENCIES - -Wimlib requires libxml2 to build. This is a commonly used free library to read -and write XML files. You likely already have it installed as a dependency for -some other program. For more information see http://xmlsoft.org/. - -Wimlib also requires libfuse to build (unless configured with --without-fuse; -see above). Most GNU/Linux distributions already include this, but make sure -you have the libfuse package installed (libfuse-dev if your distribution -distributes header files separately). FUSE also requires a kernel module. If -the kernel module is available it will automatically be loaded if you try to -mount a WIM file. For more information see http://fuse.sourceforge.net/. FUSE -is also available for FreeBSD. - -The `mkwinpeimg' shell script will look for several other programs depending on -what options are given to it. Depending on your GNU/Linux distribution, you may -already have these programs installed, or they may be in the software -repository. Making an ISO filesystem requires `mkisofs' from `cdrkit' -(http://www.cdrkit.org). Making a disk image requires `mtools' -(http://www.gnu.org/software/mtools) and `syslinux' (http://www.syslinux.org). -Retrieving files from the Windows Automated Installation Kit requires -`cabextract' (http://www.cabextract.org.uk). - PORTABILITY wimlib has mostly been developed and tested on x86_64 (64-bit) GNU/Linux. It has been tested on x86 (32-bit) GNU/Linux occasionally. -It can also be compiled and run on FreeBSD. +I have tested a previous version of wimlib on FreeBSD and it worked, but this is +not well tested, especially with the more recent versions of this software. wimlib should work on big endian machines but it has not been tested. @@ -142,9 +175,18 @@ Windows is very different and Microsoft's imagex.exe is already available. The WIM file format is specified in a document that can be found in the Microsoft Download Center. There is a similar document that specifies the LZX compression format, and a document that specifies the XPRESS compression format. -However, some aspects of these formats are poorly documented. Some particularly -poorly documented parts of the formats have had comments added in various places -in the library. +However, many parts of these formats are poorly documented, and some parts have +no documentation whatsoever. Some particularly poorly documented parts of the +formats have had comments added in various places in the library. Please see +the code and/or ask me if you have any questions about the WIM file format as it +exists in reality and not as it exists in Microsoft's poorly written +documentation. + +The code in ntfs-apply.c and ntfs-capture.c uses the NTFS-3g library, which is a +library for reading and writing to NTFS filesystems (the filesystem used by +recent versions of Windows). Additionally, the code in ntfs-3g-security.c is +mostly copied from NTFS-3g, but I'm hoping to get rid of this file eventually. +See http://www.tuxera.com/community/ntfs-3g-download/ for more information. lzx-decomp.c, the code to decompress WIM file resources that are compressed using LZX compression, is originally based on code from the cabextract project @@ -163,26 +205,36 @@ files and provides features previously only available in Microsoft's imagex.exe, such as the ability to mount WIMs read-write as well as read-only, and the ability to create LZX or XPRESS compressed WIMs. +An earlier version of wimlib is being used to deploy Windows 7 from the Ultimate +Deployment Appliance. For more information see +http://www.ultimatedeployment.org/. + +You can see the documentation about Microsoft's version of the imagex program at +http://technet.microsoft.com/en-us/library/cc749447(v=ws.10).aspx, so you can +see how it compares. + MORE INFORMATION See the manual pages for `imagex', the manual pages for the subcommands of `imagex', and the manual page for `mkwinpeimg'. -As of version 0.5.0, Wimlib's public API is documented. Doxygen is required to +As of version 0.5.0, wimlib's public API is documented. Doxygen is required to build the documentation. To build the documentation, run `configure', then enter the directory `doc' and run `doxygen'. The HTML documentation will be created in a directory named `html'. LICENSE -Wimlib is released under the GNU LGPL version 2.1 or later. The files in the -`programs' directory are released under the GPL version 3. +As of version 1.0.0, wimlib is released under the GNU GPL version 3.0 or later. +This includes the files in the `programs' directory. DISCLAIMER -Wimlib is experimental. Use Microsoft's `imagex.exe' if you want to make sure -your WIM files are made correctly. Please submit a bug report (to -ebiggers3@gmail.com) if you find a bug. +wimlib is experimental. Use Microsoft's `imagex.exe' if you want to make sure +your WIM files are made correctly (but beware: Microsoft's version contains some +bugs). + +Please submit a bug report (to ebiggers3@gmail.com) if you find a bug in wimlib. Some parts of the WIM file format are poorly documented or even completely undocumented, so I've just had to do the best I can to read and write WIMs that diff --git a/configure.ac b/configure.ac index 786c4d10..c2156614 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([wimlib], [0.7.2], [ebiggers3@gmail.com]) +AC_INIT([wimlib], [1.0.0], [ebiggers3@gmail.com]) AC_CONFIG_SRCDIR([src/wim.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/debian/copyright b/debian/copyright index acd7742f..999c2267 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,26 +4,26 @@ Source: http://sourceforge.net/projects/wimlib Files: * Copyright: 2012 Eric Biggers -License: GPLv2.1 +License: GPLv3+ 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. + the terms of the GNU General Public License as published by the Free Software + Foundation; either version 3 of the License, or (at your option) any later + version. This 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. + 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 + You should have received a copy of the GNU 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 Files: debian/* Copyright: 2012 Eric Biggers -License: GPL-2+ +License: GPL-3+ This package 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 package is distributed in the hope that it will be useful, diff --git a/doc/imagex-mount.1.in b/doc/imagex-mount.1.in index 2b8122f4..386e1771 100644 --- a/doc/imagex-mount.1.in +++ b/doc/imagex-mount.1.in @@ -1,39 +1,105 @@ -.TH IMAGEX "1" "May 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands" +.TH IMAGEX "1" "September 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands" .SH NAME -imagex mount \- Mount an image from a WIM archive readonly +imagex mount, mountrw, unmount \- Mount and unmount an image from a WIM archive .SH SYNOPSIS -\fBimagex mount\fR \fIWIMFILE\fR (\fIIMAGE_NUM\fR | \fIIMAGE_NAME\fR) \ -\fIDIRECTORY\fR [--check] [--stream-interface=\fIINTERFACE\fR] +\fBimagex mount\fR \fIWIMFILE\fR \fIIMAGE\fR \fIDIRECTORY\fR [--check] +[--streams-interface=\fIINTERFACE\fR] +.br +\fBimagex mountrw\fR \fIWIMFILE\fR \fIIMAGE\fR \fIDIRECTORY\fR [--check] +[--streams-interface=\fIINTERFACE\fR] +.br +\fBimagex unmount\fR \fIDIRECTORY\fR [--commit] [--check] .SH DESCRIPTION .PP -\fBimagex mount\fR mounts the image specified by \fIIMAGE_NUM\fR or -\fIIMAGE_NAME\fR on the directory \fIDIRECTORY\fR using FUSE (Filesystem in -UserSpace). It is mounted read-only. +The \fBimagex mount\fR and \fBimagex mountrw\fR commands will mount the image in +the Windows Imaging (WIM) file \fIWIMFILE\fR specified by \fIIMAGE\fR on the +directory \fIDIRECTORY\fR using FUSE (Filesystem in Userspace). \fBimagex +mount\fR will mount the image read-only, while \fBimagex mountrw\fR will mount +the image read-write. -It is permissible to omit the \fIIMAGE_NUM\fR or \fIIMAGE_NAME\fR only if -\fIWIMFILE\fR contains only one image. +\fIIMAGE\fR may be a 1-based index of the image in the WIM to mount, or it may +be the name of an image in the WIM. Use the \fBimagex info\fR (1) command to +see the available images in the WIM. It is possible to omit \fIIMAGE\fR, but +only if the WIM contains only one image. -.SH OPTIONS -.TP 6 +The WIM image can be unmounted using the \fBimagex unmount\fR command. Changes +made to a WIM mounted read-write will be discarded unless the \fB--commit\fR +flag is provided to \fBimagex unmount\fR. + +.SH NOTES + +If wimlib was configured using the --without-fuse flag, then the \fBimagex +mount\fR, \fBimagex mountrw\fR, and \fBimagex unmount\fR commands will not work. + +All files in the mounted WIM will be accessible regardless of whether there is a +security descriptor in the WIM associated with the file or not. New files or +directories created in a read-write mounted WIM will be created with no security +descriptor. + +.SH MOUNT OPTIONS +.TP \fB--check\fR -When reading \fIWIMFILE\fR, verify its integrity if the integrity table is -present. +When reading the WIM, verify its integrity if it contains an integrity table. .TP \fB--stream-interface\fR \fIINTERFACE\fR -Specify the interface to alternate data streams (ADS) in the WIM that will be -provided by the mounted filesystem. These are a NTFS feature that found their -way into the WIM file format. -If "none", it will be impossible to read or write the ADS. +This option is inspired by the ntfs-3g filesystem driver (see \fBntfs-3g\fR +(8)). It controls how alternate data streams, or named data streams, in WIM +files are made available. + +If "none", it will be impossible to read or write the named data streams. + +If "xattr" (default), named data streams will be accessible through extended +file attributes, unless this support was disabled when compiling wimlib. The +named data streams may be accessed through extended attributes named "user.*", +where the * is the name of the named data stream. See \fBsetfattr\fR (1) and +\fBgetfattr\fR (1). + +If "windows", the named data streams will be accessible by specifying the +filename, then a colon, then the name of the named data stream; for example, +"myfile:mystream". + +Please note that named data streams are a somewhat obscure NTFS feature that +aren't actually used much, even though they complicate the WIM file format +considerably. Normally, all you care about is the default or "unnamed" data +stream. + +.TP +\fB--debug\fR +Turn on debugging information printed by the FUSE library, and do not fork into +the background. + +.SH UNMOUNT OPTIONS +.TP +\fB--commit\fR +Recreate the WIM file with the changes that have been made. Has no effect if +the mount is read-only. +.TP 6 +\fB--check\fR +When writing \fIWIMFILE\fR, include an integrity table. Has no effect if the +mount is read-only or if --commit was not specified. + +.SH IMPLEMENTATION DETAILS + +Since a WIM is an archive and not a filesystem, \fBimagex mountrw\fR creates a +temporary staging directory to contain files that are created or modified. When +the filesystem is unmounted with \fB--commit\fR, the WIM is rebuilt, merging in +the staging files as needed. Then, the temporary staging directory is deleted. -If "xattr" (default), the ADS will be accessible through extended attributes. -Each ADS will be an extended attribute named "user.*", where the * is the name -of the ADS. See \fBsetfattr\fR (1) and \fBgetfattr\fR (1). +\fBimagex unmount\fR executes the \fBfusermount\fR (1) program, which should be +installed as part of libfuse, to unmount the filesystem. It then uses a POSIX +message queue (see \fBmq_overview\fR (7)) to communicate with the filesystem +daemon (the instance of \fBimagex\fR that has mounted the WIM image) so that it +can know whether whether changes are to be committed and whether an integrity +table is to be included. A message is then sent from the filesystem daemon to +unmounting process when the unmounting has been completed, and this message +indicates whether the unmounting was successful or not. -If "windows", the ADS will be accessible by specifing the filename, then a -colon, then the name of the ADS; for example, "myfile:mystream". +If the filesystem daemon has crashed or been killed, is possible for \fBimagex +unmount\fR to wait a very long time before timing out. A solution to this +problem may be implemented in the future. .SH SEE ALSO .BR imagex (1) diff --git a/doc/imagex-mountrw.1.in b/doc/imagex-mountrw.1.in index 0cc88986..3791defd 100644 --- a/doc/imagex-mountrw.1.in +++ b/doc/imagex-mountrw.1.in @@ -1,49 +1 @@ -.TH IMAGEX "1" "May 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands" -.SH NAME -imagex mountrw \- Mount an image from a WIM archive read-write - -.SH SYNOPSIS -\fBimagex mountrw\fR \fIWIMFILE\fR (\fIIMAGE_NUM\fR | \fIIMAGE_NAME\fR) \ -\fIDIRECTORY\fR [--check] [--stream-interface=\fIINTERFACE\fR] - -.SH DESCRIPTION -.PP - -\fBimagex mountrw\fR mounts the image specified by \fIIMAGE_NUM\fR or -\fIIMAGE_NAME\fR on the directory \fIDIRECTORY\fR using FUSE (Filesystem in -UserSpace). It is mounted read-write. - -It is permissible to omit the \fIIMAGE_NUM\fR or \fIIMAGE_NAME\fR only if -\fIWIMFILE\fR contains only one image. - -A temporary directory is created to stage files. Whenever a new file is created -in the mounted filesystem, it is created in the staging directory. Also, -whenever a file in the WIM file itself is modified, it is copied to the -staging directory. When the WIM is unmounted with the \fBimagex unmount ---commit\fR command, file resources are collected from the original WIM as well -as the staging directory to create the new WIM file. When the new WIM file is -completely written, the old WIM file is overwritten with it. - -.SH OPTIONS -.TP 6 -\fB--check\fR -When reading \fIWIMFILE\fR, verify its integrity if the integrity table is -present. -.TP -\fB--stream-interface\fR \fIINTERFACE\fR -Specify the interface to alternate data streams (ADS) in the WIM that will be -provided by the mounted filesystem. These are a NTFS feature that found their -way into the WIM file format. - -If "none", it will be impossible to read or write the ADS. - -If "xattr" (default), the ADS will be accessible through extended attributes. -Each ADS will be an extended attribute named "user.*", where the * is the name -of the ADS. See \fBsetfattr\fR (1) and \fBgetfattr\fR (1). - -If "windows", the ADS will be accessible by specifing the filename, then a -colon, then the name of the ADS; for example, "myfile:mystream". - -.SH SEE ALSO -.BR imagex (1) - +.so man1/imagex-mount.1 diff --git a/doc/imagex-unmount.1.in b/doc/imagex-unmount.1.in index 0ecdaeca..3791defd 100644 --- a/doc/imagex-unmount.1.in +++ b/doc/imagex-unmount.1.in @@ -1,42 +1 @@ -.TH IMAGEX "1" "May 2012" "imagex (wimlib) wimlib @VERSION@" "User Commands" -.SH NAME -imagex unmount \- Unmount a WIM archive - -.SH SYNOPSIS -\fBimagex unmount\fR \fIDIRECTORY\fR [--commit] [--check] - -.SH DESCRIPTION -.PP - -\fBimagex unmount\fR unmounts the WIM image that has been mounted on -\fIDIRECTORY\fR. - -By default, \fBno changes are saved\fR. You must specify the \fB--commit\fR -option to save your changes to the WIM file. - -.SH IMPLEMENTATION - -\fBimagex unmount\fR uses WIMLIB's wimlib_unmount() function. This function is -implemented by using \fBexeclp\fR (3) to execute \fBfusermount -u\fR. This is -currently necessary because \fBfusermount\fR is installed with the setuid root -permission needed to perform an unmount. Then, for mounts that are not -read-only, the instance of \fBimagex\fR that is managing the filesystem opens -and waits for a message in a POSIX message queue (see \fBmq_overview\fR (7)). -The instance of \fBimagex\fR that is executing the \fBunmount\fR command then -sends a message that indicates whether changes are to be committed or not, and -whether an integrity table is to be included or not. A message is then sent in -the other direction when the unmounting has been completed, and it indicates -whether the unmounting was successful or not. - -.SH OPTIONS -.TP 6 -\fB--commit\fR -Recreate the WIM file with the changes that have been made. Has no effect if -the mount is read-only.\fR. -.TP 6 -\fB--check\fR -When writing \fIWIMFILE\fR, include an integrity table. Has no effect if the -mount is read-only or if --commit was not specified. -.SH SEE ALSO -.BR imagex (1) - +.so man1/imagex-mount.1 diff --git a/src/comp.c b/src/comp.c index 2db66022..506a0781 100644 --- a/src/comp.c +++ b/src/comp.c @@ -10,16 +10,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/decomp.c b/src/decomp.c index c9e0398f..3440971b 100644 --- a/src/decomp.c +++ b/src/decomp.c @@ -10,16 +10,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/dentry.c b/src/dentry.c index a4f9c438..691f14c3 100644 --- a/src/dentry.c +++ b/src/dentry.c @@ -10,24 +10,21 @@ */ /* - * - * Copyright (C) 2010 Carl Thijssen * Copyright (C) 2012 Eric Biggers * * 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. + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 3 of the License, or (at your option) any later + * version. * * 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. + * 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 wimlib; if not, see http://www.gnu.org/licenses/. + * You should have received a copy of the GNU General Public License along with + * wimlib; if not, see http://www.gnu.org/licenses/. */ #include diff --git a/src/extract.c b/src/extract.c index 80cacf79..b1b740f0 100644 --- a/src/extract.c +++ b/src/extract.c @@ -16,16 +16,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/hardlink.c b/src/hardlink.c index 3d010831..5e8ae1a9 100644 --- a/src/hardlink.c +++ b/src/hardlink.c @@ -12,16 +12,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/header.c b/src/header.c index 7a9d5fd0..1b57dc2d 100644 --- a/src/header.c +++ b/src/header.c @@ -11,16 +11,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/integrity.c b/src/integrity.c index f50d03ab..70ff7ffe 100644 --- a/src/integrity.c +++ b/src/integrity.c @@ -12,16 +12,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/join.c b/src/join.c index 496b3181..1d895cf8 100644 --- a/src/join.c +++ b/src/join.c @@ -10,16 +10,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/lookup_table.c b/src/lookup_table.c index f4a67759..c1dca74f 100644 --- a/src/lookup_table.c +++ b/src/lookup_table.c @@ -11,16 +11,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ @@ -81,10 +81,10 @@ void free_lookup_table_entry(struct lookup_table_entry *lte) case RESOURCE_IN_STAGING_FILE: case RESOURCE_IN_ATTACHED_BUFFER: case RESOURCE_IN_FILE_ON_DISK: - wimlib_assert((<e->file_on_disk == - <e->staging_file_name) - && (<e->file_on_disk == - <e->attached_buffer)); + wimlib_assert(((void*)<e->file_on_disk == + (void*)<e->staging_file_name) + && ((void*)<e->file_on_disk == + (void*)<e->attached_buffer)); FREE(lte->file_on_disk); break; #ifdef WITH_NTFS_3G diff --git a/src/lz.c b/src/lz.c index f079fc8e..2f01850b 100644 --- a/src/lz.c +++ b/src/lz.c @@ -13,16 +13,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/lzx-comp.c b/src/lzx-comp.c index 601513dd..cde37ab5 100644 --- a/src/lzx-comp.c +++ b/src/lzx-comp.c @@ -14,16 +14,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU 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 9b5ea988..2996afa2 100644 --- a/src/lzx-decomp.c +++ b/src/lzx-decomp.c @@ -12,16 +12,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/modify.c b/src/modify.c index 681624c6..3dc0de44 100644 --- a/src/modify.c +++ b/src/modify.c @@ -13,16 +13,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/mount.c b/src/mount.c index 24c32f29..7d1ba199 100644 --- a/src/mount.c +++ b/src/mount.c @@ -13,16 +13,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c index d465e576..47e12c02 100644 --- a/src/ntfs-apply.c +++ b/src/ntfs-apply.c @@ -11,16 +11,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c index 1fe9ee13..892b5241 100644 --- a/src/ntfs-capture.c +++ b/src/ntfs-capture.c @@ -11,16 +11,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ @@ -41,6 +41,7 @@ #include #include #include +#include extern int ntfs_inode_get_security(ntfs_inode *ni, u32 selection, char *buf, u32 buflen, u32 *psize); diff --git a/src/resource.c b/src/resource.c index 59c1d9c6..dee8bd15 100644 --- a/src/resource.c +++ b/src/resource.c @@ -5,23 +5,21 @@ */ /* - * Copyright (C) 2010 Carl Thijssen * Copyright (C) 2012 Eric Biggers * * 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. + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 3 of the License, or (at your option) any later + * version. * * 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. + * 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 wimlib; if not, see http://www.gnu.org/licenses/. + * You should have received a copy of the GNU General Public License along with + * wimlib; if not, see http://www.gnu.org/licenses/. */ #include "wimlib_internal.h" diff --git a/src/security.c b/src/security.c index 8fda950c..6f0152ea 100644 --- a/src/security.c +++ b/src/security.c @@ -11,16 +11,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/sha1.c b/src/sha1.c index 28a71848..ce3d9b6d 100644 --- a/src/sha1.c +++ b/src/sha1.c @@ -10,16 +10,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/split.c b/src/split.c index 8370ab3b..f9811d97 100644 --- a/src/split.c +++ b/src/split.c @@ -10,16 +10,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/symlink.c b/src/symlink.c index 60f5ebb6..3b8ed435 100644 --- a/src/symlink.c +++ b/src/symlink.c @@ -10,16 +10,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/util.c b/src/util.c index fa7ac5a0..1df757fa 100644 --- a/src/util.c +++ b/src/util.c @@ -3,22 +3,21 @@ */ /* - * Copyright (C) 2010 Carl Thijssen * Copyright (C) 2012 Eric Biggers * * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/wim.c b/src/wim.c index 58eaf54e..1a159578 100644 --- a/src/wim.c +++ b/src/wim.c @@ -11,16 +11,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/wimlib.h b/src/wimlib.h index a0b08c07..8e0caa78 100644 --- a/src/wimlib.h +++ b/src/wimlib.h @@ -10,16 +10,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ @@ -180,8 +180,8 @@ * * \section legal License * - * The wimlib library is licensed under the GNU Lesser General Public License - * version 2.1 or later. + * The wimlib library is licensed under the GNU General Public License + * version 3 or later. * * @b imagex and @b mkwinpeiso are licensed under the GNU General Public License * version 3 or later. diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index 086765e4..b90800bc 100644 --- a/src/wimlib_internal.h +++ b/src/wimlib_internal.h @@ -11,16 +11,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/write.c b/src/write.c index 9aa8116c..bc821fa7 100644 --- a/src/write.c +++ b/src/write.c @@ -12,16 +12,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/xml.c b/src/xml.c index d7302e1b..2f67c985 100644 --- a/src/xml.c +++ b/src/xml.c @@ -10,16 +10,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/xpress-comp.c b/src/xpress-comp.c index 646dc67f..057e016f 100644 --- a/src/xpress-comp.c +++ b/src/xpress-comp.c @@ -12,16 +12,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ diff --git a/src/xpress-decomp.c b/src/xpress-decomp.c index 0d1f68c5..89e006d3 100644 --- a/src/xpress-decomp.c +++ b/src/xpress-decomp.c @@ -11,16 +11,16 @@ * 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) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * 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 + * 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 + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */