Compare commits
No commits in common. "master" and "gh-pages" have entirely different histories.
553 changed files with 10478 additions and 323851 deletions
27
.gitignore
vendored
27
.gitignore
vendored
|
@ -1,27 +0,0 @@
|
||||||
files.lst
|
|
||||||
*.pc*
|
|
||||||
.seg*
|
|
||||||
*.o
|
|
||||||
*.so
|
|
||||||
pcompress
|
|
||||||
libpcompress*
|
|
||||||
Makefile
|
|
||||||
test.log
|
|
||||||
test/datafiles
|
|
||||||
*~
|
|
||||||
core.*
|
|
||||||
*.kate-swp
|
|
||||||
bsc/bsc
|
|
||||||
*.a
|
|
||||||
*.lo
|
|
||||||
config.h
|
|
||||||
config.log
|
|
||||||
config.status
|
|
||||||
*.la
|
|
||||||
libtool
|
|
||||||
.deps
|
|
||||||
.dirstamp
|
|
||||||
stamp-h1
|
|
||||||
.libs
|
|
||||||
buildtmp
|
|
||||||
*.dSYM
|
|
674
COPYING
674
COPYING
|
@ -1,674 +0,0 @@
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
|
||||||
GNU General Public License for most of our software; it applies also to
|
|
||||||
any other work released this way by its authors. You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you have
|
|
||||||
certain responsibilities if you distribute copies of the software, or if
|
|
||||||
you modify it: responsibilities to respect the freedom of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the manufacturer
|
|
||||||
can do so. This is fundamentally incompatible with the aim of
|
|
||||||
protecting users' freedom to change the software. The systematic
|
|
||||||
pattern of such abuse occurs in the area of products for individuals to
|
|
||||||
use, which is precisely where it is most unacceptable. Therefore, we
|
|
||||||
have designed this version of the GPL to prohibit the practice for those
|
|
||||||
products. If such problems arise substantially in other domains, we
|
|
||||||
stand ready to extend this provision to those domains in future versions
|
|
||||||
of the GPL, as needed to protect the freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish to
|
|
||||||
avoid the special danger that patents applied to a free program could
|
|
||||||
make it effectively proprietary. To prevent this, the GPL assures that
|
|
||||||
patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU 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
|
|
||||||
Program specifies that a certain numbered version of the GNU General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 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/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
<program> Copyright (C) <year> <name of author>
|
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, your program's commands
|
|
||||||
might be different; for a GUI interface, you would use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU GPL, see
|
|
||||||
<http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your program
|
|
||||||
into proprietary programs. If your program is a subroutine library, you
|
|
||||||
may consider it more useful to permit linking proprietary applications with
|
|
||||||
the library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License. But first, please read
|
|
||||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
|
165
COPYING.LESSER
165
COPYING.LESSER
|
@ -1,165 +0,0 @@
|
||||||
GNU LESSER GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
|
||||||
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.
|
|
576
Changelog
576
Changelog
|
@ -1,576 +0,0 @@
|
||||||
== 3.1 Bugfix Release ==
|
|
||||||
Avoid auto-selection variable chunking for buffer sizes below threshold.
|
|
||||||
Do not auto-select Global Dedupe for below threshold buffers.
|
|
||||||
Fix issue #18.
|
|
||||||
Do not try to generate a target filename in pipe mode.
|
|
||||||
Scale default compression buffer size for levels > 8.
|
|
||||||
Fix issue #17.
|
|
||||||
Use LZ4 and Libbsc extra padding space for the compression buffer in adaptive modes.
|
|
||||||
Fix issue #16.
|
|
||||||
Fix issue #15.
|
|
||||||
Fix issue #14
|
|
||||||
Updated fix for issue #12
|
|
||||||
Add check for correct Libarchive version.
|
|
||||||
Update header checks to abort if not found.
|
|
||||||
|
|
||||||
== 3.0 Major Beta Release ==
|
|
||||||
Basic capability to list contents of an archive without extracting to disk.
|
|
||||||
Bump version and update command help text.
|
|
||||||
Update README with additional option details.
|
|
||||||
Change nftw() to depth-first scan to handle restoring directory permissions correctly.
|
|
||||||
When sorting cause directories to be sorted after files and in descending order of nesting level.
|
|
||||||
Take out stray printf().
|
|
||||||
Detect some DICOM formats and use BSC for DICOM data.
|
|
||||||
Overhaul documentation part #1
|
|
||||||
Detect and handle uncompressed PDF files using libbsc.
|
|
||||||
Force binary/text data detection for tar archives.
|
|
||||||
Get rid of unnecessary CLI option.
|
|
||||||
Add full pipeline mode check when archiving.
|
|
||||||
Update to PackJPG 2.5i.
|
|
||||||
Fixes crash with malformed Jpeg.
|
|
||||||
Fix issue #12.
|
|
||||||
Fix issue #13.
|
|
||||||
Create output directory with correct mode.
|
|
||||||
Fix the flow where pathname list is not sorted.
|
|
||||||
Fix ppmd decompression bug introduced in previous commit.
|
|
||||||
Reduce compression level for automatic pathname sorting.
|
|
||||||
Change to extraction directory only after opening archive.
|
|
||||||
Free PPMD buffer after compression, rather than caching.
|
|
||||||
Introduce new API in allocator to release buffer to OS.
|
|
||||||
Release LZMA buffers after use.
|
|
||||||
Drastically reduce memory consumption of PPMD8 in adaptive mode (Use lower max model order).
|
|
||||||
Detect AR archives and set the type.
|
|
||||||
Re-use a less common type code for AR.
|
|
||||||
Use Dispack generically for all executables and AR archives.
|
|
||||||
Move MSDOS COM single-byte magic number checks to last in the list.
|
|
||||||
Move advanced options flag into context structure.
|
|
||||||
Include dtd files as text type.
|
|
||||||
Update PackJPG to version 2.5h.
|
|
||||||
Fix missing bounds checking in Delta2.
|
|
||||||
Check harder with more strides in Delta2 for extreme compression levels.
|
|
||||||
Make LibArchive filter process buffer more generic.
|
|
||||||
Include explicit CLI flags for PackJPG and Dispack.
|
|
||||||
Avoid auto-selection of filters if advanced options are specified.
|
|
||||||
Add more robust checks for Jpeg and packJPG format files in filter routine.
|
|
||||||
Use case-insensitive checks for extension names.
|
|
||||||
Enable more features based on compression level, when archiving.
|
|
||||||
Do not use Libbsc for TIFFs. Not all TIFFs compress well with Libbsc.
|
|
||||||
Fix DEBUG-STATS build for Dispack.
|
|
||||||
Use adapt2 as default compression in archive mode.
|
|
||||||
Add more filter auto-selection by compression level in archive mode.
|
|
||||||
Replace odd stride lengths in Delta2 with standard numeric type lengths and improve performance.
|
|
||||||
Remove fast path exit to allow compressing headers and zero paddings via LZ4.
|
|
||||||
Use libbsc for AVI and MP4 files.
|
|
||||||
Use Libbsc for MP4 and FLAC files.
|
|
||||||
Change some rare file type codes to indicate some common types.
|
|
||||||
Use Libbsc for TIFF images.
|
|
||||||
Workaround for packJPG limitation.
|
|
||||||
Remove external Libbsc option.
|
|
||||||
Add forked and optimized copy of LGPL version of Libbsc.
|
|
||||||
Strip out Sort Transform from Libbsc copy.
|
|
||||||
Reduce Libbsc memory use.
|
|
||||||
Avoid redundant adler32 of data block in Libbsc.
|
|
||||||
Use Libbsc for DNA Sequence data instead of PPMD. Faster, better compression.
|
|
||||||
Fix pz extension handling for real.
|
|
||||||
Avoid Delta2,LZP for TIFF files. Negatively impacts compression.
|
|
||||||
Use libbsc/ppmd for BMP files.
|
|
||||||
Fix extension based hashing.
|
|
||||||
Do not append .pz extension to filenames already having it.
|
|
||||||
Some code formatting changes.
|
|
||||||
Fix PackJPG library usage. PackJPG interface doc is incomplete, ugh!
|
|
||||||
Handle the case where PackJPG expands the file rather than compressing.
|
|
||||||
Fix Dispack decoding.
|
|
||||||
Add Dispack filter with auto-detection of x86 executables in archive mode.
|
|
||||||
More elaborate magic header based detection of 32-bit and 64-bit x86 binaries.
|
|
||||||
Always use fast-mode LZ4 in Adaptive modes.
|
|
||||||
Optimize preprocessed compression and avoid a bunch of memory copies.
|
|
||||||
Fix a crash.
|
|
||||||
Add a few more file types.
|
|
||||||
More comments.
|
|
||||||
Fix fd leak.
|
|
||||||
Fix issues when handling Jpegs where packJPG borks.
|
|
||||||
Add fast handling of totally incompressible data (like Jpegs) in adaptive modes.
|
|
||||||
Add function to indicate totally incompressible data when archiving.
|
|
||||||
Reformat if statements in some places to reduce branching.
|
|
||||||
Enable auto-filtering of archive entries based on compression level.
|
|
||||||
Miscellaneous fixes.
|
|
||||||
Work in progress changes for packJPG encoding and decoding.
|
|
||||||
Enhance custom LibArchive filter functionlity.
|
|
||||||
Add basic framework for file type based filters during libarchive stage.
|
|
||||||
Add packJPG filter for Jpeg files (not active yet).
|
|
||||||
Directory format changes for clarity.
|
|
||||||
Add own implementation of archive entry extraction to allow custom filters.
|
|
||||||
Fix magic number check for endianness.
|
|
||||||
Structured handling of file types.
|
|
||||||
Handling of already compressed data based on compression algorithm.
|
|
||||||
Add a few more extension types.
|
|
||||||
Leverage file type detection(archiver) to improve compression performance.
|
|
||||||
Use detected file/data type(archiver) for Adaptive compression modes.
|
|
||||||
Update type flags and add more extensions.
|
|
||||||
Add file type detection based on magic values.
|
|
||||||
Add extension based file type detection and setting segment data type.
|
|
||||||
Use Bob Jenkins Minimal Perfect Hash to check for known extensions.
|
|
||||||
Use semaphore signaling and direct buffer copy for extraction.
|
|
||||||
Clear off private xattrs when extracting.
|
|
||||||
Enable pathname sorting only for high compression levels.
|
|
||||||
Replace slow pipe with direct memory copy for archive extraction.
|
|
||||||
Avoid using pipe during archive creation. Use semaphores and direct memory copy.
|
|
||||||
Use mmap to read from the pathlist file for performance.
|
|
||||||
Functionality to sort pathnames based on file extension and size.
|
|
||||||
More changes for archiving.
|
|
||||||
Allow multiple filenames on command line when archiving.
|
|
||||||
Remove unneded small block writes with libarchive.
|
|
||||||
Make log_msg() add newline by default.
|
|
||||||
Archiving support using Libarchive.
|
|
||||||
Change all perror() calls to use logger.
|
|
||||||
Make the config script a little verbose.
|
|
||||||
Ability to specify output compressed pathname.
|
|
||||||
Fix log level handling.
|
|
||||||
Add a simple log facility.
|
|
||||||
Refactor all printfs to use log facility.
|
|
||||||
Cleanup pointer casting in code to use macros.
|
|
||||||
|
|
||||||
== 2.4 Bugfix Release ==
|
|
||||||
Add identifiers to error messages for clarity.
|
|
||||||
Fix init of dedupe block size.
|
|
||||||
Tweak free memory detection to include swap and shared memory consideration.
|
|
||||||
Fix incorrect chunk size initialization from a previous commit.
|
|
||||||
Remove confusing option with little practical utility.
|
|
||||||
Update test cases and documentation.
|
|
||||||
Additional error checks in RLE encoding for bsdiff extra data.
|
|
||||||
Add a buffer overflow check in RLE encoder.
|
|
||||||
Avoid calling RLE encoding if extra data length is zero.
|
|
||||||
Make 2KB block size default for non-global deduplication.
|
|
||||||
Update test cases for new 2KB block size support.
|
|
||||||
Truncate password file after zeroing.
|
|
||||||
Add more example usage.
|
|
||||||
Avoid calling compression routine when dedupe reduces data size to zero.
|
|
||||||
Default compression level only when compressing.
|
|
||||||
Fix issue #11.
|
|
||||||
Increase default chunk size to 8MB.
|
|
||||||
Use default compression level of 1 (fast mode) for LZ4.
|
|
||||||
Support for deduplication using 2KB block size.
|
|
||||||
Add basic file format documentation.
|
|
||||||
Reduce memory threshold for switching to Similarity based Deduplication.
|
|
||||||
Avoid unnecessary re-hashing of 64-bit keys of the segment index.
|
|
||||||
Update free memory computation to include cached buffers.
|
|
||||||
Fix a potential rare corner case.
|
|
||||||
|
|
||||||
== 2.3 Update Release ==
|
|
||||||
Fix multiple crashes for some corner cases.
|
|
||||||
Increase max block size for variable dedup block sizes greater than 16KB.
|
|
||||||
Update test cases and fix a test script bug.
|
|
||||||
Use wrapper script to set paths when launching pcompress from build directory.
|
|
||||||
Use smaller max block size when doing global dedupe.
|
|
||||||
Fix init of executable name.
|
|
||||||
Make data partitioning between threads more effective.
|
|
||||||
Remove unnecessary computation to make Fixed block chunking faster.
|
|
||||||
Fix Dedupe Mode initialization.
|
|
||||||
Improve accuracy of the KMV sketch computation and speed it up.
|
|
||||||
Reduce similarity indicators to reduce memory use with low impact on dedupe ratio.
|
|
||||||
Add missing init of rabin block size.
|
|
||||||
Reduce a rollign hash parameter for a slight speedup with no side effect.
|
|
||||||
Update README with pointers to relevant analysis and documentation.
|
|
||||||
Remove an rpath entry meant for testing.
|
|
||||||
Make default symbol visibility to hidden with explicit public visibility specified.
|
|
||||||
Add missing static scope to a few more places.
|
|
||||||
Make Pcompress functionality into a library - initial changes.
|
|
||||||
|
|
||||||
== 2.2 Bugfix Release ==
|
|
||||||
Update invalid environment variable handling to actually fail rather than auto-correct.
|
|
||||||
Fix a crash with invalid PCOMPRESS_CHUNK_HASH_GLOBAL.
|
|
||||||
Update testcase to correctly detect core files.
|
|
||||||
Drastic simplification of Min-heap code and resultant Delta speedup.
|
|
||||||
Correspond segment size to chunk size for Segmented Dedupe for better accuracy.
|
|
||||||
Add a testcase for issue #10.
|
|
||||||
Fix issue #10.
|
|
||||||
Fix issue #8.
|
|
||||||
|
|
||||||
== 2.1 Update Release ==
|
|
||||||
Add more tests covering Segmented Global Dedupe.
|
|
||||||
Fix some tests.
|
|
||||||
Switch location of Dedupe context creation to allow correct index memory sizing.
|
|
||||||
Update README with details of Global Dedupe block hash selection.
|
|
||||||
Add SSE2 optimizations for Segmented Dedupe.
|
|
||||||
Fix segment offset sorting.
|
|
||||||
Get rid of incorrect duplicate checks in index.
|
|
||||||
Allow SKEIN to be used as a Global Dedupe chunk lookup hash.
|
|
||||||
Add a qsort variant optimized for integers and use in global dedupe.
|
|
||||||
Cleanup LZMA CRC64/32 declarations and add a header.
|
|
||||||
Fix heapq header.
|
|
||||||
Use openmp parallelism always for chunk hash computation during Global Dedupe.
|
|
||||||
Use SHA256 for Global Dedupe chunk lookup hash by default.
|
|
||||||
Allow changing Global Dedupe chunk lookup hash via env variable.
|
|
||||||
Fix crash with some older GCC versions. Reported in issue #7.
|
|
||||||
Fix issue #7.
|
|
||||||
Ensure tempfile cleanup even with error abort.
|
|
||||||
Fix bugs and improve accuracy in Segmented Dedupe.
|
|
||||||
Fix segment hashlist size computation.
|
|
||||||
Remove unnecessary sync of segment hashlist file writes.
|
|
||||||
Pass correct number of threads to index creation routine.
|
|
||||||
Add more error checks.
|
|
||||||
Handle correct positioning of segment hashlist file offset on write error.
|
|
||||||
Add missing semaphore signaling at dedupe abort points with global dedupe.
|
|
||||||
Use closer min-values sampling for improved segmented dedupe accuracy.
|
|
||||||
Update proper checksum info in README.
|
|
||||||
Fix sizing of similarity hash buffer.
|
|
||||||
Tweak index size computation.
|
|
||||||
|
|
||||||
== 2.0 Major Release ==
|
|
||||||
Add test cases for Global Deduplication.
|
|
||||||
Update documentation and code comments.
|
|
||||||
Remove tempfile pathname after creation to ensure clean removal after process exit.
|
|
||||||
Simplify segment lookup loop.
|
|
||||||
Fix assertion.
|
|
||||||
Change Segmented Dedupe flow to improve parallelism.
|
|
||||||
Periodically sync writes to segcache file.
|
|
||||||
Use simple insertion sort for small numbers of elements.
|
|
||||||
Capability to output data to stdout when compressing.
|
|
||||||
Always use segmented similarity bases dedupe when using -G option in pipe mode.
|
|
||||||
Standardize on average 8MB segment size for segmented dedupe.
|
|
||||||
Fix hashtable sizing.
|
|
||||||
Some miscellaneous cleanups.
|
|
||||||
Update README with details of new features.
|
|
||||||
Optimize index lookup for 8-byte keys.
|
|
||||||
More cleanups.
|
|
||||||
More tweaks to slightly improve segment dedupe efficiency.
|
|
||||||
Some minor cleanps.
|
|
||||||
Improve segment similarity detection and drastically reduce index size.
|
|
||||||
Improve duplicate segment match detection.
|
|
||||||
Tweak percentage intervals computation to improve segmented dedupe ratio.
|
|
||||||
Avoid repeat processing of already processed segments.
|
|
||||||
Clean up temp cache dir handling.
|
|
||||||
Allow temp dir setting via specific env variable to point to fast devices like ramdisk,ssd.
|
|
||||||
Several bugfixes.
|
|
||||||
Avoid matching with self during hash lookup.
|
|
||||||
Several fixes and optimizations.
|
|
||||||
Many optimizations and changes to Segmented Global Dedupe.
|
|
||||||
Use chunk hash based similarity matching rather than content based.
|
|
||||||
Use sorting to order hash buffer rather than min-heap for better accuracy.
|
|
||||||
Use fast CRC64 for similarity hash for speed and lower memory requirements.
|
|
||||||
Many optimizations to segmented global dedupe.
|
|
||||||
Use chunk hash based cumulative similarity matching instead of chunk content.
|
|
||||||
Update usage text and add minor tweaks.
|
|
||||||
Properly cleanup global dedupe state.
|
|
||||||
Complete implementation for Segmented Global Deduplication.
|
|
||||||
Work in progress changes for Segmented Global Deduplication.
|
|
||||||
Work in progress changes for Segmented Global Deduplication.
|
|
||||||
Work in progress changes for scalable segmented global deduplication.
|
|
||||||
Allow user-specified environment setting to control in-memory index size.
|
|
||||||
Implement global dedupe in pipe mode.
|
|
||||||
Update hash index calculations to use upto 75% memavail when file size is not known.
|
|
||||||
Use little-endian nonce format for Salsa20.
|
|
||||||
Add global index cleanup function.
|
|
||||||
Fix location of sem_wait().
|
|
||||||
More comments.
|
|
||||||
Add check to disable Delta Compression with Global deduplication for now.
|
|
||||||
Implement Global Deduplication.
|
|
||||||
|
|
||||||
== 1.4.0 Update Release ==
|
|
||||||
Update couple more test parameters with new crypto options.
|
|
||||||
Update README and test cases with new crypto options.
|
|
||||||
Update usage text.
|
|
||||||
Cleanup more stack parameters after use in various crypto functions.
|
|
||||||
Fix increment of XSalsa20 192-bit nonce value.
|
|
||||||
Handle nonce bytes in endian neutral way.
|
|
||||||
Use 128-bit key length when decompressing older version archives.
|
|
||||||
Add XSalsa20 encryption algorithm from the NaCL library.
|
|
||||||
Include 128-bit key support based on the Salsa20 eSTREAM submission.
|
|
||||||
Allow variable-length nonces.
|
|
||||||
Use random bytes for initial nonce value.
|
|
||||||
Increase PBE hash rounds to 50000.
|
|
||||||
Move Scrypt helper function out of AES module.
|
|
||||||
Change default encryption key length to 256 bits.
|
|
||||||
Add optional ability to change key length at runtime via cli option.
|
|
||||||
Include key length property in archive header.
|
|
||||||
Fix header HMAC to include salt, nonce and key length properties.
|
|
||||||
Retain backward compatibility to handle older format archives.
|
|
||||||
Fix compilation of AES ASM code.
|
|
||||||
Add AES-NI optimized code derived from latest OpenSSL upstream.
|
|
||||||
Add AES instruction set detection.
|
|
||||||
Add Vector Permute AES from OpenSSL 1.0.1e. Remain compatible with older OpenSSL versions.
|
|
||||||
Add compatibility to decode old-format parallel hashes created with version 1.2.
|
|
||||||
Bump archive version to 7 as parallel hashes are now merkle style hashes.
|
|
||||||
Add lookup and insert functionality for global index.
|
|
||||||
Use PPMd fallback for adapt2 if BSC is not enabled.
|
|
||||||
Improve XML detection in adaptive mode.
|
|
||||||
Make global dedupe bits buildable and fix errors.
|
|
||||||
Rename Adaptive compression type constants to avoid conflict with global constants.
|
|
||||||
Work in progress global dedupe.
|
|
||||||
Fixes for issues/warnings reported in issue #4.
|
|
||||||
Global dedupe work in progress.
|
|
||||||
Use OpenMP parallelism when computing xxHashes for chunks.
|
|
||||||
Use 2-stage Merkle Tree hashing for parallel hashes for better crypto properties.
|
|
||||||
Update xxhash comment.
|
|
||||||
Reduce dedupe hash table collisions by half.
|
|
||||||
Improve Deduplication performance by another 95%.
|
|
||||||
Start sliding window scanning near minimum chunk size boundaries to avoid scanning whole chunk.
|
|
||||||
|
|
||||||
== 1.3.0 Major Performance Release ==
|
|
||||||
Fix return from parallel versions of Keccak_Hash() function.
|
|
||||||
Add parallel versions of various checksums for single-segment, single-thread compression.
|
|
||||||
Use BLAKE2 parallel version for single-chunk archives (whole file in one chunk).
|
|
||||||
Set decompression threads correctly for single-chunk archives.
|
|
||||||
Update default checksum to BLAKE256.
|
|
||||||
Add optimized BLAKE2 implementations with runtime detection of CPU capability (SSE/AVX).
|
|
||||||
Major changes to use Intel's optimized SHA512 code for SHA512 and SHA512/256.
|
|
||||||
Remove earlier SHA256 code which is slower than SHA512/256 (on 64-bit CPU).
|
|
||||||
Use HMAC from Alan Saddi's implementation for cleaner, faster code.
|
|
||||||
Changes for generalized runtime SSE/AVX/XOP detection.
|
|
||||||
Multi instruction set XXhash build with runtime selection.
|
|
||||||
Extend CPUID code to detect more instruction sets.
|
|
||||||
Add options for BLAKE2 hash.
|
|
||||||
Move GCC builtins into utils header.
|
|
||||||
Bump file format version number due to extended digest flags.
|
|
||||||
Add descriptions to digest list.
|
|
||||||
Rationalize XXHash implementation to deal with 32-byte blocks instead of 16-byte.
|
|
||||||
Fix XXHash performance degradation for small keys.
|
|
||||||
Modify a data analysis loop in adaptive compress to make it auto-vectorizable.
|
|
||||||
Improve Deduplication throughtput by 90%.
|
|
||||||
Use SSE4 register as sliding window for default 16-byte window size.
|
|
||||||
Use local variable for sliding window position to avoid spurios memory access in non-SIMD case.
|
|
||||||
Avoid computing breakpoint check value if processed length < minimum block length.
|
|
||||||
Improve SSE version detection.
|
|
||||||
Add SSE4 detection.
|
|
||||||
Fix setting of some opt flags in Makefile.in.
|
|
||||||
Many optimization tweaks
|
|
||||||
Optimize Rabin Deduplication and Bsdiff
|
|
||||||
Vectorize XXHash using SSE4
|
|
||||||
Add SSE2 improvements to CTR mode AES.
|
|
||||||
Add debug print of encryption and HMAC throughput.
|
|
||||||
Fix error message for invalid option.
|
|
||||||
Implement algo-specific minimum distance match for Delta Compression.
|
|
||||||
Fixes and performance improvements for Dedupe Delta Compression
|
|
||||||
Avoid using fingerprints in minhash computation and fix write amplification
|
|
||||||
Modify min-heap to use 64bit values
|
|
||||||
Improve bsdiff performance
|
|
||||||
Fix pointer comparison in bsdiff
|
|
||||||
Use 32bit offsets in bsdiff to reduce memory usage
|
|
||||||
Improve Zero RLE Encoder performance
|
|
||||||
Add more buffer overflow checks in Zero RLE Decoder
|
|
||||||
Use SSE3 lddqu in the matchfinder if SSE3 is enabled.
|
|
||||||
Remove outdated LZP note.
|
|
||||||
|
|
||||||
== 1.2.0 Major Stable Release ==
|
|
||||||
Fix issue #1 and issue #2.
|
|
||||||
Enable building with older openssl (at least 0.9.8e).
|
|
||||||
Add variants of missing functions in older openssl versions.
|
|
||||||
Allow proper linking with libraries in alternate locations and setting RUNPATH.
|
|
||||||
Increase hash rounds for nonce generation.
|
|
||||||
Fix calculation of extra scratch space for Dedupe.
|
|
||||||
Add missing return value check in small buffer Delta2.
|
|
||||||
Update test failure detection in test driver.
|
|
||||||
Fix numeric parsing.
|
|
||||||
Fix dedupe bug introduced in last commit.
|
|
||||||
Reset valid flag when resetting dedupe context.
|
|
||||||
Cleanup test suites.
|
|
||||||
Do not abort test suite on failure of a test case.
|
|
||||||
Fix Delta2 handling for small buffers.
|
|
||||||
Fix LZP handling during preprocessing.
|
|
||||||
Fix type flag handling during preprocessing.
|
|
||||||
Update test cases to use configurable list of test corpus files.
|
|
||||||
Update some more int64_t datatypes to uint64_t
|
|
||||||
Update to latest XXHash version.
|
|
||||||
Fix Keccak invocation and reset default checksum back to SKEIN 256.
|
|
||||||
Improve Dedupe performance.
|
|
||||||
Fix compiler warning in allocator code.
|
|
||||||
Major enhancements to Delta2 encoding.
|
|
||||||
Fix the byteswap macros.
|
|
||||||
Start adding assertions.
|
|
||||||
Introduce strict compiler flags and fix scores of warnings/issues.
|
|
||||||
Avoid different optimization flags for Dedupe sources.
|
|
||||||
Fix liberal mixing of uint64_t and int64_t (should all be uint64_t).
|
|
||||||
Fix corner case crash when decompressing.
|
|
||||||
Fix Delta2 decode handling when not compressing.
|
|
||||||
More debug statements and other minor changes.
|
|
||||||
Avoid transposing below-threshold spans. Reduces compression ratio.
|
|
||||||
Use little-endian storage format for numbers to optimize for x86.
|
|
||||||
Improve embedded table detection.
|
|
||||||
Reduce Delta2 header sizes.
|
|
||||||
Fix preprocessing behavior when LZP does not compress but Delta2 works.
|
|
||||||
Improve Delta2 scanning speed and effectiveness.
|
|
||||||
Add destination buffer overflow check in Delta2.
|
|
||||||
Add rough speed computation.
|
|
||||||
More tweaks to Delta2 implementation.
|
|
||||||
Ability to run individual test suites from makefile.
|
|
||||||
Silence more Gcc warnings.
|
|
||||||
Update testing note.
|
|
||||||
Improve 64-bit compiler and platform checks.
|
|
||||||
Ensure core dumps are enabled during testing.
|
|
||||||
Enable building with alternate Zlib and Bzlib.
|
|
||||||
Fix correct setting of output size when using Delta2 without LZP.
|
|
||||||
README formatting.
|
|
||||||
Make Delta2 encoding independent of LZP.
|
|
||||||
Tweak Delta2 parameters.
|
|
||||||
Update README and test cases.
|
|
||||||
Update README to align with current features/behavior.
|
|
||||||
Fine tune transpose parameters.
|
|
||||||
Fix minor nits.
|
|
||||||
Change confusing structure member name.
|
|
||||||
Add Matrix Transpose of Dedupe index to compress it better.
|
|
||||||
Fix handling of Dedupe index compression failure.
|
|
||||||
Ensure intermediate file cleanup in tests.
|
|
||||||
Update to latest LZ4.
|
|
||||||
Get rid of size_t in places where 64-bitness is assumed.
|
|
||||||
Add support for 64-bit Keccak implementation.
|
|
||||||
Sanitize error message from tests.
|
|
||||||
Add more tests.
|
|
||||||
Improve platform detection in config script.
|
|
||||||
Add adaptive delta encoding test.
|
|
||||||
Implement Adaptive Delta Encoding (Delta2).
|
|
||||||
Work in progress global dedupe config setup.
|
|
||||||
|
|
||||||
== 1.1.0 Stable Release ==
|
|
||||||
Fix building without Libbsc support.
|
|
||||||
Add more tests for corrupted encrypted files.
|
|
||||||
Fix thread error reporting.
|
|
||||||
Update error condition tests to not truncate archive.
|
|
||||||
Fix issues with error handling.
|
|
||||||
Add new tests for out of range values and corrupted file.
|
|
||||||
Avoid CRC32 when decompressing older version archives.
|
|
||||||
Use HMAC on header and encrypted data, avoid regular digest when encrypting.
|
|
||||||
Add CRC32 header checksums in non-cryptographic mode.
|
|
||||||
Zlib optimizations. Use raw deflate streams to avoid unnecessary adler32.
|
|
||||||
Change some function signatures to improve algo init function behavior.
|
|
||||||
Fix corner case dedupe bug in error handling flow.
|
|
||||||
Bump archive version signature.
|
|
||||||
Work in progress global dedupe config loader.
|
|
||||||
Use fixed rolling-hash mask for better block size approximation.
|
|
||||||
|
|
||||||
== 1.0.0 Stable Release ==
|
|
||||||
Fix chunk flag setup when compression fails in adaptive mode.
|
|
||||||
Prevent display of non-fatal errors during compression.
|
|
||||||
Add buffer overflow check in Ppmd compression routines.
|
|
||||||
Fix pipe mode encryption check.
|
|
||||||
Change file difference check in tests.
|
|
||||||
Fix encryption with adaptive modes.
|
|
||||||
Add missing zero-out of algorithm data field.
|
|
||||||
Add a functionality test suite.
|
|
||||||
Tweak chunking parameters for better block size distribution and dedupe ratio.
|
|
||||||
Add some more debug mode info.
|
|
||||||
Minor fix for adapt mode.
|
|
||||||
Use Libbsc for XML data in adapt2 mode.
|
|
||||||
|
|
||||||
== 0.9.1 Minor update Release ==
|
|
||||||
Portability to Debian based distros.
|
|
||||||
Enable SSE4/AVX detection for AMD platforms (Bulldozer has both).
|
|
||||||
Portable long long int print formatting to silence gcc 4.6 warnings.
|
|
||||||
Add another example invocation.
|
|
||||||
|
|
||||||
== 0.9.0 Major Release ==
|
|
||||||
Implement HMAC verification for chunk header.
|
|
||||||
Do not ask for decryption passwd twice.
|
|
||||||
Refactor crypto utility functions in a separate file.
|
|
||||||
Add HMAC verification for file header.
|
|
||||||
Add a few extra input validation checks.
|
|
||||||
Include space in chunk header for HMAC.
|
|
||||||
Support for chunk-level encryption using AES and Scrypt based PBE.
|
|
||||||
Couple of minor fixes.
|
|
||||||
Incorporate SSE/AVX optimized Intel SHA-256 implementation.
|
|
||||||
Add support for runtime cpuid detection.
|
|
||||||
Add support for SHA256 and SHA512 digests from OpenSSL library.
|
|
||||||
|
|
||||||
== 0.8.6 Update Release ==
|
|
||||||
Fix polynomial computation.
|
|
||||||
Fix incorrect block length when doing fixed-block dedupe.
|
|
||||||
Remove unused structure member.
|
|
||||||
Switch to multiplicative rolling hash for good
|
|
||||||
|
|
||||||
== 0.8.5 Update Release ==
|
|
||||||
Update adaptive mode heuristic based on algorithms.
|
|
||||||
Remove incorrect check in PPMd decompression code.
|
|
||||||
Speed up adaptive modes by using heuristics to select compression algorithm.
|
|
||||||
Select similarity percentage based on dedupe block size for effectiveness.
|
|
||||||
Fix check for size reduction in dedupe.
|
|
||||||
Fix polynomial table computation.
|
|
||||||
Change hashing and length bias to reduce hashtable bucket collisions.
|
|
||||||
Add support for user-selectable 60% or 40% similarity for Delta Compression.
|
|
||||||
Overall slight speedup.
|
|
||||||
Rewrite core dedupe logic to simplify code and improve performance.
|
|
||||||
Hashtable based chunk-level deduplication instead of Quicksort.
|
|
||||||
Fix a corner case bug in Dedupe decompression.
|
|
||||||
Speed up Hash computation for dedupe blocks.
|
|
||||||
Add support for Fixed-Block deduplication.
|
|
||||||
Reduce dedupe loop checks for slight speed edge.
|
|
||||||
Implement K-min-values Sketch for Similarity detection.
|
|
||||||
|
|
||||||
== 0.8.1 Bugfix Release ==
|
|
||||||
Fix return code handling in LZP pre-compression, crashed adaptive modes.
|
|
||||||
Allow user-specified minimum Dedupe block size.
|
|
||||||
Compute similarity sketch only if Delta Compression enabled.
|
|
||||||
Fix secondary sketch computation, some more accuracy in diff detection.
|
|
||||||
Add xxHash for Rabin block checksums, slightly faster than CRC64.
|
|
||||||
Fix missing initialization of character counts table.
|
|
||||||
Some file reorganization.
|
|
||||||
Add ASM version of Skein for x64 platforms with auto-detection
|
|
||||||
Error checking for checksum flag when decompressing
|
|
||||||
Add support for Skein512 and Skein256 checksums
|
|
||||||
Import Skein code from NIST CD submission
|
|
||||||
Make checksum algorithms pluggable
|
|
||||||
Fix handling of huge buffers (>2GB) in LZP
|
|
||||||
Cleanup of some buffer sizing code
|
|
||||||
|
|
||||||
== 0.8 Beta release ==
|
|
||||||
Add support for libbsc a high-performance block sorting compressor.
|
|
||||||
Enable external algorithm threading for single chunk compressed files.
|
|
||||||
Add config script to generate Makefile based on flags.
|
|
||||||
Add install target and installation readme file.
|
|
||||||
Improve memory efficiency when total file size < total size of chunks.
|
|
||||||
Fix freeing of Zlib structures.
|
|
||||||
Add LZP Pre-Compression support ported from libbsc.
|
|
||||||
Add generic pre-processing wrappers for future support of other pre-processors.
|
|
||||||
Clean up computation of Rabin block sizes.
|
|
||||||
Compute Rabin scratch space accurately to avoid RAM wastage.
|
|
||||||
Delay allocation of per-thread chunks for performance and memory efficiency.
|
|
||||||
Avoid allocating double-buffer for single-chunk files.
|
|
||||||
Introduce lzmaMt option to indicate multithreaded LZMA.
|
|
||||||
Add multithreaded LZMA port from p7zip
|
|
||||||
Compute balanced thread count between chunk threads and algo threads
|
|
||||||
Generic way to handle querying algorithm parameters
|
|
||||||
Clean up unnecessary includes
|
|
||||||
Speed up sort comparator function.
|
|
||||||
Reduce memory consumption and improve performance in dedupe
|
|
||||||
Re-introduce crc64 for dedup blocks to avoid wasted memcpy-s
|
|
||||||
Restructe block array to be an array of pointers allocated on demand
|
|
||||||
Fix a corner case issue when splitting chunks at a dedup boundary
|
|
||||||
Improve Rabin computations using an irreducible polynomial
|
|
||||||
Slight improvement to similarity computation
|
|
||||||
A simple mechanism to include DEBUG mode stats
|
|
||||||
Implement secondary sketch based on character counts to refine similarity checksum.
|
|
||||||
Proper checksum update for last block.
|
|
||||||
|
|
||||||
== 0.7 Beta release ==
|
|
||||||
Bump version to 0.7
|
|
||||||
Fix handling of compression flags in adaptive mode
|
|
||||||
Fix error handling when chunk size is too small for dedupe
|
|
||||||
Fix initialization of adaptive modes.
|
|
||||||
Compute and compare Mean sketch cksum to improve similarity comparison
|
|
||||||
Fix optflags settings in Makefile
|
|
||||||
Small optimization in zero RLE encoder to avoid scanning during lookahead
|
|
||||||
Some minor fixes
|
|
||||||
Bias fingerprint value with occurrence counts for a better sketch
|
|
||||||
Fix latent bug when calling algo deinit in decompression code
|
|
||||||
Reduce diff threshold for slightly greater delta encoding
|
|
||||||
Limit similar buffer size difference for less wasted diffing
|
|
||||||
Change zlib compression wrapper to use faster deflateReset mechanism
|
|
||||||
Reduce optimization level for Dedupe code, it goes faster
|
|
||||||
Fix handling of incompressible chunks.
|
|
||||||
Fix handling of various dedup failures.
|
|
||||||
Add NULL compression option for dedup only compression.
|
|
||||||
Remove unneeded checks in qsort comparator.
|
|
||||||
Fix buffer sizing for LZ4.
|
|
||||||
Fix exit condition checks in LZ4 decompression wrapper.
|
|
||||||
Fix buffer size calculation when decompressing LZ4, Zlib and Bzip2 compressed chunks.
|
|
||||||
Slight SSE optimization in LZ4HC.
|
|
||||||
|
|
||||||
== 0.6 Alpha bugfix release ==
|
|
||||||
Fix crash when algo init function returns error.
|
|
||||||
Fix LZFX error handling.
|
|
||||||
More updates to README.
|
|
||||||
Further improve LZMA compression parameters to utilize all the 14 levels.
|
|
||||||
Tweak some Rabin parmeters for better reduction with zlib and Bzip2.
|
|
||||||
Increase the small size slabs a bit.
|
|
||||||
Fix slab sizing.
|
|
||||||
Fix buffer size computation when allocating Rabin block array.
|
|
||||||
Reduce memory usage of Rabin block array.
|
|
||||||
Add an SSE optimization for bsdiff.
|
|
124
INSTALL
124
INSTALL
|
@ -1,124 +0,0 @@
|
||||||
Copyright (c) 2012 Moinak Ghosh
|
|
||||||
|
|
||||||
Prerequisites
|
|
||||||
=============
|
|
||||||
64-bit System.
|
|
||||||
GCC 4.4 (with mpfr, ppl and cloog support packages for loop
|
|
||||||
vectorization).
|
|
||||||
libz (zlib) and development packages.
|
|
||||||
Libbz2 and development packages.
|
|
||||||
OpenSSL version 0.9.8 or greater.
|
|
||||||
Libarchive 3.x or greater and its development packages.
|
|
||||||
|
|
||||||
Basic Installation
|
|
||||||
==================
|
|
||||||
The simplest process to build and install this utility is:
|
|
||||||
|
|
||||||
./config
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
|
|
||||||
The current makefiles and config scripts assume Gcc compiler is
|
|
||||||
in the PATH. Please update PATH before running config if that is
|
|
||||||
not the case.
|
|
||||||
|
|
||||||
In order to remove all binaries:
|
|
||||||
make clean
|
|
||||||
|
|
||||||
Remove all binaries and the generated Makefile:
|
|
||||||
make distclean
|
|
||||||
|
|
||||||
Strictly speaking the 'make install' step is not required to
|
|
||||||
run the utility as it is a single stand alone program for now.
|
|
||||||
|
|
||||||
The config script controls various compile time parameters and
|
|
||||||
generates the actual Makefile. You can get a short description
|
|
||||||
of all the options by running:
|
|
||||||
|
|
||||||
./config --help
|
|
||||||
|
|
||||||
NOTE: Basic Installation does not enable support for Libbsc, a
|
|
||||||
new block-sorting compressor (similar to but better than
|
|
||||||
Bzip2). See below for details.
|
|
||||||
|
|
||||||
Testing
|
|
||||||
=======
|
|
||||||
|
|
||||||
After running make as given above you can run:
|
|
||||||
make test
|
|
||||||
|
|
||||||
This will generate some data files from /usr/bin /usr/share and
|
|
||||||
/usr/include directories and then run a whole lot of tests. These
|
|
||||||
execute pcompress with a wide variety of combinations of options.
|
|
||||||
For every test both compression and decompression are performed
|
|
||||||
and after every decompression the decompressed file is verified
|
|
||||||
byte for byte with the original using the diff utility.
|
|
||||||
|
|
||||||
It takes a long time to run all the tests. The complete test log
|
|
||||||
is stored in the file test.log. Test failures are indicated by the
|
|
||||||
error message starting with the word "FATAL". All other error
|
|
||||||
messages visible in the log are a result of negative testing where
|
|
||||||
the utility is expected to exit with an error.
|
|
||||||
|
|
||||||
The files test/t1.tst, test/t2.tst and so on are individual test
|
|
||||||
suites. It is possible to run a single test suite. For example to
|
|
||||||
run test/t4.tst the following command can be used:
|
|
||||||
make test TESTSUITE=4
|
|
||||||
|
|
||||||
Custom Installation
|
|
||||||
===================
|
|
||||||
The options to the config script are detailed below. Note that this
|
|
||||||
is not the usual GNU Autoconf script.
|
|
||||||
|
|
||||||
./config [<options>]
|
|
||||||
|
|
||||||
<options> can be one of the following:
|
|
||||||
|
|
||||||
<options> can be one of the following:
|
|
||||||
|
|
||||||
--prefix=<val> The installation prefix (default: /usr).
|
|
||||||
|
|
||||||
--enable-debug Enable debug mode compilation (default: disabled).
|
|
||||||
|
|
||||||
--disable-allocator Disable use of internal memory allocator mechanism (default: enabled).
|
|
||||||
|
|
||||||
--enable-debug-stats Enable printing of some verbose debug info (default: disabled).
|
|
||||||
|
|
||||||
--with-openssl=<path to OpenSSL installation tree> (Default: System)
|
|
||||||
This defaults to the system's OpenSSL library. You can use this option
|
|
||||||
if you want to use an alternate OpenSSL installation.
|
|
||||||
|
|
||||||
--with-zlib=<path to zlib installation tree> (Default: System)
|
|
||||||
Enable building against an alternate Zlib installation.
|
|
||||||
|
|
||||||
--with-bzlib=<path to Bzip2 library installation tree> (Default: System)
|
|
||||||
Enable building against an alternate Bzip2 and library installation.
|
|
||||||
|
|
||||||
--with-external-libbsc=<path to libbsc source tree>
|
|
||||||
Enable building with exernal libbsc sources. Can be used to link with
|
|
||||||
ASLv2 libbsc when using MPLv2 licensed sources.
|
|
||||||
|
|
||||||
--wavpack-dir=<path to WavPack source tree>
|
|
||||||
Points to the directory containing the WavPack sources. This option
|
|
||||||
must be specified if --disable-wavpack is not provided.
|
|
||||||
|
|
||||||
--disable-wavpack Disables the WavPack filter.
|
|
||||||
|
|
||||||
--no-sse-detect Do NOT attempt to probe the system's SSE capability for build flags.
|
|
||||||
Implies '--no-avx-detect' below.
|
|
||||||
|
|
||||||
--no-avx-detect Do NOT attempt to probe the system's AVX capability for build flags.
|
|
||||||
|
|
||||||
--no-1.3-archive-compat Disable compatibility with compressed archives created with Pcompress
|
|
||||||
version 1.3 (default: retain compatibility). Hash formats changed from
|
|
||||||
version 1.3 to 1.4 so this option is required if files created using
|
|
||||||
1.3 need to be decompressed by version 1.4 onwards.
|
|
||||||
|
|
||||||
--limit-key128 Limit key length to 128-bit encryption keys. Otherwise the default is to
|
|
||||||
use 256-bit keys changeable at runtime via the '-k <keylen>' option.
|
|
||||||
|
|
||||||
--help Display this help message.
|
|
||||||
|
|
||||||
Additional compilation flags can be passed to make like this:
|
|
||||||
make EXTRA_CPPFLAGS=<...> EXTRA_LDFLAGS=<...>
|
|
||||||
|
|
473
Makefile.in
473
Makefile.in
|
@ -1,473 +0,0 @@
|
||||||
#
|
|
||||||
# This file is a part of Pcompress, a chunked parallel multi-
|
|
||||||
# algorithm lossless compression and decompression program.
|
|
||||||
#
|
|
||||||
# Copyright (C) 2012-2013 Moinak Ghosh. All rights reserved.
|
|
||||||
# Use is subject to license terms.
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or
|
|
||||||
# modify it under the terms of the GNU Lesser General Public
|
|
||||||
# License as published by the Free Software Foundation; either
|
|
||||||
# version 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
|
|
||||||
# Lesser General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Lesser General Public
|
|
||||||
# License along with this program.
|
|
||||||
# If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
# moinakg@belenix.org, http://moinakg.wordpress.com/
|
|
||||||
#
|
|
||||||
|
|
||||||
PROG= pcompress
|
|
||||||
SO_SUFFIX=@SO_SUFFIX@
|
|
||||||
LIB=libpcompress.$(SO_SUFFIX)
|
|
||||||
LINKLIB=pcompress
|
|
||||||
GCC=@GCC@
|
|
||||||
GPP=@GPP@
|
|
||||||
LIBVER=1
|
|
||||||
MAINSRCS = utils/utils.c allocator.c lzma_compress.c ppmd_compress.c \
|
|
||||||
adaptive_compress.c lzfx_compress.c lz4_compress.c none_compress.c \
|
|
||||||
utils/xxhash_base.c utils/heap.c utils/cpuid.c filters/analyzer/analyzer.c \
|
|
||||||
meta_stream.c pcompress.c
|
|
||||||
MAINHDRS = allocator.h pcompress.h utils/utils.h utils/xxhash.h utils/heap.h \
|
|
||||||
utils/cpuid.h utils/xxhash.h archive/pc_archive.h filters/dispack/dis.hpp \
|
|
||||||
meta_stream.h filters/analyzer/analyzer.h
|
|
||||||
MAINOBJS = $(MAINSRCS:.c=.o)
|
|
||||||
|
|
||||||
PROGSRCS = main.c
|
|
||||||
PROGHDRS = pcompress.h utils/utils.h
|
|
||||||
PROGOBJS = $(PROGSRCS:.c=.o)
|
|
||||||
|
|
||||||
XSALSA20_STREAM_C = crypto/xsalsa20/stream.c
|
|
||||||
XSALSA20_STREAM_ASM = crypto/xsalsa20/stream.s
|
|
||||||
XSALSA20_DEBUG = -DSALSA20_DEBUG
|
|
||||||
|
|
||||||
CRYPTO_SRCS = crypto/aes/crypto_aes.c crypto/scrypt/crypto_scrypt-nosse.c \
|
|
||||||
crypto/scrypt/sha256.c crypto/scrypt/crypto_aesctr.c crypto/crypto_utils.c \
|
|
||||||
crypto/sha2_utils.c crypto/sha3_utils.c crypto/xsalsa20/xsalsa20_xor.c \
|
|
||||||
crypto/xsalsa20/hsalsa_core.c @XSALSA20_STREAM_C@
|
|
||||||
CRYPTO_HDRS = crypto/crypto_utils.h crypto/scrypt/crypto_scrypt.h \
|
|
||||||
crypto/scrypt/sha256.h crypto/scrypt/crypto_aesctr.h crypto/aes/crypto_aes.h \
|
|
||||||
crypto/sha2_utils.h crypto/sha3_utils.h crypto/xsalsa20/crypto_core_hsalsa20.h \
|
|
||||||
crypto/xsalsa20/crypto_stream_salsa20.h crypto/xsalsa20/crypto_xsalsa20.h \
|
|
||||||
$(MAINHDRS)
|
|
||||||
CRYPTO_ASM_SRCS = crypto/aes/vpaes-x86_64.s crypto/aes/aesni-x86_64.s @XSALSA20_STREAM_ASM@
|
|
||||||
CRYPTO_ASM_OBJS = $(CRYPTO_ASM_SRCS:.s=.o)
|
|
||||||
CRYPTO_ASM_HDRS = crypto/aes/crypto_aes.h crypto/xsalsa20/crypto_stream_salsa20.h
|
|
||||||
CRYPTO_COMPAT_SRCS = crypto/old/sha2_utils_old.c crypto/old/sha3_utils_old.c
|
|
||||||
CRYPTO_COMPAT_HDRS = crypto/old/sha2_utils_old.h crypto/old/sha3_utils_old.h
|
|
||||||
CRYPTO_OBJS = $(CRYPTO_SRCS:.c=.o)
|
|
||||||
CRYPTO_COMPAT_OBJS = $(CRYPTO_COMPAT_SRCS:.c=.o)
|
|
||||||
CRYPTO_CPPFLAGS=-I@OPENSSL_INCDIR@
|
|
||||||
|
|
||||||
XXHASH_SRCS = utils/xxhash.c
|
|
||||||
XXHASH_SSE4_SRCS = utils/xxhash_sse4.c
|
|
||||||
XXHASH_SSE2_SRCS = utils/xxhash_sse2.c
|
|
||||||
XXHASH_OBJS = utils/xxhash_sse4.o utils/xxhash_sse2.o
|
|
||||||
XXHASH_HDRS = utils/xxhash.h
|
|
||||||
|
|
||||||
BLAKE2b_SSE2 = crypto/blake2/blake2b_sse2.c
|
|
||||||
BLAKE2b_SSE3 = crypto/blake2/blake2b_ssse3.c
|
|
||||||
BLAKE2b_SSE4 = crypto/blake2/blake2b_sse41.c
|
|
||||||
BLAKE2b_AVX = crypto/blake2/blake2b_avx.c
|
|
||||||
BLAKE2bp_SSE2 = crypto/blake2/blake2bp_sse2.c
|
|
||||||
BLAKE2bp_SSE3 = crypto/blake2/blake2bp_ssse3.c
|
|
||||||
BLAKE2bp_SSE4 = crypto/blake2/blake2bp_sse41.c
|
|
||||||
BLAKE2bp_AVX = crypto/blake2/blake2bp_avx.c
|
|
||||||
BLAKE2_BASE_SRCS = crypto/blake2/blake2b.c crypto/blake2/blake2bp.c
|
|
||||||
BLAKE2_HDRS = crypto/blake2/blake2.h crypto/blake2/blake2-impl.h crypto/blake2/blake2-config.h \
|
|
||||||
crypto/blake2/blake2-kat.h crypto/blake2/blake2b-round.h crypto/blake2/blake2b-load-sse2.h \
|
|
||||||
crypto/blake2/blake2b-load-sse41.h
|
|
||||||
BLAKE2_SRCS = $(BLAKE2b_SSE2) $(BLAKE2b_SSE3) $(BLAKE2b_SSE4) $(BLAKE2b_AVX) \
|
|
||||||
$(BLAKE2bp_SSE2) $(BLAKE2bp_SSE3) $(BLAKE2bp_SSE4) $(BLAKE2bp_AVX)
|
|
||||||
BLAKE2_OBJS = $(BLAKE2_SRCS:.c=.o)
|
|
||||||
|
|
||||||
ZLIB_SRCS = zlib_compress.c
|
|
||||||
ZLIB_HDRS = $(MAINHDRS)
|
|
||||||
ZLIB_OBJS = $(ZLIB_SRCS:.c=.o)
|
|
||||||
ZLIB_CPPFLAGS = @LIBZ_INC@
|
|
||||||
|
|
||||||
BZLIB_SRCS = bzip2_compress.c
|
|
||||||
BZLIB_HDRS = $(MAINHDRS)
|
|
||||||
BZLIB_OBJS = $(BZLIB_SRCS:.c=.o)
|
|
||||||
BZLIB_CPPFLAGS = @LIBBZ2_INC@
|
|
||||||
|
|
||||||
RABINSRCS = rabin/rabin_dedup.c rabin/global/index.c rabin/global/dedupe_config.c
|
|
||||||
RABINHDRS = rabin/rabin_dedup.h utils/utils.h rabin/global/index.h rabin/global/dedupe_config.h lzma/lzma_crc.h utils/qsort.h
|
|
||||||
RABINOBJS = $(RABINSRCS:.c=.o)
|
|
||||||
|
|
||||||
BSDIFFSRCS = bsdiff/bsdiff.c bsdiff/bspatch.c bsdiff/rle_encoder.c
|
|
||||||
BSDIFFHDRS = bsdiff/bscommon.h utils/utils.h allocator.h
|
|
||||||
BSDIFFOBJS = $(BSDIFFSRCS:.c=.o)
|
|
||||||
|
|
||||||
LZMASRCS = lzma/LzmaEnc.c lzma/LzFind.c lzma/LzmaDec.c lzma/Threads.c lzma/LzFindMt.c
|
|
||||||
LZMAHDRS = lzma/CpuArch.h lzma/LzFind.h lzma/LzmaEnc.h lzma/Types.h \
|
|
||||||
lzma/LzHash.h lzma/LzmaDec.h utils/utils.h lzma/LzFindMt.h lzma/Threads.h lzma/windows.h \
|
|
||||||
lzma/Common/MyWindows.h lzma/Common/MyGuidDef.h lzma/basetyps.h
|
|
||||||
LZMAOBJS = $(LZMASRCS:.c=.o)
|
|
||||||
|
|
||||||
LZFXSRCS = lzfx/lzfx.c
|
|
||||||
LZFXHDRS = lzfx/lzfx.h
|
|
||||||
LZFXOBJS = $(LZFXSRCS:.c=.o)
|
|
||||||
|
|
||||||
LZ4SRCS = lz4/lz4.c lz4/lz4hc.c
|
|
||||||
LZ4HDRS = lz4/lz4.h lz4/lz4hc.h
|
|
||||||
LZ4OBJS = $(LZ4SRCS:.c=.o)
|
|
||||||
|
|
||||||
PPMDSRCS = lzma/Ppmd8.c lzma/Ppmd8Enc.c lzma/Ppmd8Dec.c
|
|
||||||
PPMDHDRS = lzma/Ppmd.h lzma/Ppmd8.h
|
|
||||||
PPMDOBJS = $(PPMDSRCS:.c=.o)
|
|
||||||
|
|
||||||
CRCSRCS = lzma/crc64_fast.c lzma/crc64_table.c lzma/crc32_fast.c lzma/crc32_table.c
|
|
||||||
CRCHDRS = lzma/crc64_table_le.h lzma/crc64_table_be.h lzma/crc_macros.h \
|
|
||||||
lzma/crc32_table_le.h lzma/crc32_table_be.h lzma/lzma_crc.h
|
|
||||||
CRCOBJS = $(CRCSRCS:.c=.o)
|
|
||||||
|
|
||||||
LZPSRCS = filters/lzp/lzp.c
|
|
||||||
LZPHDRS = filters/lzp/lzp.h
|
|
||||||
LZPOBJS = $(LZPSRCS:.c=.o)
|
|
||||||
|
|
||||||
DELTA2SRCS = filters/delta2/delta2.c
|
|
||||||
DELTA2HDRS = filters/delta2/delta2.h
|
|
||||||
DELTA2OBJS = $(DELTA2SRCS:.c=.o)
|
|
||||||
|
|
||||||
ARCHIVESRCS = archive/pc_archive.c archive/pc_arc_filter.c utils/phash/phash.c \
|
|
||||||
utils/phash/lookupa.c utils/phash/recycle.c
|
|
||||||
ARCHIVEHDRS = pcompress.h utils/utils.h archive/pc_archive.h utils/phash/standard.h \
|
|
||||||
utils/phash/lookupa.h utils/phash/recycle.h utils/phash/phash.h archive/pc_arc_filter.h \
|
|
||||||
utils/phash/extensions.h
|
|
||||||
ARCHIVEOBJS = $(ARCHIVESRCS:.c=.o)
|
|
||||||
|
|
||||||
PJPGSRCS = filters/packjpg/aricoder.cpp filters/packjpg/bitops.cpp filters/packjpg/packjpg.cpp \
|
|
||||||
archive/pjpg_helper.cpp
|
|
||||||
PJPGHDRS = filters/packjpg/aricoder.h filters/packjpg/bitops.h filters/packjpg/dct8x8.h \
|
|
||||||
filters/packjpg/packjpglib.h filters/packjpg/pjpgtbl.h
|
|
||||||
PJPGOBJS = $(PJPGSRCS:.cpp=.o)
|
|
||||||
|
|
||||||
PPNMSRCS = filters/packpnm/packpnm.cpp archive/ppnm_helper.cpp
|
|
||||||
PPNMHDRS = filters/packjpg/aricoder.h filters/packjpg/bitops.h filters/packpnm/ppnmbitlen.h \
|
|
||||||
filters/packpnm/packpnmlib.h filters/packpnm/ppnmtbl.h
|
|
||||||
PPNMOBJS = $(PPNMSRCS:.cpp=.o)
|
|
||||||
|
|
||||||
WAVPKSRCS = archive/wavpack_helper.c
|
|
||||||
WAVPKOBJS = $(WAVPKSRCS:.c=.o)
|
|
||||||
|
|
||||||
DISPACKSRCS = filters/dispack/dis.cpp archive/dispack_helper.cpp
|
|
||||||
DISPACKHDRS = filters/dispack/dis.hpp filters/dispack/types.hpp
|
|
||||||
DISPACKOBJS = $(DISPACKSRCS:.cpp=.o)
|
|
||||||
|
|
||||||
DICTSRCS = filters/dict/DictFilter.cpp
|
|
||||||
DICTHDRS = filters/dict/DictFilter.h filters/dict/Common.h
|
|
||||||
DICTOBJS = $(DICTSRCS:.cpp=.o)
|
|
||||||
|
|
||||||
SKEIN_BLOCK_C = crypto/skein/skein_block.c
|
|
||||||
SKEIN_BLOCK_ASM = crypto/skein/skein_block_x64.s
|
|
||||||
SKEIN_BLOCK_SRC = @SKEIN_BLOCK@
|
|
||||||
SKEIN_BLOCK_OBJ = crypto/skein/skein_block.o
|
|
||||||
SKEINSRCS = crypto/skein/SHA3api_ref.c crypto/skein/skein.c crypto/skein/skein_debug.c
|
|
||||||
SKEINHDRS = crypto/skein/brg_endian.h crypto/skein/SHA3api_ref.h \
|
|
||||||
crypto/skein/skein.h crypto/skein/skein_port.h crypto/skein/brg_types.h \
|
|
||||||
crypto/skein/skein_debug.h crypto/skein/skein_iv.h
|
|
||||||
SKEINOBJS = $(SKEINSRCS:.c=.o)
|
|
||||||
|
|
||||||
SHA2_SRCS = crypto/sha2/sha512.c
|
|
||||||
SHA2_HDRS = crypto/sha2/sha512.h
|
|
||||||
SHA2ASM_SRCS = crypto/sha2/intel/sha512_avx.asm crypto/sha2/intel/sha512_sse4.asm
|
|
||||||
SHA2ASM_OBJS = $(SHA2ASM_SRCS:.asm=.o)
|
|
||||||
SHA2_OBJS = $(SHA2_SRCS:.c=.o)
|
|
||||||
|
|
||||||
YASM = @YASM@
|
|
||||||
YASM_GAS = @YASM_GAS@
|
|
||||||
LIBBSCWRAP = libbsc_compress.c
|
|
||||||
LIBBSCWRAPOBJ = libbsc_compress.o
|
|
||||||
LIBBSCDIR = @LIBBSCDIR@
|
|
||||||
LIBBSCLFLAGS = -L$(LIBBSCDIR) -lbsc
|
|
||||||
LIBBSCLIB = @LIBBSCLIB@
|
|
||||||
LIBBSCGEN_OPT = -fopenmp
|
|
||||||
LIBBSCCPPFLAGS = -I$(LIBBSCDIR)/libbsc -DENABLE_PC_LIBBSC
|
|
||||||
|
|
||||||
TRANSP_SRCS = filters/transpose/transpose.c
|
|
||||||
TRANSP_HDRS = filters/transpose/transpose.h
|
|
||||||
TRANSP_OBJS = $(TRANSP_SRCS:.c=.o)
|
|
||||||
|
|
||||||
KECCAK_SRC_COMMON = crypto/keccak/genKAT.c crypto/keccak/KeccakDuplex.c \
|
|
||||||
crypto/keccak/KeccakNISTInterface.c crypto/keccak/KeccakSponge.c
|
|
||||||
KECCAK_SRC_OPT64 = $(KECCAK_SRC_COMMON) crypto/keccak/KeccakF-1600-opt64.c
|
|
||||||
KECCAK_SRC_OPT64_ASM1 = $(KECCAK_SRC_COMMON) crypto/keccak/KeccakF-1600-x86-64-asm.c
|
|
||||||
KECCAK_SRC_OPT64_ASM2 = crypto/keccak/KeccakF-1600-x86-64-gas.s
|
|
||||||
KECCAK_SRC_OPT64_ASM3 = crypto/keccak/KeccakF-1600-x86-64-gas_yasm.s
|
|
||||||
KECCAK_OBJS_OPT64_ASM2 = $(KECCAK_SRC_OPT64_ASM2:.s=.o)
|
|
||||||
KECCAK_OBJS_OPT64_ASM3 = $(KECCAK_SRC_OPT64_ASM3:.s=.o)
|
|
||||||
|
|
||||||
KECCAK_HDRS_COMMON = crypto/keccak/KeccakDuplex.h crypto/keccak/KeccakNISTInterface.h \
|
|
||||||
crypto/keccak/KeccakSponge.h crypto/keccak/KeccakF-1600-interface.h
|
|
||||||
KECCAK_HDRS_OPT = $(KECCAK_HDRS_COMMON) \
|
|
||||||
crypto/keccak/brg_endian.h crypto/keccak/KeccakF-1600-unrolling.macros
|
|
||||||
KECCAK_HDRS_OPT64 = $(KECCAK_HDRS_OPT) crypto/keccak/KeccakF-1600-opt64-settings.h \
|
|
||||||
crypto/keccak/KeccakF-1600-64.macros crypto/keccak/KeccakF-1600-simd64.macros \
|
|
||||||
crypto/keccak/KeccakF-1600-simd128.macros
|
|
||||||
KECCAK_HDRS_OPT64_ASM = $(KECCAK_HDRS_OPT64)
|
|
||||||
|
|
||||||
KECCAK_SRCS = @KECCAK_SRCS@
|
|
||||||
KECCAK_SRCS_ASM = @KECCAK_SRCS_ASM@
|
|
||||||
KECCAK_HDRS = @KECCAK_HDRS@
|
|
||||||
KECCAK_OBJS = $(KECCAK_SRCS:.c=.o)
|
|
||||||
KECCAK_OBJS_ASM = $(KECCAK_SRCS_ASM:.s=.o)
|
|
||||||
|
|
||||||
CRYPTO_ASM_COMPILE1 = $(COMPILE) $(GEN_OPT) $(CRYPTO_CPPFLAGS) $(CPPFLAGS)
|
|
||||||
CRYPTO_ASM_COMPILE2 = $(YASM_GAS)
|
|
||||||
CRYPTO_ASM_COMPILE = @CRYPTO_ASM_COMPILE@
|
|
||||||
|
|
||||||
BAKFILES = *~ lzma/*~ lzfx/*~ lz4/*~ rabin/*~ bsdiff/*~ filters/lzp/*~ utils/*~ crypto/sha2/*~ \
|
|
||||||
crypto/sha2/intel/*~ crypto/aes/*~ crypto/scrypt/*~ crypto/*~ rabin/global/*~ \
|
|
||||||
delta2/*~ crypto/keccak/*~ transpose/*~ crypto/skein/*~ crypto/keccak/*.o \
|
|
||||||
archive/*~ filters/delta2/*~ filters/packjpg/*~ filters/transpose/*~
|
|
||||||
|
|
||||||
RM = rm -f
|
|
||||||
RM_RF = rm -rf
|
|
||||||
BASE_CPPFLAGS = -I. -I./lzma -I./lzfx -I./lz4 -I./rabin -I./bsdiff -DNODEFAULT_PROPS \
|
|
||||||
-DFILE_OFFSET_BITS=64 -D_REENTRANT -D__USE_SSE_INTRIN__ -D_LZMA_PROB32 \
|
|
||||||
-I./filters/lzp @LIBBSCCPPFLAGS@ -I./crypto/skein -I./utils -I./crypto/sha2 \
|
|
||||||
-I./crypto/scrypt -I./crypto/aes -I./crypto @KEYLEN@ -I./rabin/global \
|
|
||||||
-I./crypto/keccak -I./filters/transpose -I./crypto/blake2 $(EXTRA_CPPFLAGS) \
|
|
||||||
-I./crypto/xsalsa20 -I./archive -pedantic -Wall -I./filters -fno-strict-aliasing \
|
|
||||||
-Wno-unused-but-set-variable -Wno-enum-compare -I./filters/analyzer -I./filters/dispack \
|
|
||||||
@COMPAT_CPPFLAGS@ @XSALSA20_DEBUG@ -I@LIBARCHIVE_DIR@/libarchive -I./filters/packjpg \
|
|
||||||
-I./filters/packpnm @ENABLE_WAVPACK@
|
|
||||||
COMMON_CPPFLAGS = $(BASE_CPPFLAGS) -std=gnu99
|
|
||||||
COMMON_CPPFLAGS_cpp = $(BASE_CPPFLAGS)
|
|
||||||
COMMON_VEC_FLAGS = -ftree-vectorize
|
|
||||||
COMMON_LOOP_OPTFLAGS = $(VEC_FLAGS) -floop-interchange -floop-block
|
|
||||||
RPATH=@RPATH@
|
|
||||||
DTAGS=@DTAGS@
|
|
||||||
LDLIBS = -ldl -L./buildtmp -Wl,$(RPATH)@LIBBZ2_DIR@ -lbz2 -L./buildtmp -Wl,$(RPATH)@LIBZ_DIR@ -lz -lm @LIBBSCLFLAGS@ \
|
|
||||||
-L./buildtmp -Wl,$(RPATH)@OPENSSL_LIBDIR@ -lcrypto @LRT@ -L@LIBARCHIVE_DIR@/.libs -larchive $(EXTRA_LDFLAGS) \
|
|
||||||
-Wl,$(RPATH)/usr/lib$(DTAGS) -Wl,$(RPATH)/usr/lib64$(DTAGS) @WAVPACK_LIBSPEC@
|
|
||||||
OBJS = $(MAINOBJS) $(LZMAOBJS) $(PPMDOBJS) $(LZFXOBJS) $(LZ4OBJS) $(CRCOBJS) \
|
|
||||||
$(RABINOBJS) $(BSDIFFOBJS) $(LZPOBJS) $(DELTA2OBJS) @LIBBSCWRAPOBJ@ $(SKEINOBJS) \
|
|
||||||
$(SKEIN_BLOCK_OBJ) @SHA2ASM_OBJS@ @SHA2_OBJS@ $(KECCAK_OBJS) $(KECCAK_OBJS_ASM) \
|
|
||||||
$(TRANSP_OBJS) $(CRYPTO_OBJS) $(ZLIB_OBJS) $(BZLIB_OBJS) $(XXHASH_OBJS) $(BLAKE2_OBJS) \
|
|
||||||
@CRYPTO_COMPAT_OBJS@ $(CRYPTO_ASM_OBJS) $(ARCHIVEOBJS) $(PJPGOBJS) $(DISPACKOBJS) $(PPNMOBJS) \
|
|
||||||
$(WAVPKOBJS) $(DICTOBJS)
|
|
||||||
|
|
||||||
DEBUG_LINK = $(GPP) -pthread @LIBBSCGEN_OPT@ @EXTRA_OPT_FLAGS@ -fopenmp -fPIC
|
|
||||||
DEBUG_COMPILE = $(GCC) -g -c @EXTRA_OPT_FLAGS@ -fPIC @USE_CLANG_AS@
|
|
||||||
DEBUG_COMPILE_cpp = $(GPP) -g -c @EXTRA_OPT_FLAGS@ -fPIC @USE_CLANG_AS@
|
|
||||||
DEBUG_VEC_FLAGS =
|
|
||||||
DEBUG_LOOP_OPTFLAGS =
|
|
||||||
DEBUG_GEN_OPT = -O -fno-omit-frame-pointer @LIBBSCGEN_OPT@ -fopenmp
|
|
||||||
DEBUG_CPPFLAGS = $(COMMON_CPPFLAGS)
|
|
||||||
DEBUG_FPTR_FLAG =
|
|
||||||
|
|
||||||
RELEASE_LINK = $(GPP) -pthread @LIBBSCGEN_OPT@ @EXTRA_OPT_FLAGS@ -fopenmp -fPIC
|
|
||||||
RELEASE_COMPILE = $(GCC) -c @EXTRA_OPT_FLAGS@ -fPIC -fvisibility=hidden @USE_CLANG_AS@
|
|
||||||
RELEASE_COMPILE_cpp = $(GPP) -c @EXTRA_OPT_FLAGS@ -fPIC -fvisibility=hidden @USE_CLANG_AS@
|
|
||||||
RELEASE_VEC_FLAGS = $(COMMON_VEC_FLAGS)
|
|
||||||
RELEASE_LOOP_OPTFLAGS = $(COMMON_LOOP_OPTFLAGS)
|
|
||||||
RELEASE_CPPFLAGS = $(COMMON_CPPFLAGS) -DNDEBUG
|
|
||||||
RELEASE_GEN_OPT = -O3 @LIBBSCGEN_OPT@ -fopenmp
|
|
||||||
RELEASE_FPTR_FLAG = -fomit-frame-pointer
|
|
||||||
|
|
||||||
NO_SLAB_CPPFLAGS = -DDEBUG_NO_SLAB
|
|
||||||
DEBUG_STATS_CPPFLAGS = -DDEBUG_STATS
|
|
||||||
|
|
||||||
LINK.PROG = @LINK@
|
|
||||||
LINK.LIB = @LINK@ -shared
|
|
||||||
COMPILE = @COMPILE@
|
|
||||||
COMPILE_cpp = @COMPILE_cpp@
|
|
||||||
VEC_FLAGS = @VEC_FLAGS@
|
|
||||||
LOOP_OPTFLAGS = @LOOP_OPTFLAGS@
|
|
||||||
CPPFLAGS = @CPPFLAGS@ @NO_SLAB_CPPFLAGS@ @DEBUG_STATS_CPPFLAGS@
|
|
||||||
GEN_OPT = @GEN_OPT@ @SSE_OPT_FLAGS@
|
|
||||||
BASE_OPT = @GEN_OPT@
|
|
||||||
PREFIX=@PREFIX@
|
|
||||||
AVX_OPT_FLAG = -mavx @USE_CLANG_AS@
|
|
||||||
SSE4_OPT_FLAG = -msse4.2 @USE_CLANG_AS@
|
|
||||||
SSE3_OPT_FLAG = -mssse3 @USE_CLANG_AS@
|
|
||||||
SSE2_OPT_FLAG = -msse2 @USE_CLANG_AS@
|
|
||||||
|
|
||||||
SKEIN_FLAGS = $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) @FPTR_FLAG@
|
|
||||||
SHA2_FLAGS = $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) @FPTR_FLAG@
|
|
||||||
KECCAK_FLAGS = $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) @FPTR_FLAG@
|
|
||||||
|
|
||||||
all: $(PROG)
|
|
||||||
|
|
||||||
$(LZMAOBJS): $(LZMASRCS) $(LZMAHDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(CRCOBJS): $(CRCSRCS) $(CRCHDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(PPMDOBJS): $(PPMDSRCS) $(PPMDHDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(RABINOBJS): $(RABINSRCS) $(RABINHDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(BSDIFFOBJS): $(BSDIFFSRCS) $(BSDIFFHDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(LZFXOBJS): $(LZFXSRCS) $(LZFXHDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(LZ4OBJS): $(LZ4SRCS) $(LZ4HDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(LZPOBJS): $(LZPSRCS) $(LZPHDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(DELTA2OBJS): $(DELTA2SRCS) $(DELTA2HDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(ARCHIVEOBJS): $(ARCHIVESRCS) $(ARCHIVEHDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(PJPGOBJS): $(PJPGSRCS) $(PJPGHDRS)
|
|
||||||
$(COMPILE_cpp) $(COMMON_VEC_FLAGS) @SSE_OPT_FLAGS@ @USE_CLANG_AS@ -O2 -fsched-spec-load \
|
|
||||||
$(VEC_FLAGS) -DBUILD_LIB $(COMMON_CPPFLAGS_cpp) $(@:.o=.cpp) -o $@
|
|
||||||
|
|
||||||
$(PPNMOBJS): $(PPNMSRCS) $(PPNMHDRS)
|
|
||||||
$(COMPILE_cpp) $(COMMON_VEC_FLAGS) @SSE_OPT_FLAGS@ @USE_CLANG_AS@ -O2 -fsched-spec-load \
|
|
||||||
$(VEC_FLAGS) -DBUILD_LIB $(COMMON_CPPFLAGS_cpp) $(@:.o=.cpp) -o $@
|
|
||||||
|
|
||||||
$(WAVPKOBJS): $(WAVPKSRCS)
|
|
||||||
[ "x@ENABLE_WAVPACK@" != "x" ] && (cd @WAVPACK_DIR@; make)
|
|
||||||
if [ "x@ENABLE_WAVPACK@" != "x" ]; then \
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) -I@WAVPACK_DIR@/include $(@:.o=.c) -o $@; \
|
|
||||||
else \
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
$(DISPACKOBJS): $(DISPACKSRCS) $(DISPACKHDRS)
|
|
||||||
$(COMPILE_cpp) $(COMMON_VEC_FLAGS) @DEBUG_STATS_CPPFLAGS@ @SSE_OPT_FLAGS@ @USE_CLANG_AS@ -O2 -fsched-spec-load \
|
|
||||||
-Wno-variadic-macros $(VEC_FLAGS) $(COMMON_CPPFLAGS_cpp) $(@:.o=.cpp) -o $@
|
|
||||||
|
|
||||||
$(DICTOBJS): $(DICTSRCS) $(DICTHDRS)
|
|
||||||
$(COMPILE_cpp) $(COMMON_VEC_FLAGS) @DEBUG_STATS_CPPFLAGS@ @SSE_OPT_FLAGS@ @USE_CLANG_AS@ -O2 -fsched-spec-load \
|
|
||||||
-Wno-variadic-macros $(VEC_FLAGS) $(COMMON_CPPFLAGS_cpp) $(@:.o=.cpp) -o $@
|
|
||||||
|
|
||||||
$(SKEIN_BLOCK_OBJ): $(SKEIN_BLOCK_SRC)
|
|
||||||
$(COMPILE) $(SKEIN_FLAGS) $(SKEIN_BLOCK_SRC) -o $@
|
|
||||||
|
|
||||||
$(SKEINOBJS): $(SKEINSRCS) $(SKEINHDRS)
|
|
||||||
$(COMPILE) $(SKEIN_FLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(SHA2_OBJS): $(SHA2_SRCS) $(SHA2_HDRS)
|
|
||||||
$(COMPILE) $(SHA2_FLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(SHA2ASM_OBJS): $(SHA2ASM_SRCS)
|
|
||||||
$(YASM) -o $@ $(@:.o=.asm)
|
|
||||||
|
|
||||||
$(KECCAK_OBJS): $(KECCAK_SRCS) $(KECCAK_HDRS)
|
|
||||||
$(COMPILE) $(KECCAK_FLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(KECCAK_OBJS_OPT64_ASM2): $(KECCAK_SRC_OPT64_ASM2)
|
|
||||||
$(COMPILE) $(KECCAK_FLAGS) $(@:.o=.s) -o $@
|
|
||||||
|
|
||||||
$(KECCAK_OBJS_OPT64_ASM3): $(KECCAK_SRC_OPT64_ASM3)
|
|
||||||
$(YASM_GAS) $(@:.o=.s) -o $@
|
|
||||||
|
|
||||||
$(KECCAK_OBJS_ASM): $(KECCAK_SRCS_ASM) $(KECCAK_HDRS)
|
|
||||||
|
|
||||||
$(LIBBSCWRAPOBJ): $(LIBBSCWRAP)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(TRANSP_OBJS): $(TRANSP_SRCS) $(TRANSP_HDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(VEC_FLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(CRYPTO_OBJS): $(CRYPTO_SRCS) $(CRYPTO_HDRS) $(CRYPTO_ASM_OBJS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(CRYPTO_CPPFLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(CRYPTO_ASM_OBJS): $(CRYPTO_ASM_SRCS) $(CRYPTO_ASM_HDRS)
|
|
||||||
$(CRYPTO_ASM_COMPILE) -o $@ $(@:.o=.s)
|
|
||||||
|
|
||||||
$(CRYPTO_COMPAT_OBJS): $(CRYPTO_COMPAT_SRCS) $(CRYPTO_COMPAT_HDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(CRYPTO_CPPFLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(ZLIB_OBJS): $(ZLIB_SRCS) $(ZLIB_HDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(ZLIB_CPPFLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(BZLIB_OBJS): $(BZLIB_SRCS) $(BZLIB_HDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(BZLIB_CPPFLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(XXHASH_OBJS): $(XXHASH_SSE4_SRCS) $(XXHASH_SSE2_SRCS) $(XXHASH_HDRS) $(XXHASH_SRCS)
|
|
||||||
$(COMPILE) $(BASE_OPT) $(SSE4_OPT_FLAG) $(CPPFLAGS) $(XXHASH_SSE4_SRCS) -o $(XXHASH_SSE4_SRCS:.c=.o)
|
|
||||||
$(COMPILE) $(BASE_OPT) $(SSE2_OPT_FLAG) $(CPPFLAGS) $(XXHASH_SSE2_SRCS) -o $(XXHASH_SSE2_SRCS:.c=.o)
|
|
||||||
|
|
||||||
$(BLAKE2_OBJS): $(BLAKE2_SRCS) $(BLAKE2_BASE_SRCS) $(BLAKE2_HDRS)
|
|
||||||
$(COMPILE) $(BASE_OPT) $(SSE2_OPT_FLAG) $(CPPFLAGS) $(BLAKE2b_SSE2) -o $(BLAKE2b_SSE2:.c=.o)
|
|
||||||
$(COMPILE) $(BASE_OPT) $(SSE3_OPT_FLAG) $(CPPFLAGS) $(BLAKE2b_SSE3) -o $(BLAKE2b_SSE3:.c=.o)
|
|
||||||
$(COMPILE) $(BASE_OPT) $(SSE4_OPT_FLAG) $(CPPFLAGS) $(BLAKE2b_SSE4) -o $(BLAKE2b_SSE4:.c=.o)
|
|
||||||
$(COMPILE) $(BASE_OPT) $(AVX_OPT_FLAG) $(CPPFLAGS) $(BLAKE2b_AVX) -o $(BLAKE2b_AVX:.c=.o)
|
|
||||||
$(COMPILE) $(BASE_OPT) $(SSE2_OPT_FLAG) $(CPPFLAGS) $(BLAKE2bp_SSE2) -o $(BLAKE2bp_SSE2:.c=.o)
|
|
||||||
$(COMPILE) $(BASE_OPT) $(SSE3_OPT_FLAG) $(CPPFLAGS) $(BLAKE2bp_SSE3) -o $(BLAKE2bp_SSE3:.c=.o)
|
|
||||||
$(COMPILE) $(BASE_OPT) $(SSE4_OPT_FLAG) $(CPPFLAGS) $(BLAKE2bp_SSE4) -o $(BLAKE2bp_SSE4:.c=.o)
|
|
||||||
$(COMPILE) $(BASE_OPT) $(AVX_OPT_FLAG) $(CPPFLAGS) $(BLAKE2bp_AVX) -o $(BLAKE2bp_AVX:.c=.o)
|
|
||||||
|
|
||||||
$(MAINOBJS): $(MAINSRCS) $(MAINHDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(LOOP_OPTFLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
$(PROGOBJS): $(PROGSRCS) $(PROGHDRS)
|
|
||||||
$(COMPILE) $(GEN_OPT) $(LOOP_OPTFLAGS) $(CPPFLAGS) $(@:.o=.c) -o $@
|
|
||||||
|
|
||||||
Libarchive:
|
|
||||||
(cd @LIBARCHIVE_DIR@; make)
|
|
||||||
|
|
||||||
$(LIBBSCLIB):
|
|
||||||
(cd $(LIBBSCDIR); make CC=$(GPP) OPTFLAGS="-O3 @SSE_OPT_FLAGS@ @USE_CLANG_AS@")
|
|
||||||
|
|
||||||
$(LIB): Libarchive $(OBJS) $(LIBBSCLIB)
|
|
||||||
$(LINK.LIB) -Wl,-soname$(LIB).$(LIBVER) -o $(LIB).$(LIBVER) $(OBJS) $(LDLIBS)
|
|
||||||
ln -sf $(LIB).$(LIBVER) $(LIB)
|
|
||||||
|
|
||||||
./buildtmp/$(PROG):
|
|
||||||
mkdir -p buildtmp
|
|
||||||
$(LINK.PROG) -o $@ $(PROGOBJS) $(LDLIBS) -L. -l$(LINKLIB)
|
|
||||||
|
|
||||||
$(PROG): $(LIB) $(PROGOBJS) ./buildtmp/$(PROG)
|
|
||||||
cat utils/pcompress.sh | sed "s#<PC_PATH>#`pwd`#" > pcompress
|
|
||||||
chmod +x pcompress
|
|
||||||
|
|
||||||
test: all
|
|
||||||
(cd test; ulimit -c unlimited; sh ./run_test.sh $(TESTSUITE) ) 2>&1 | tee test.log
|
|
||||||
|
|
||||||
topclean:
|
|
||||||
$(RM) buildtmp/$(PROG) $(OBJS) $(PROGOBJS) $(BAKFILES) $(LIB) $(LIB).$(LIBVER)
|
|
||||||
$(RM) test.log
|
|
||||||
$(RM_RF) test/datafiles
|
|
||||||
|
|
||||||
clean: topclean
|
|
||||||
(cd @LIBARCHIVE_DIR@; make clean)
|
|
||||||
[ "x@ENABLE_WAVPACK@" != "x" ] && (cd @WAVPACK_DIR@; make clean)
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
distclean: clean
|
|
||||||
$(RM) Makefile
|
|
||||||
(cd $(LIBBSCDIR); make clean)
|
|
||||||
$(RM_RF) buildtmp
|
|
||||||
(cd @LIBARCHIVE_DIR@; make distclean; rm -rf Makefile.orig tar test test_utils cpio libarchive/test)
|
|
||||||
[ "x@ENABLE_WAVPACK@" != "x" ] && (cd @WAVPACK_DIR@; make distclean)
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
install: $(PROG)
|
|
||||||
@mkdir -p $(DESTDIR)$(PREFIX)/bin
|
|
||||||
@chmod 0755 $(DESTDIR)$(PREFIX)/bin
|
|
||||||
@cp buildtmp/$(PROG) $(DESTDIR)$(PREFIX)/bin
|
|
||||||
@chmod 0555 $(DESTDIR)$(PREFIX)/bin/$(PROG)
|
|
||||||
|
|
||||||
@mkdir -p $(DESTDIR)$(PREFIX)/lib
|
|
||||||
@chmod 0755 $(DESTDIR)$(PREFIX)/lib
|
|
||||||
@cp $(LIB).$(LIBVER) $(DESTDIR)$(PREFIX)/lib
|
|
||||||
@chmod 0555 $(DESTDIR)$(PREFIX)/lib/$(LIB).$(LIBVER)
|
|
||||||
@ln -sf $(LIB).$(LIBVER) $(DESTDIR)$(PREFIX)/lib/$(LIB)
|
|
||||||
|
|
||||||
@mkdir -p $(DESTDIR)$(PREFIX)/share/doc/$(PROG)
|
|
||||||
@chmod 0755 $(DESTDIR)$(PREFIX)/share $(DESTDIR)$(PREFIX)/share/doc $(DESTDIR)$(PREFIX)/share/doc/$(PROG)
|
|
||||||
@cp README.md $(DESTDIR)$(PREFIX)/share/doc/$(PROG)/README
|
|
||||||
@chmod 0444 $(DESTDIR)$(PREFIX)/share/doc/$(PROG)/README
|
|
||||||
|
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
######### LICENSING NOTE ##########
|
|
||||||
Pcompress is dual licensed under GNU Lesser General Public License V3 and
|
|
||||||
also under the Mozilla Public License V2.
|
|
||||||
|
|
||||||
Normally the default license that applies is the GNU LGPLv3. However it is
|
|
||||||
possible to create an alternate source tree that is licensed under the MPLv2
|
|
||||||
by running the following at the top of the source tree:
|
|
||||||
|
|
||||||
ksh make_mplv2.ksh
|
|
||||||
|
|
||||||
NOTE that most of Pcompress is covered under MPLv2. However a couple of
|
|
||||||
third party components like LZP and PackJPG use LGPLv2/3 upstream license
|
|
||||||
and are omitted in the MPLv2 variant.
|
|
||||||
|
|
510
README.md
510
README.md
|
@ -1,510 +0,0 @@
|
||||||
Pcompress
|
|
||||||
=========
|
|
||||||
|
|
||||||
Copyright (C) 2012-2013 Moinak Ghosh. All rights reserved.
|
|
||||||
Use is subject to license terms.
|
|
||||||
moinakg (_at) gma1l _dot com.
|
|
||||||
Comments, suggestions, code, rants etc are welcome.
|
|
||||||
|
|
||||||
Pcompress is an archiver that also does compression and decompression in
|
|
||||||
parallel by splitting input data into chunks. It has a modular structure
|
|
||||||
and includes support for multiple algorithms like LZMA, Bzip2, PPMD, etc,
|
|
||||||
with SKEIN/SHA checksums for data integrity. Compression algorithms are
|
|
||||||
selected based on the file type to maximize compression gains using a file
|
|
||||||
and data anaylis based adaptive technique. It also includes various data
|
|
||||||
transformation filters to improve compression.
|
|
||||||
|
|
||||||
It also implements Variable Block Deduplication and Delta Compression
|
|
||||||
features based on a Polynomial Fingerprinting scheme. Delta Compression
|
|
||||||
is done via the widely popular bsdiff algorithm. Similarity is detected
|
|
||||||
using a technique based on MinHashing. Deduplication metadata is also
|
|
||||||
compressed to reduce overheads. In addition to all these it can internally
|
|
||||||
split chunks at file and rabin boundaries to help Dedupe and compression.
|
|
||||||
|
|
||||||
It has low metadata overhead and overlaps I/O and compression to achieve
|
|
||||||
maximum parallelism. It also bundles a simple slab allocator to speed
|
|
||||||
repeated allocation of similar chunks. It can work in pipe mode, reading
|
|
||||||
from stdin and writing to stdout. SIMD vector optimizations using the x86
|
|
||||||
SSE instruction set are used to speed up various operations. Finally it
|
|
||||||
supports 14 compression levels to allow for ultra compression parameters
|
|
||||||
in some algorithms.
|
|
||||||
|
|
||||||
Pcompress also supports encryption via AES, Salsa20 and uses Scrypt from
|
|
||||||
Tarsnap for Password Based Key generation. A unique key is generated per
|
|
||||||
session even if the same password is used and HMAC is used to do authentication.
|
|
||||||
|
|
||||||
LICENSING
|
|
||||||
=========
|
|
||||||
|
|
||||||
Pcompress is dual licensed with LGPLv3 and MPLv2 sources. The main git
|
|
||||||
repository is LGPL licensed. A separate tarball of the sources with
|
|
||||||
MPLv2 license is made available as a download. This is updated
|
|
||||||
periodically. Since Pcompress also integrates a bunch of third-party
|
|
||||||
software a few features may be missing in the MPLv2 licensed version
|
|
||||||
because of the upstream software being LGPL licensed originally.
|
|
||||||
|
|
||||||
Links of Interest
|
|
||||||
=================
|
|
||||||
|
|
||||||
Project Home Page: http://moinakg.github.io/pcompress/
|
|
||||||
|
|
||||||
http://moinakg.github.io/pcompress/#deduplication-chunking-analysis
|
|
||||||
|
|
||||||
http://moinakg.github.io/pcompress/#compression-benchmarks
|
|
||||||
|
|
||||||
http://moinakg.wordpress.com/2013/04/26/pcompress-2-0-with-global-deduplication/
|
|
||||||
|
|
||||||
http://moinakg.wordpress.com/2013/03/26/coordinated-parallelism-using-semaphores/
|
|
||||||
|
|
||||||
http://moinakg.wordpress.com/2013/06/11/architecture-for-a-deduplicated-archival-store-part-1/
|
|
||||||
|
|
||||||
http://moinakg.wordpress.com/2013/06/15/architecture-for-a-deduplicated-archival-store-part-2/
|
|
||||||
|
|
||||||
Standard Usage
|
|
||||||
==============
|
|
||||||
Standard usage consists of a few common options to control basic behavior. A variety of
|
|
||||||
parameters including global deduplication are automatically set based on the compression
|
|
||||||
level.
|
|
||||||
|
|
||||||
Archiving
|
|
||||||
---------
|
|
||||||
pcompress -a [-v] [-l <compress level>] [-s <chunk size>] [-c <algorithm>]
|
|
||||||
[<file1> <directory1> <file2> ...] [-t <number>] [-S <chunk checksum>]
|
|
||||||
<archive filename or '-'>
|
|
||||||
|
|
||||||
Archives a given set of files and/or directories into a compressed PAX archive. The
|
|
||||||
PAX datastream is encoded into a custom format compressed file that can only be
|
|
||||||
handled by Pcompress.
|
|
||||||
|
|
||||||
-a Enables archive mode where pathnames specified in the command line are
|
|
||||||
archived using LibArchive and then compressed.
|
|
||||||
|
|
||||||
-l <compress level>
|
|
||||||
Select a compression level from 1 (least compression, fastest) to 14
|
|
||||||
(ultra compression, slow). Default: 6
|
|
||||||
|
|
||||||
-s <chunk size>
|
|
||||||
Archive data is split into chunks that are processed in parallel. This value
|
|
||||||
specifies the maximum chunk size. Blocks may be smaller than this. Values
|
|
||||||
can be in bytes or <number><suffix> format where suffix can be k - KB, m - MB,
|
|
||||||
g - GB. Default: 8m
|
|
||||||
Larger chunks can produce better compression at the cost of memory.
|
|
||||||
|
|
||||||
-c <algorithm>
|
|
||||||
Specifies the compression algorithm to use. Default algorithm when archiving
|
|
||||||
is adapt2 (Second Adaptive Mode). This is the ideal mode for archiving giving
|
|
||||||
best compression gains. However adapt (Adaptive Mode) can be used which is a
|
|
||||||
little faster but give lower compression gains.
|
|
||||||
Other algorithms can be used if all the files are of the same known type. For
|
|
||||||
example ppmd (slow) or libbsc (fast) can be used if all the files only have
|
|
||||||
ASCII text. See section "Compression Algorithms" for details.
|
|
||||||
|
|
||||||
-v Enables verbose mode where each file/directory is printed as it is processed.
|
|
||||||
|
|
||||||
-t <number>
|
|
||||||
Sets the number of threads that Pcompress can use. Pcompress automatically
|
|
||||||
uses thread count = core count. However with larger chunk size (-s option)
|
|
||||||
and/or ultra compression levels, large amounts of memory can be used. In this
|
|
||||||
case thread count can be reduced to reduce memory consumption.
|
|
||||||
|
|
||||||
-S <chunk checksum>
|
|
||||||
Specify then chunk checksum to use. Default: BLAKE256. The following checksums
|
|
||||||
are available:
|
|
||||||
|
|
||||||
CRC64 - Extremely Fast 64-bit CRC from LZMA SDK.
|
|
||||||
SHA256 - SHA512/256 version of Intel's optimized (SSE,AVX) SHA2 for x86.
|
|
||||||
SHA512 - SHA512 version of Intel's optimized (SSE,AVX) SHA2 for x86.
|
|
||||||
KECCAK256 - Official 256-bit NIST SHA3 optimized implementation.
|
|
||||||
KECCAK512 - Official 512-bit NIST SHA3 optimized implementation.
|
|
||||||
BLAKE256 - Very fast 256-bit BLAKE2, derived from the NIST SHA3
|
|
||||||
runner-up BLAKE.
|
|
||||||
BLAKE512 - Very fast 256-bit BLAKE2, derived from the NIST SHA3
|
|
||||||
runner-up BLAKE.
|
|
||||||
|
|
||||||
The fastest checksum is the BLAKE2 family.
|
|
||||||
|
|
||||||
-T
|
|
||||||
Disable Metadata Streams. Pathname metadata is normally packed into separate
|
|
||||||
chunks distinct from file data. With this option this behavior is disabled.
|
|
||||||
|
|
||||||
<archive filename>
|
|
||||||
Pathname of the resulting archive. A '.pz' extension is automatically added
|
|
||||||
if not already present. This can also be specified as '-' in order to send
|
|
||||||
the compressed archive stream to stdout.
|
|
||||||
|
|
||||||
Single File Compression
|
|
||||||
-----------------------
|
|
||||||
pcompress -c <algorithm> [-l <compress level>] [-s <chunk size>] [-p] [<file>]
|
|
||||||
[-t <number>] [-S <chunk checksum>] [<target file or '-'>]
|
|
||||||
|
|
||||||
Takes a single file as input and produces a compressed file. Archiving is not performed.
|
|
||||||
This can also work in streaming mode.
|
|
||||||
|
|
||||||
-c <algorithm>
|
|
||||||
See above. Also see section "Compression Algorithms" for details.
|
|
||||||
|
|
||||||
-l <compress level>
|
|
||||||
-s <chunk size>
|
|
||||||
-t <number>
|
|
||||||
-S <chunk checksum>
|
|
||||||
See above.
|
|
||||||
Note: In singe file compression mode with adapt2 or adapt algorithm, larger
|
|
||||||
chunks may not produce better compression. Smaller chunks can result
|
|
||||||
in better data analysis here.
|
|
||||||
|
|
||||||
-p Make Pcompress work in streaming mode. Data is ingested via stdin
|
|
||||||
compressed and output via stdout. No filenames are used.
|
|
||||||
|
|
||||||
<target file>
|
|
||||||
Pathname of the compressed file to be created. This can be '-' to send the
|
|
||||||
compressed data to stdout.
|
|
||||||
|
|
||||||
Decompression and Archive extraction
|
|
||||||
------------------------------------
|
|
||||||
pcompress -d <compressed file or '-'> [-m] [-K] [-i] [<target file or directory>]
|
|
||||||
|
|
||||||
-m Enable restoring *all* permissions, ACLs, Extended Attributes etc.
|
|
||||||
Equivalent to the '-p' option in tar. Ownership is only extracted if run as
|
|
||||||
root user.
|
|
||||||
-K Do not overwrite newer files.
|
|
||||||
-i Only list contents of the archive, do not extract.
|
|
||||||
|
|
||||||
-m and -K are only meaningful if the compressed file is an archive. For single file
|
|
||||||
compressed mode these options are ignored.
|
|
||||||
|
|
||||||
<compressed file>
|
|
||||||
Specifies the compressed file or archive. This can be '-' to indicate reading
|
|
||||||
from stdin while write goes to <target file>
|
|
||||||
|
|
||||||
<target file or directory>
|
|
||||||
This can be a filename or a directory depending on how the archive was created.
|
|
||||||
If single file compression was used then this can be the name of the target
|
|
||||||
file that will hold the uncompressed data.
|
|
||||||
If this is omitted then an output file is created by appending '.out' to the
|
|
||||||
compressed filename.
|
|
||||||
|
|
||||||
If Archiving was done then this should be the name of a directory into which
|
|
||||||
extracted files are restored. The directory is created if it does not exist.
|
|
||||||
If this is omitted the files are extracted into the current directory.
|
|
||||||
|
|
||||||
Compression Algorithms
|
|
||||||
======================
|
|
||||||
|
|
||||||
lzfx - Fast, average compression. At high compression levels this can be faster
|
|
||||||
than LZ4.
|
|
||||||
Effective Levels: 1 - 5
|
|
||||||
lz4 - Very Fast, sometimes better compression than LZFX.
|
|
||||||
Effective Levels: 1 - 3
|
|
||||||
zlib - Fast, better compression.
|
|
||||||
Effective Levels: 1 - 9
|
|
||||||
bzip2 - Slow, much better compression than Zlib.
|
|
||||||
Effective Levels: 1 - 9
|
|
||||||
|
|
||||||
lzma - Very slow. Extreme compression. Recommended: Use lzmaMt variant mentioned
|
|
||||||
below.
|
|
||||||
Effective Levels: 1 - 14
|
|
||||||
Till level 9 it is standard LZMA parameters. Levels 10 - 12 use
|
|
||||||
more memory and higher match iterations so are slower. Levels
|
|
||||||
13 and 14 use larger dictionaries upto 256MB and really suck up
|
|
||||||
RAM. Use these levels only if you have at the minimum 4GB RAM on
|
|
||||||
your system.
|
|
||||||
lzmaMt - This is the multithreaded variant of lzma and typically runs faster.
|
|
||||||
However in a few cases this can produce slightly lesser compression
|
|
||||||
gain.
|
|
||||||
|
|
||||||
libbsc - This is a new block-sorting compressor having much better effectiveness
|
|
||||||
and performance over a variety of data types as compared to Bzip2.
|
|
||||||
NOTE: In the LGPL licensed version libbsc is an integral part of Pcompress.
|
|
||||||
When building MPLv2 licensed sources, the libbsc sources must be
|
|
||||||
downloaded separately and linked in. This is described in the INSTALL file.
|
|
||||||
|
|
||||||
PPMD - Slow. Extreme compression for Text, average compression for binary.
|
|
||||||
In addition PPMD decompression time is also high for large chunks.
|
|
||||||
This requires lots of RAM similar to LZMA. PPMd requires
|
|
||||||
at least 64MB X core-count more memory than the other modes.
|
|
||||||
Effective Levels: 1 - 14.
|
|
||||||
|
|
||||||
Adapt - Synthetic mode with text/binary detection. For pure text data PPMD is
|
|
||||||
used otherwise Bzip2 is selected per chunk.
|
|
||||||
Effective Levels: 1 - 14
|
|
||||||
Adapt2 - Slower synthetic mode. For pure text data PPMD is otherwise LZMA is
|
|
||||||
applied. Can give very good compression ratio when splitting file
|
|
||||||
into multiple chunks.
|
|
||||||
Effective Levels: 1 - 14
|
|
||||||
Since both LZMA and PPMD are used together memory requirements are
|
|
||||||
large especially if you are also using extreme levels above 10. For
|
|
||||||
example with 100MB chunks, Level 14, 2 threads and with or without
|
|
||||||
dedupe, it uses upto 2.5GB physical RAM (RSS).
|
|
||||||
|
|
||||||
none - No compression. This is only meaningful with -G or -D. So Dedupe
|
|
||||||
can be done for post-processing with an external utility.
|
|
||||||
|
|
||||||
Enabled features based on Compression Level
|
|
||||||
===========================================
|
|
||||||
|
|
||||||
1 to 3 - No features, just compression and archiving, if needed.
|
|
||||||
4 - Global Deduplication with avg block size of 8KB.
|
|
||||||
5 - Global Dedup block size 8KB, Adaptive Delta Encoding.
|
|
||||||
6 to 8 - Global Dedup block size reduced to 4KB, Adaptive Delta Encoding.
|
|
||||||
9 - Global Dedup block size reduced to 2KB, Adaptive Delta Encoding, Dispack.
|
|
||||||
10 - Global Dedup block size 2KB, Adaptive Delta Encoding with extra rounds, Dispack,
|
|
||||||
LZP Preprocessing
|
|
||||||
10 - 14 - Global Dedup block size 2KB, Adaptive Delta Encoding with extra rounds, Dispack,
|
|
||||||
LZP Preprocessing, PackJPG filter for Jpegs.
|
|
||||||
|
|
||||||
NOTE: - LZP Preprocessing and PackJPG are not available in the MPLv2 licensed version.
|
|
||||||
|
|
||||||
Encryption
|
|
||||||
==========
|
|
||||||
Pcompress supports encryption and authentication in both archive and single-file
|
|
||||||
compresion modes. Encryption options are discussed below.
|
|
||||||
|
|
||||||
NOTE: When using pipe-mode via -p the only way to provide a password is to use '-w'.
|
|
||||||
See below.
|
|
||||||
|
|
||||||
-e <ALGO>
|
|
||||||
Encrypt chunks using the given encryption algorithm. The algo parameter
|
|
||||||
can be one of AES or SALSA20. Both are used in CTR stream encryption
|
|
||||||
mode.
|
|
||||||
The password can be prompted from the user or read from a file. Unique
|
|
||||||
keys are generated every time pcompress is run even when giving the same
|
|
||||||
password. Of course enough info is stored in the compresse file so that
|
|
||||||
the key used for the file can be re-created given the correct password.
|
|
||||||
|
|
||||||
Default key length if 256 bits but can be reduced to 128 bits using the
|
|
||||||
'-k' option.
|
|
||||||
|
|
||||||
The Scrypt algorithm from Tarsnap is used
|
|
||||||
(See: http://www.tarsnap.com/scrypt.html) for generating keys from
|
|
||||||
passwords. The CTR mode AES mechanism from Tarsnap is also utilized.
|
|
||||||
|
|
||||||
-w <pathname>
|
|
||||||
Provide a file which contains the encryption password. This file must
|
|
||||||
be readable and writable since it is zeroed out after the password is
|
|
||||||
read.
|
|
||||||
|
|
||||||
-k <key length>
|
|
||||||
Specify the key length. Can be 16 for 128 bit keys or 32 for 256 bit
|
|
||||||
keys. Default value is 32 for 256 bit keys.
|
|
||||||
|
|
||||||
|
|
||||||
Advanced usage
|
|
||||||
==============
|
|
||||||
A variety of advanced options are provided if one wishes fine grained control
|
|
||||||
as opposed to automatic settings. If advanced options are used then auto-setting
|
|
||||||
of parameters get disabled. The various advanced options are discussed below.
|
|
||||||
|
|
||||||
Chunk-level Deduplication
|
|
||||||
-------------------------
|
|
||||||
Attempt Polynomial fingerprinting based deduplication on a per-chunk basis:
|
|
||||||
pcompress -D ...
|
|
||||||
|
|
||||||
Perform Delta Encoding in addition to Identical Dedup:
|
|
||||||
pcompress -E ... - This also implies '-D'. This performs Delta Compression
|
|
||||||
between 2 blocks if they are 40% to 60% similar. The
|
|
||||||
similarity %age is selected based on the dedupe block
|
|
||||||
size to balance performance and effectiveness.
|
|
||||||
pcompress -EE .. - This causes Delta Compression to happen if 2 blocks are
|
|
||||||
at least 40% similar regardless of block size. This can
|
|
||||||
effect greater final compression ratio at the cost of
|
|
||||||
higher processing overhead.
|
|
||||||
|
|
||||||
-F Perform Fixed Block Deduplication. This is faster than fingerprinting
|
|
||||||
based content-aware deduplication in some cases. However this is mostly
|
|
||||||
usable for disk dumps especially virtual machine images. This generally
|
|
||||||
gives lower dedupe ratio than content-aware dedupe (-D) and does not
|
|
||||||
support delta compression.
|
|
||||||
|
|
||||||
Global Deduplication
|
|
||||||
--------------------
|
|
||||||
-G This flag enables Global Deduplication. This makes pcompress maintain an
|
|
||||||
in-memory index to lookup cryptographic block hashes for duplicates. Once
|
|
||||||
a duplicate is found it is replaced with a reference to the original block.
|
|
||||||
This allows detecting and eliminating duplicate blocks across the entire
|
|
||||||
dataset. In contrast using only '-D' or '-F' flags does deduplication only
|
|
||||||
within the chunk but uses less memory and is much faster than Global Dedupe.
|
|
||||||
|
|
||||||
The '-G' flag can be combined with either '-D' or '-F' flags to indicate
|
|
||||||
rabin chunking or fixed chunking respectively. If these flags are not
|
|
||||||
specified then the default is to assume rabin chunking via '-D'.
|
|
||||||
All other Dedupe flags have the same meanings in this context.
|
|
||||||
|
|
||||||
Delta Encoding is not supported with Global Deduplication at this time. The
|
|
||||||
in-memory hashtable index can use upto 75% of free RAM depending on the size
|
|
||||||
of the dataset. In Pipe mode the index will always use 75% of free RAM since
|
|
||||||
the dataset size is not known. This is the simple full block index mode. If
|
|
||||||
the available RAM is not enough to hold all block checksums then older block
|
|
||||||
entries are discarded automatically from the matching hash slots.
|
|
||||||
|
|
||||||
If pipe mode is not used and the given dataset is a file then Pcompress
|
|
||||||
checks whether the index size will exceed three times of 75% of the available
|
|
||||||
free RAM. In such a case it automatically switches to a Segmented Deduplication
|
|
||||||
mode. Here data is first split into blocks as above. Then upto 2048 blocks are
|
|
||||||
grouped together to form a larger segment. The individual block hashes for a
|
|
||||||
segment are stored on a tempfile on disk. A few min-values hashes are then
|
|
||||||
computed from the block hashes of the segment which are then loaded into the
|
|
||||||
index. These hashes are used to detect segments that are approximately similar
|
|
||||||
to each other. Once found the block hashes of the matching segments are loaded
|
|
||||||
from the temp file and actual deduplication is performed. This allows the
|
|
||||||
in-memory index size to be approximately 0.0025% of the total dataset size and
|
|
||||||
requires very few disk reads for every 2048 blocks processed.
|
|
||||||
|
|
||||||
In pipe mode Global Deduplication always uses a segmented similarity based
|
|
||||||
index. It allows efficient network transfer of large data.
|
|
||||||
|
|
||||||
-B <0..5>
|
|
||||||
Specify an average Dedupe block size. 0 - 2K, 1 - 4K, 2 - 8K ... 5 - 64K.
|
|
||||||
Default deduplication block size is 4KB for Global Deduplication and 2KB
|
|
||||||
otherwise.
|
|
||||||
-B 0
|
|
||||||
This uses blocks as small as 2KB for deduplication. This option can be
|
|
||||||
used for datasets of a few GBs to a few hundred TBs in size depending on
|
|
||||||
available RAM.
|
|
||||||
|
|
||||||
-L Enable LZP pre-compression. This improves compression ratio of all
|
|
||||||
algorithms with some extra CPU and very low RAM overhead. Using
|
|
||||||
delta encoding in conjunction with this may not always be beneficial.
|
|
||||||
However Adaptive Delta Encoding is beneficial along with this.
|
|
||||||
|
|
||||||
-P Enable Adaptive Delta Encoding. It can improve compresion ratio further
|
|
||||||
for data containing tables of numerical values especially if those are
|
|
||||||
in an arithmetic series. In this implementation basic Delta Encoding is
|
|
||||||
combined with Run-Length encoding and Matrix transpose
|
|
||||||
NOTE - Both -L and -P can be used together to give maximum benefit on most
|
|
||||||
datasets.
|
|
||||||
|
|
||||||
-x Perform Dispack Encoding. This is useful to translate x86 call and jmp
|
|
||||||
relative offsets to absolute values which compress better. The given
|
|
||||||
chunk is split into 32KB blocks and some heuristics are used per block
|
|
||||||
to identify whether it represents x86 instruction stream or not. This
|
|
||||||
works only when archiving.
|
|
||||||
|
|
||||||
-j Enable PackJPG processing for Jpeg files. This works only when archiving.
|
|
||||||
|
|
||||||
-M Display memory allocator statistics.
|
|
||||||
-C Display compression statistics.
|
|
||||||
-CC Display compression statistics and print the offset and length of each
|
|
||||||
variable length dedupe block if variable block deduplication is being
|
|
||||||
used. This has no effect for fixed block deduplication.
|
|
||||||
|
|
||||||
Environment Variables
|
|
||||||
=====================
|
|
||||||
|
|
||||||
Set ALLOCATOR_BYPASS=1 in the environment to avoid using the the built-in
|
|
||||||
allocator. Due to the the way it rounds up an allocation request to the nearest
|
|
||||||
slab the built-in allocator can allocate extra unused memory. In addition you
|
|
||||||
may want to use a different allocator in your environment.
|
|
||||||
|
|
||||||
The variable PCOMPRESS_INDEX_MEM can be set to limit memory used by the Global
|
|
||||||
Deduplication Index. The number specified is in multiples of a megabyte.
|
|
||||||
|
|
||||||
The variable PCOMPRESS_CACHE_DIR can point to a directory where some temporary
|
|
||||||
files relating to the Global Deduplication process can be stored. This for example
|
|
||||||
can be a directory on a Solid State Drive to speed up Global Deduplication. The
|
|
||||||
space used in this directory is proportional to the size of the dataset being
|
|
||||||
processed and is slightly more than 8KB for every 1MB of data.
|
|
||||||
|
|
||||||
The default checksum used for block hashes during Global Deduplication is SHA256.
|
|
||||||
However this can be changed by setting the PCOMPRESS_CHUNK_HASH_GLOBAL environment
|
|
||||||
variable. The list of allowed checksums for this is:
|
|
||||||
|
|
||||||
SHA256 , SHA512
|
|
||||||
KECCAK256, KECCAK512
|
|
||||||
BLAKE256 , BLAKE512
|
|
||||||
SKEIN256 , SKEIN512
|
|
||||||
|
|
||||||
Even though SKEIN is not supported as a chunk checksum (not deemed necessary
|
|
||||||
because BLAKE2 is available) it can be used as a dedupe block checksum. One may
|
|
||||||
ask why? The reasoning is we depend on hashes to find duplicate blocks. Now SHA256
|
|
||||||
is the default because it is known to be robust and unbroken till date. Proven as
|
|
||||||
yet in the field. However one may want a faster alternative so we have choices
|
|
||||||
from the NIST SHA3 finalists in the form of SKEIN and BLAKE which are neck to
|
|
||||||
neck with SKEIN getting an edge. SKEIN and BLAKE have seen extensive cryptanalysis
|
|
||||||
in the intervening years and are unbroken with only marginal theoretical issues
|
|
||||||
determined. BLAKE2 is a derivative of BLAKE and is tremendously fast but has not
|
|
||||||
seen much specific cryptanalysis as yet, even though it is not new but just a
|
|
||||||
performance optimized derivate. So cryptanalysis that applies to BLAKE should
|
|
||||||
also apply and justify BLAKE2. However the paranoid may well trust SKEIN a bit
|
|
||||||
more than BLAKE2 and SKEIN while not being as fast as BLAKE2 is still a lot faster
|
|
||||||
than SHA2.
|
|
||||||
|
|
||||||
Examples
|
|
||||||
========
|
|
||||||
|
|
||||||
Archive contents of directory /usr/include into usr.pz. Default chunk or per-thread
|
|
||||||
segment size is 8MB and default compression level is 6.
|
|
||||||
|
|
||||||
pcompress -a /usr/include usr
|
|
||||||
|
|
||||||
Archive the given listr of files into file.pz and max compresion level and all features
|
|
||||||
enabled. A maximum chunk size of 20MB is used. Also use verbose mode which lists each
|
|
||||||
file as it is processed.
|
|
||||||
|
|
||||||
pcompress -a -v -l14 -s20m file1 file2 file3 file
|
|
||||||
|
|
||||||
Simple compress "file.tar" using zlib(gzip) algorithm. Default chunk or per-thread
|
|
||||||
segment size is 8MB and default compression level is 6. Output file created will be
|
|
||||||
file.tar.pz
|
|
||||||
|
|
||||||
pcompress -c zlib file.tar
|
|
||||||
|
|
||||||
Simple compress "file.tar" using zlib(gzip) algorithm with output file file.compressed.pz
|
|
||||||
|
|
||||||
pcompress -c zlib file.tar file.compressed
|
|
||||||
|
|
||||||
Compress "file.tar" using Zlib and per-thread chunk or segment size of 10MB and
|
|
||||||
Compression level 9. Compressed output is sent to stdout using '-' which is then
|
|
||||||
redirected to a file.
|
|
||||||
|
|
||||||
pcompress -c zlib -l9 -s10m file.tar - > /path/to/compress_file.tar.pz
|
|
||||||
|
|
||||||
It is possible for a single chunk to span the entire file if enough RAM is
|
|
||||||
available. However for adaptive modes to be effective for large files, especially
|
|
||||||
multi-file archives splitting into chunks is required so that best compression
|
|
||||||
algorithm can be selected for textual and binary portions.
|
|
||||||
|
|
||||||
Pre-Processing Algorithms
|
|
||||||
=========================
|
|
||||||
As can be seen above a multitude of pre-processing algorithms are available that
|
|
||||||
provide further compression effectiveness beyond what the usual compression
|
|
||||||
algorithms can achieve by themselves. These are summarized below:
|
|
||||||
|
|
||||||
1) Deduplication : Per-Chunk (or per-segment) deduplication based on Rabin
|
|
||||||
fingerprinting.
|
|
||||||
|
|
||||||
2) Delta Compression : A similarity based (minhash) comparison of Rabin blocks.
|
|
||||||
Two blocks at least 60% similar with each other are diffed
|
|
||||||
using bsdiff.
|
|
||||||
|
|
||||||
3) LZP : LZ Prediction is a variant of LZ77 that replaces repeating
|
|
||||||
runs of text with shorter codes.
|
|
||||||
|
|
||||||
4) Adaptive Delta : This is a simple form of Delta Encoding where arithmetic
|
|
||||||
progressions are detected in the data stream and
|
|
||||||
collapsed via Run-Length encoding.
|
|
||||||
|
|
||||||
4) Matrix Transpose : This is used automatically in Delta Encoding and
|
|
||||||
Deduplication. This attempts to transpose columnar
|
|
||||||
repeating sequences of bytes into row-wise sequences so
|
|
||||||
that compression algorithms can work better.
|
|
||||||
|
|
||||||
Memory Usage
|
|
||||||
============
|
|
||||||
As can be seen from above memory usage can vary greatly based on compression/
|
|
||||||
pre-processing algorithms and chunk size. A variety of configurations are possible
|
|
||||||
depending on resource availability in the system.
|
|
||||||
|
|
||||||
The minimum possible meaningful settings while still giving about 50% compression
|
|
||||||
ratio and very high speed is with the LZFX algorithm with 1MB chunk size and 2
|
|
||||||
threads:
|
|
||||||
|
|
||||||
pcompress -c lzfx -l2 -s1m -t2 <file>
|
|
||||||
|
|
||||||
This uses about 6MB of physical RAM (RSS). Earlier versions of the utility before
|
|
||||||
the 0.9 release comsumed much more memory. This was improved in the later versions.
|
|
||||||
When using Linux the virtual memory consumption may appear to be very high but it
|
|
||||||
is just address space usage rather than actual RAM and should be ignored. It is only
|
|
||||||
the RSS that matters. This is a result of the memory arena mechanism in Glibc that
|
|
||||||
improves malloc() performance for multi-threaded applications.
|
|
||||||
|
|
||||||
|
|
|
@ -1,377 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is a part of Pcompress, a chunked parallel multi-
|
|
||||||
* algorithm lossless compression and decompression program.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2012-2013 Moinak Ghosh. All rights reserved.
|
|
||||||
* Use is subject to license terms.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 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
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this program.
|
|
||||||
* If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
* moinakg@belenix.org, http://moinakg.wordpress.com/
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <strings.h>
|
|
||||||
/*
|
|
||||||
#if defined(sun) || defined(__sun)
|
|
||||||
#include <sys/byteorder.h>
|
|
||||||
#else
|
|
||||||
#include <byteswap.h>
|
|
||||||
#endif
|
|
||||||
*/
|
|
||||||
#include <utils.h>
|
|
||||||
#include <pcompress.h>
|
|
||||||
#include <allocator.h>
|
|
||||||
#include <pc_archive.h>
|
|
||||||
#include "filters/analyzer/analyzer.h"
|
|
||||||
|
|
||||||
static unsigned int lzma_count = 0;
|
|
||||||
static unsigned int bzip2_count = 0;
|
|
||||||
static unsigned int bsc_count = 0;
|
|
||||||
static unsigned int ppmd_count = 0;
|
|
||||||
static unsigned int lz4_count = 0;
|
|
||||||
|
|
||||||
extern int lzma_compress(void *src, uint64_t srclen, void *dst,
|
|
||||||
uint64_t *destlen, int level, uchar_t chdr, int btype, void *data);
|
|
||||||
extern int bzip2_compress(void *src, uint64_t srclen, void *dst,
|
|
||||||
uint64_t *destlen, int level, uchar_t chdr, int btype, void *data);
|
|
||||||
extern int ppmd_compress(void *src, uint64_t srclen, void *dst,
|
|
||||||
uint64_t *dstlen, int level, uchar_t chdr, int btype, void *data);
|
|
||||||
extern int libbsc_compress(void *src, uint64_t srclen, void *dst,
|
|
||||||
uint64_t *dstlen, int level, uchar_t chdr, int btype, void *data);
|
|
||||||
extern int lz4_compress(void *src, uint64_t srclen, void *dst,
|
|
||||||
uint64_t *dstlen, int level, uchar_t chdr, int btype, void *data);
|
|
||||||
|
|
||||||
extern int lzma_decompress(void *src, uint64_t srclen, void *dst,
|
|
||||||
uint64_t *dstlen, int level, uchar_t chdr, int btype, void *data);
|
|
||||||
extern int bzip2_decompress(void *src, uint64_t srclen, void *dst,
|
|
||||||
uint64_t *dstlen, int level, uchar_t chdr, int btype, void *data);
|
|
||||||
extern int ppmd_decompress(void *src, uint64_t srclen, void *dst,
|
|
||||||
uint64_t *dstlen, int level, uchar_t chdr, int btype, void *data);
|
|
||||||
extern int libbsc_decompress(void *src, uint64_t srclen, void *dst,
|
|
||||||
uint64_t *dstlen, int level, uchar_t chdr, int btype, void *data);
|
|
||||||
extern int lz4_decompress(void *src, uint64_t srclen, void *dst,
|
|
||||||
uint64_t *dstlen, int level, uchar_t chdr, int btype, void *data);
|
|
||||||
|
|
||||||
extern int lzma_init(void **data, int *level, int nthreads, uint64_t chunksize,
|
|
||||||
int file_version, compress_op_t op);
|
|
||||||
extern int lzma_deinit(void **data);
|
|
||||||
extern int ppmd_init(void **data, int *level, int nthreads, uint64_t chunksize,
|
|
||||||
int file_version, compress_op_t op);
|
|
||||||
extern int ppmd_deinit(void **data);
|
|
||||||
extern int libbsc_init(void **data, int *level, int nthreads, uint64_t chunksize,
|
|
||||||
int file_version, compress_op_t op);
|
|
||||||
extern int libbsc_deinit(void **data);
|
|
||||||
extern int lz4_init(void **data, int *level, int nthreads, uint64_t chunksize,
|
|
||||||
int file_version, compress_op_t op);
|
|
||||||
extern int lz4_deinit(void **data);
|
|
||||||
|
|
||||||
extern int ppmd_alloc(void *data);
|
|
||||||
extern void ppmd_free(void *data);
|
|
||||||
extern int ppmd_state_init(void **data, int *level, int alloc);
|
|
||||||
|
|
||||||
extern int lz4_buf_extra(uint64_t buflen);
|
|
||||||
extern int libbsc_buf_extra(uint64_t buflen);
|
|
||||||
|
|
||||||
struct adapt_data {
|
|
||||||
void *lzma_data;
|
|
||||||
void *ppmd_data;
|
|
||||||
void *bsc_data;
|
|
||||||
void *lz4_data;
|
|
||||||
int adapt_mode;
|
|
||||||
analyzer_ctx_t *actx;
|
|
||||||
};
|
|
||||||
|
|
||||||
void
|
|
||||||
adapt_set_analyzer_ctx(void *data, analyzer_ctx_t *actx)
|
|
||||||
{
|
|
||||||
struct adapt_data *adat = (struct adapt_data *)data;
|
|
||||||
adat->actx = actx;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
adapt_stats(int show)
|
|
||||||
{
|
|
||||||
if (show) {
|
|
||||||
if (bzip2_count > 0 || bsc_count > 0 || ppmd_count > 0 || lzma_count > 0) {
|
|
||||||
log_msg(LOG_INFO, 0, "Adaptive mode stats:");
|
|
||||||
log_msg(LOG_INFO, 0, " BZIP2 chunk count: %u", bzip2_count);
|
|
||||||
log_msg(LOG_INFO, 0, " LIBBSC chunk count: %u", bsc_count);
|
|
||||||
log_msg(LOG_INFO, 0, " PPMd chunk count: %u", ppmd_count);
|
|
||||||
log_msg(LOG_INFO, 0, " LZMA chunk count: %u", lzma_count);
|
|
||||||
log_msg(LOG_INFO, 0, " LZ4 chunk count: %u", lz4_count);
|
|
||||||
} else {
|
|
||||||
log_msg(LOG_INFO, 0, "\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
lzma_count = 0;
|
|
||||||
bzip2_count = 0;
|
|
||||||
bsc_count = 0;
|
|
||||||
ppmd_count = 0;
|
|
||||||
lz4_count = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
adapt_props(algo_props_t *data, int level, uint64_t chunksize)
|
|
||||||
{
|
|
||||||
int ext1, ext2;
|
|
||||||
|
|
||||||
data->delta2_span = 200;
|
|
||||||
data->deltac_min_distance = EIGHTM;
|
|
||||||
ext1 = lz4_buf_extra(chunksize);
|
|
||||||
|
|
||||||
#ifdef ENABLE_PC_LIBBSC
|
|
||||||
ext2 = libbsc_buf_extra(chunksize);
|
|
||||||
if (ext2 > ext1) ext1 = ext2;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
data->buf_extra = ext1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
adapt_init(void **data, int *level, int nthreads, uint64_t chunksize,
|
|
||||||
int file_version, compress_op_t op)
|
|
||||||
{
|
|
||||||
struct adapt_data *adat = (struct adapt_data *)(*data);
|
|
||||||
int rv = 0, lv = 1;
|
|
||||||
|
|
||||||
if (!adat) {
|
|
||||||
adat = (struct adapt_data *)slab_alloc(NULL, sizeof (struct adapt_data));
|
|
||||||
adat->adapt_mode = 1;
|
|
||||||
rv = ppmd_state_init(&(adat->ppmd_data), level, 0);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* LZ4 is used to tackle some embedded archive headers and/or zero paddings in
|
|
||||||
* otherwise incompressible data. So we always use it at the lowest and fastest
|
|
||||||
* compression level.
|
|
||||||
*/
|
|
||||||
if (rv == 0)
|
|
||||||
rv = lz4_init(&(adat->lz4_data), &lv, nthreads, chunksize, file_version, op);
|
|
||||||
adat->lzma_data = NULL;
|
|
||||||
adat->bsc_data = NULL;
|
|
||||||
*data = adat;
|
|
||||||
if (*level > 9) *level = 9;
|
|
||||||
}
|
|
||||||
lzma_count = 0;
|
|
||||||
bzip2_count = 0;
|
|
||||||
ppmd_count = 0;
|
|
||||||
bsc_count = 0;
|
|
||||||
lz4_count = 0;
|
|
||||||
return (rv);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
adapt2_init(void **data, int *level, int nthreads, uint64_t chunksize,
|
|
||||||
int file_version, compress_op_t op)
|
|
||||||
{
|
|
||||||
struct adapt_data *adat = (struct adapt_data *)(*data);
|
|
||||||
int rv = 0, lv;
|
|
||||||
|
|
||||||
if (!adat) {
|
|
||||||
adat = (struct adapt_data *)slab_alloc(NULL, sizeof (struct adapt_data));
|
|
||||||
adat->adapt_mode = 2;
|
|
||||||
adat->ppmd_data = NULL;
|
|
||||||
adat->bsc_data = NULL;
|
|
||||||
lv = *level;
|
|
||||||
if (lv > 10) lv = 10;
|
|
||||||
rv = ppmd_state_init(&(adat->ppmd_data), level, 0);
|
|
||||||
lv = *level;
|
|
||||||
if (rv == 0)
|
|
||||||
rv = lzma_init(&(adat->lzma_data), &lv, nthreads, chunksize, file_version, op);
|
|
||||||
lv = *level;
|
|
||||||
#ifdef ENABLE_PC_LIBBSC
|
|
||||||
if (rv == 0)
|
|
||||||
rv = libbsc_init(&(adat->bsc_data), &lv, nthreads, chunksize, file_version, op);
|
|
||||||
#endif
|
|
||||||
/*
|
|
||||||
* LZ4 is used to tackle some embedded archive headers and/or zero paddings in
|
|
||||||
* otherwise incompressible data. So we always use it at the lowest and fastest
|
|
||||||
* compression level.
|
|
||||||
*/
|
|
||||||
lv = 1;
|
|
||||||
if (rv == 0)
|
|
||||||
rv = lz4_init(&(adat->lz4_data), &lv, nthreads, chunksize, file_version, op);
|
|
||||||
*data = adat;
|
|
||||||
if (*level > 9) *level = 9;
|
|
||||||
}
|
|
||||||
lzma_count = 0;
|
|
||||||
bzip2_count = 0;
|
|
||||||
ppmd_count = 0;
|
|
||||||
bsc_count = 0;
|
|
||||||
lz4_count = 0;
|
|
||||||
return (rv);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
adapt_deinit(void **data)
|
|
||||||
{
|
|
||||||
struct adapt_data *adat = (struct adapt_data *)(*data);
|
|
||||||
int rv = 0;
|
|
||||||
|
|
||||||
if (adat) {
|
|
||||||
rv = ppmd_deinit(&(adat->ppmd_data));
|
|
||||||
if (adat->lzma_data)
|
|
||||||
rv += lzma_deinit(&(adat->lzma_data));
|
|
||||||
if (adat->lz4_data)
|
|
||||||
rv += lz4_deinit(&(adat->lz4_data));
|
|
||||||
slab_free(NULL, adat);
|
|
||||||
*data = NULL;
|
|
||||||
}
|
|
||||||
return (rv);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Identify the types that BSC can compress better than others.
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
is_bsc_type(int btype)
|
|
||||||
{
|
|
||||||
int stype = PC_SUBTYPE(btype);
|
|
||||||
int mtype = PC_TYPE(btype);
|
|
||||||
|
|
||||||
return ((stype == TYPE_BMP) | (stype == TYPE_DNA_SEQ) | (stype == TYPE_PNM) |
|
|
||||||
(stype == TYPE_MP4) | (stype == TYPE_FLAC) | (stype == TYPE_AVI) |
|
|
||||||
(stype == TYPE_DICOM) | (stype == TYPE_MEDIA_BSC) |
|
|
||||||
(mtype & TYPE_TEXT && stype != TYPE_MARKUP) |
|
|
||||||
(mtype & TYPE_BINARY && stype == TYPE_MARKUP));
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
adapt_compress(void *src, uint64_t srclen, void *dst,
|
|
||||||
uint64_t *dstlen, int level, uchar_t chdr, int btype, void *data)
|
|
||||||
{
|
|
||||||
struct adapt_data *adat = (struct adapt_data *)(data);
|
|
||||||
int rv = 0, bsc_type = 0;
|
|
||||||
int stype = PC_SUBTYPE(btype);
|
|
||||||
analyzer_ctx_t actx;
|
|
||||||
|
|
||||||
if (btype == TYPE_UNKNOWN || PC_TYPE(btype) & TYPE_TEXT ||
|
|
||||||
stype == TYPE_ARCHIVE_TAR || stype == TYPE_PDF) {
|
|
||||||
if (adat->actx == NULL) {
|
|
||||||
analyze_buffer(src, srclen, &actx);
|
|
||||||
adat->actx = &actx;
|
|
||||||
}
|
|
||||||
if (adat->adapt_mode == 2) {
|
|
||||||
btype = adat->actx->thirty_pct.btype;
|
|
||||||
|
|
||||||
} else if (adat->adapt_mode == 1) {
|
|
||||||
btype = adat->actx->fifty_pct.btype;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Reset analyzer context for subsequent calls. */
|
|
||||||
adat->actx = NULL;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Use PPMd if some percentage of source is 7-bit textual bytes, otherwise
|
|
||||||
* use Bzip2 or LZMA. For totally incompressible data we always use LZ4. There
|
|
||||||
* is no point trying to compress such data, like Jpegs. However some archive headers
|
|
||||||
* and zero paddings can exist which LZ4 can easily take care of very fast.
|
|
||||||
*/
|
|
||||||
#ifdef ENABLE_PC_LIBBSC
|
|
||||||
bsc_type = is_bsc_type(btype);
|
|
||||||
#endif
|
|
||||||
if (is_incompressible(btype) && !bsc_type) {
|
|
||||||
rv = lz4_compress(src, srclen, dst, dstlen, level, chdr, btype, adat->lz4_data);
|
|
||||||
if (rv < 0)
|
|
||||||
return (rv);
|
|
||||||
rv = ADAPT_COMPRESS_LZ4;
|
|
||||||
lz4_count++;
|
|
||||||
|
|
||||||
} else if (adat->adapt_mode == 2 && PC_TYPE(btype) & TYPE_BINARY && !bsc_type) {
|
|
||||||
rv = lzma_compress(src, srclen, dst, dstlen, level, chdr, btype, adat->lzma_data);
|
|
||||||
if (rv < 0)
|
|
||||||
return (rv);
|
|
||||||
rv = ADAPT_COMPRESS_LZMA;
|
|
||||||
lzma_count++;
|
|
||||||
|
|
||||||
} else if (adat->adapt_mode == 1 && PC_TYPE(btype) & TYPE_BINARY && !bsc_type) {
|
|
||||||
rv = bzip2_compress(src, srclen, dst, dstlen, level, chdr, btype, NULL);
|
|
||||||
if (rv < 0)
|
|
||||||
return (rv);
|
|
||||||
rv = ADAPT_COMPRESS_BZIP2;
|
|
||||||
bzip2_count++;
|
|
||||||
|
|
||||||
} else {
|
|
||||||
#ifdef ENABLE_PC_LIBBSC
|
|
||||||
if (adat->bsc_data && bsc_type) {
|
|
||||||
rv = libbsc_compress(src, srclen, dst, dstlen, level, chdr, btype, adat->bsc_data);
|
|
||||||
if (rv < 0)
|
|
||||||
return (rv);
|
|
||||||
rv = ADAPT_COMPRESS_BSC;
|
|
||||||
bsc_count++;
|
|
||||||
} else {
|
|
||||||
#endif
|
|
||||||
rv = ppmd_alloc(adat->ppmd_data);
|
|
||||||
if (rv < 0)
|
|
||||||
return (rv);
|
|
||||||
rv = ppmd_compress(src, srclen, dst, dstlen, level, chdr, btype, adat->ppmd_data);
|
|
||||||
ppmd_free(adat->ppmd_data);
|
|
||||||
if (rv < 0)
|
|
||||||
return (rv);
|
|
||||||
rv = ADAPT_COMPRESS_PPMD;
|
|
||||||
ppmd_count++;
|
|
||||||
#ifdef ENABLE_PC_LIBBSC
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
return (rv);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
adapt_decompress(void *src, uint64_t srclen, void *dst,
|
|
||||||
uint64_t *dstlen, int level, uchar_t chdr, int btype, void *data)
|
|
||||||
{
|
|
||||||
struct adapt_data *adat = (struct adapt_data *)(data);
|
|
||||||
uchar_t cmp_flags;
|
|
||||||
|
|
||||||
cmp_flags = CHDR_ALGO(chdr);
|
|
||||||
|
|
||||||
if (cmp_flags == ADAPT_COMPRESS_LZ4) {
|
|
||||||
return (lz4_decompress(src, srclen, dst, dstlen, 1, chdr, btype, adat->lz4_data));
|
|
||||||
|
|
||||||
} else if (cmp_flags == ADAPT_COMPRESS_LZMA) {
|
|
||||||
return (lzma_decompress(src, srclen, dst, dstlen, level, chdr, btype, adat->lzma_data));
|
|
||||||
|
|
||||||
} else if (cmp_flags == ADAPT_COMPRESS_BZIP2) {
|
|
||||||
return (bzip2_decompress(src, srclen, dst, dstlen, level, chdr, btype, NULL));
|
|
||||||
|
|
||||||
} else if (cmp_flags == ADAPT_COMPRESS_PPMD) {
|
|
||||||
int rv;
|
|
||||||
rv = ppmd_alloc(adat->ppmd_data);
|
|
||||||
if (rv < 0)
|
|
||||||
return (rv);
|
|
||||||
rv = ppmd_decompress(src, srclen, dst, dstlen, level, chdr, btype, adat->ppmd_data);
|
|
||||||
ppmd_free(adat->ppmd_data);
|
|
||||||
return (rv);
|
|
||||||
|
|
||||||
} else if (cmp_flags == ADAPT_COMPRESS_BSC) {
|
|
||||||
#ifdef ENABLE_PC_LIBBSC
|
|
||||||
return (libbsc_decompress(src, srclen, dst, dstlen, level, chdr, btype, adat->bsc_data));
|
|
||||||
#else
|
|
||||||
log_msg(LOG_ERR, 0, "Cannot decompress chunk. Libbsc support not present.\n");
|
|
||||||
return (-1);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
} else {
|
|
||||||
log_msg(LOG_ERR, 0, "Unrecognized compression mode: %d, file corrupt.\n", cmp_flags);
|
|
||||||
}
|
|
||||||
return (-1);
|
|
||||||
}
|
|
547
allocator.c
547
allocator.c
|
@ -1,547 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is a part of Pcompress, a chunked parallel multi-
|
|
||||||
* algorithm lossless compression and decompression program.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2012-2013 Moinak Ghosh. All rights reserved.
|
|
||||||
* Use is subject to license terms.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 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
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this program.
|
|
||||||
* If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
* moinakg@belenix.org, http://moinakg.wordpress.com/
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* A basic slab allocator that uses power of 2 and fixed interval
|
|
||||||
* slab sizes and uses integer hashing to track pointers. It uses
|
|
||||||
* per-slab and per-hash-bucket locking for scalability. This
|
|
||||||
* allocator is being used in Pcompress as repeated compression of
|
|
||||||
* fixed-size chunks causes repeated and predictable memory allocation
|
|
||||||
* and freeing patterns. Using pre-allocated buffer pools in this
|
|
||||||
* case causes significant speedup.
|
|
||||||
*
|
|
||||||
* There is no provision yet to reap buffers from high-usage slabs
|
|
||||||
* and return them to the heap.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/param.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <strings.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <pthread.h>
|
|
||||||
#include <math.h>
|
|
||||||
#include "utils.h"
|
|
||||||
#include "allocator.h"
|
|
||||||
|
|
||||||
#ifndef DEBUG_NO_SLAB
|
|
||||||
/*
|
|
||||||
* Number of slabs:
|
|
||||||
* 64 bytes to 1M in power of 2 steps: 15
|
|
||||||
* 1M to 128M in linear steps of 1M: 128
|
|
||||||
* 200 dynamic slab slots: 200
|
|
||||||
*
|
|
||||||
* By doing this we try to get reasonable memory usage while not
|
|
||||||
* sacrificing performance.
|
|
||||||
*/
|
|
||||||
#define NUM_POW2 15
|
|
||||||
#define NUM_LINEAR 128
|
|
||||||
#define NUM_SLAB_HASH 200 /* Dynamic slabs hashtable size. */
|
|
||||||
#define NUM_SLABS (NUM_POW2 + NUM_LINEAR + NUM_SLAB_HASH)
|
|
||||||
#define SLAB_POS_HASH (NUM_POW2 + NUM_LINEAR)
|
|
||||||
#define SLAB_START_SZ 64 /* Starting slab size in Bytes. */
|
|
||||||
#define SLAB_START_POW2 6 /* 2 ^ SLAB_START_POW2 = SLAB_START. */
|
|
||||||
|
|
||||||
#define HTABLE_SZ 8192
|
|
||||||
#define ONEM (1UL * 1024UL * 1024UL)
|
|
||||||
|
|
||||||
static const unsigned int bv[] = {
|
|
||||||
0xAAAAAAAA,
|
|
||||||
0xCCCCCCCC,
|
|
||||||
0xF0F0F0F0,
|
|
||||||
0xFF00FF00,
|
|
||||||
0xFFFF0000
|
|
||||||
};
|
|
||||||
|
|
||||||
struct slabentry {
|
|
||||||
struct bufentry *avail;
|
|
||||||
struct slabentry *next;
|
|
||||||
uint64_t sz;
|
|
||||||
uint64_t allocs, hits;
|
|
||||||
pthread_mutex_t slab_lock;
|
|
||||||
};
|
|
||||||
struct bufentry {
|
|
||||||
void *ptr;
|
|
||||||
struct slabentry *slab;
|
|
||||||
struct bufentry *next;
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct slabentry slabheads[NUM_SLABS];
|
|
||||||
static struct bufentry **htable;
|
|
||||||
static pthread_mutex_t *hbucket_locks;
|
|
||||||
static pthread_mutex_t htable_lock = PTHREAD_MUTEX_INITIALIZER;
|
|
||||||
static int inited = 0, bypass = 0;
|
|
||||||
|
|
||||||
static uint64_t total_allocs, oversize_allocs, hash_collisions, hash_entries;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Hash function for 64Bit pointers/numbers that generates
|
|
||||||
* a 32Bit hash value.
|
|
||||||
* Taken from Thomas Wang's Integer hashing paper:
|
|
||||||
* http://www.cris.com/~Ttwang/tech/inthash.htm
|
|
||||||
*/
|
|
||||||
static uint32_t
|
|
||||||
hash6432shift(uint64_t key)
|
|
||||||
{
|
|
||||||
key = (~key) + (key << 18); // key = (key << 18) - key - 1;
|
|
||||||
key = key ^ (key >> 31);
|
|
||||||
key = key * 21; // key = (key + (key << 2)) + (key << 4);
|
|
||||||
key = key ^ (key >> 11);
|
|
||||||
key = key + (key << 6);
|
|
||||||
key = key ^ (key >> 22);
|
|
||||||
return (uint32_t) key;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
slab_init()
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
uint64_t slab_sz;
|
|
||||||
|
|
||||||
/* Check bypass env variable. */
|
|
||||||
if (getenv("ALLOCATOR_BYPASS") != NULL) {
|
|
||||||
bypass = 1;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Initialize first NUM_POW2 power of 2 slots. */
|
|
||||||
slab_sz = SLAB_START_SZ;
|
|
||||||
for (i = 0; i < NUM_POW2; i++) {
|
|
||||||
slabheads[i].avail = NULL;
|
|
||||||
slabheads[i].sz = slab_sz;
|
|
||||||
slabheads[i].allocs = 0;
|
|
||||||
slabheads[i].hits = 0;
|
|
||||||
/* Speed up: Copy from already inited but not yet used lock object. */
|
|
||||||
slabheads[i].slab_lock = htable_lock;
|
|
||||||
slab_sz *= 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Linear slots start at 1M. */
|
|
||||||
slab_sz = ONEM;
|
|
||||||
for (i = NUM_POW2; i < SLAB_POS_HASH; i++) {
|
|
||||||
slabheads[i].avail = NULL;
|
|
||||||
slabheads[i].next = NULL;
|
|
||||||
slabheads[i].sz = slab_sz;
|
|
||||||
slabheads[i].allocs = 0;
|
|
||||||
slabheads[i].hits = 0;
|
|
||||||
/* Speed up: Copy from already inited but not yet used lock object. */
|
|
||||||
slabheads[i].slab_lock = htable_lock;
|
|
||||||
slab_sz += ONEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = SLAB_POS_HASH; i < NUM_SLABS; i++) {
|
|
||||||
slabheads[i].avail = NULL;
|
|
||||||
slabheads[i].next = NULL;
|
|
||||||
slabheads[i].sz = 0;
|
|
||||||
slabheads[i].allocs = 0;
|
|
||||||
slabheads[i].hits = 0;
|
|
||||||
/* Do not init locks here. They will be inited on demand. */
|
|
||||||
}
|
|
||||||
htable = (struct bufentry **)calloc(HTABLE_SZ, sizeof (struct bufentry *));
|
|
||||||
hbucket_locks = (pthread_mutex_t *)malloc(HTABLE_SZ * sizeof (pthread_mutex_t));
|
|
||||||
|
|
||||||
for (i=0; i<HTABLE_SZ; i++)
|
|
||||||
hbucket_locks[i] = htable_lock;
|
|
||||||
|
|
||||||
total_allocs = 0;
|
|
||||||
oversize_allocs = 0;
|
|
||||||
hash_collisions = 0;
|
|
||||||
hash_entries = 0;
|
|
||||||
inited = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
slab_cleanup(int quiet)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
struct bufentry *buf, *buf1;
|
|
||||||
uint64_t nonfreed_oversize;
|
|
||||||
|
|
||||||
if (!inited) return;
|
|
||||||
if (bypass) return;
|
|
||||||
|
|
||||||
if (!quiet) {
|
|
||||||
log_msg(LOG_INFO, 0, "Slab Allocation Stats\n");
|
|
||||||
log_msg(LOG_INFO, 0, "==================================================================\n");
|
|
||||||
log_msg(LOG_INFO, 0, " Slab Size | Allocations | Hits |\n");
|
|
||||||
log_msg(LOG_INFO, 0, "==================================================================\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i=0; i<NUM_SLABS; i++)
|
|
||||||
{
|
|
||||||
struct slabentry *slab;
|
|
||||||
|
|
||||||
slab = &slabheads[i];
|
|
||||||
while (slab) {
|
|
||||||
if (slab->avail) {
|
|
||||||
if (!quiet) {
|
|
||||||
log_msg(LOG_INFO, 0, "%21" PRIu64 " %21" PRIu64 " %21" PRIu64 "\n",slab->sz,
|
|
||||||
slab->allocs, slab->hits);
|
|
||||||
}
|
|
||||||
slab->allocs = 0;
|
|
||||||
buf = slab->avail;
|
|
||||||
do {
|
|
||||||
buf1 = buf->next;
|
|
||||||
free(buf->ptr);
|
|
||||||
free(buf);
|
|
||||||
buf = buf1;
|
|
||||||
} while (buf);
|
|
||||||
}
|
|
||||||
slab = slab->next;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!quiet) {
|
|
||||||
log_msg(LOG_INFO, 0, "==================================================================\n");
|
|
||||||
log_msg(LOG_INFO, 0, "Oversize Allocations : %" PRIu64 "\n", oversize_allocs);
|
|
||||||
log_msg(LOG_INFO, 0, "Total Requests : %" PRIu64 "\n", total_allocs);
|
|
||||||
log_msg(LOG_INFO, 0, "Hash collisions : %" PRIu64 "\n", hash_collisions);
|
|
||||||
log_msg(LOG_INFO, 0, "Leaked allocations : %" PRIu64 "\n", hash_entries);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hash_entries > 0) {
|
|
||||||
nonfreed_oversize = 0;
|
|
||||||
for (i=0; i<HTABLE_SZ; i++) {
|
|
||||||
buf = htable[i];
|
|
||||||
|
|
||||||
while (buf) {
|
|
||||||
if (buf->slab == NULL) {
|
|
||||||
nonfreed_oversize++;
|
|
||||||
} else {
|
|
||||||
buf->slab->allocs++;
|
|
||||||
}
|
|
||||||
buf1 = buf->next;
|
|
||||||
free(buf->ptr);
|
|
||||||
free(buf);
|
|
||||||
buf = buf1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
free(htable);
|
|
||||||
free(hbucket_locks);
|
|
||||||
|
|
||||||
if (!quiet) {
|
|
||||||
log_msg(LOG_INFO, 0, "==================================================================\n");
|
|
||||||
log_msg(LOG_INFO, 0, " Slab Size | Allocations: leaked |\n");
|
|
||||||
log_msg(LOG_INFO, 0, "==================================================================\n");
|
|
||||||
for (i=0; i<NUM_SLABS; i++)
|
|
||||||
{
|
|
||||||
struct slabentry *slab;
|
|
||||||
|
|
||||||
slab = &slabheads[i];
|
|
||||||
do {
|
|
||||||
if (slab->allocs > 0)
|
|
||||||
log_msg(LOG_INFO, 0, "%21" PRIu64 " %21" PRIu64 "\n", \
|
|
||||||
slab->sz, slab->allocs);
|
|
||||||
slab = slab->next;
|
|
||||||
} while (slab);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (i=0; i<NUM_SLABS; i++)
|
|
||||||
{
|
|
||||||
struct slabentry *slab, *pslab;
|
|
||||||
int j;
|
|
||||||
|
|
||||||
slab = &slabheads[i];
|
|
||||||
j = 0;
|
|
||||||
do {
|
|
||||||
pslab = slab;
|
|
||||||
slab = slab->next;
|
|
||||||
if (j > 0) free(pslab);
|
|
||||||
j++;
|
|
||||||
} while (slab);
|
|
||||||
}
|
|
||||||
if (!quiet) log_msg(LOG_INFO, 0, "\n\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
void *
|
|
||||||
slab_calloc(void *p, size_t items, size_t size) {
|
|
||||||
void *ptr;
|
|
||||||
|
|
||||||
if (bypass) return(calloc(items, size));
|
|
||||||
ptr = slab_alloc(p, items * size);
|
|
||||||
memset(ptr, 0, items * size);
|
|
||||||
return (ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Find the power of 2 slab slot which will hold a given size.
|
|
||||||
*/
|
|
||||||
static unsigned int
|
|
||||||
find_slot(unsigned int v)
|
|
||||||
{
|
|
||||||
unsigned int r;
|
|
||||||
|
|
||||||
/* Round up to nearest power of 2 */
|
|
||||||
v = roundup_pow_two(v);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Get the log2 of the above. From Bit Twiddling Hacks:
|
|
||||||
* http://graphics.stanford.edu/~seander/bithacks.html
|
|
||||||
*
|
|
||||||
* This essentially tells us which bit is set.
|
|
||||||
*/
|
|
||||||
r = (v & bv[0]) != 0;
|
|
||||||
r |= ((v & bv[4]) != 0) << 4;
|
|
||||||
r |= ((v & bv[3]) != 0) << 3;
|
|
||||||
r |= ((v & bv[2]) != 0) << 2;
|
|
||||||
r |= ((v & bv[1]) != 0) << 1;
|
|
||||||
|
|
||||||
/* Rebase to starting power of 2 slot number. */
|
|
||||||
if (r > SLAB_START_POW2)
|
|
||||||
r -= SLAB_START_POW2;
|
|
||||||
else
|
|
||||||
r = 0;
|
|
||||||
|
|
||||||
return (r);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct slabentry *
|
|
||||||
try_dynamic_slab(uint64_t size)
|
|
||||||
{
|
|
||||||
uint32_t sindx;
|
|
||||||
struct slabentry *slab;
|
|
||||||
|
|
||||||
/* Locate the hash slot for the size. */
|
|
||||||
sindx = hash6432shift((unsigned long)size) & (NUM_SLAB_HASH - 1);
|
|
||||||
sindx += SLAB_POS_HASH;
|
|
||||||
if (slabheads[sindx].sz == 0) return (NULL);
|
|
||||||
|
|
||||||
/* Linear search in the chained buckets. */
|
|
||||||
slab = &slabheads[sindx];
|
|
||||||
while (slab && slab->sz != size) {
|
|
||||||
slab = slab->next;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (slab);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
slab_cache_add(uint64_t size)
|
|
||||||
{
|
|
||||||
uint32_t sindx;
|
|
||||||
struct slabentry *slab;
|
|
||||||
if (bypass) return (0);
|
|
||||||
if (try_dynamic_slab(size)) return (0); /* Already added. */
|
|
||||||
|
|
||||||
/* Locate the hash slot for the size. */
|
|
||||||
sindx = hash6432shift((unsigned long)size) & (NUM_SLAB_HASH - 1);
|
|
||||||
sindx += SLAB_POS_HASH;
|
|
||||||
|
|
||||||
if (slabheads[sindx].sz == 0) {
|
|
||||||
pthread_mutex_init(&(slabheads[sindx].slab_lock), NULL);
|
|
||||||
pthread_mutex_lock(&(slabheads[sindx].slab_lock));
|
|
||||||
slabheads[sindx].sz = size;
|
|
||||||
pthread_mutex_unlock(&(slabheads[sindx].slab_lock));
|
|
||||||
} else {
|
|
||||||
slab = (struct slabentry *)malloc(sizeof (struct slabentry));
|
|
||||||
if (!slab) return (0);
|
|
||||||
slab->avail = NULL;
|
|
||||||
slab->sz = size;
|
|
||||||
slab->allocs = 0;
|
|
||||||
slab->hits = 0;
|
|
||||||
pthread_mutex_init(&(slab->slab_lock), NULL);
|
|
||||||
|
|
||||||
pthread_mutex_lock(&(slabheads[sindx].slab_lock));
|
|
||||||
slab->next = slabheads[sindx].next;
|
|
||||||
slabheads[sindx].next = slab;
|
|
||||||
pthread_mutex_unlock(&(slabheads[sindx].slab_lock));
|
|
||||||
}
|
|
||||||
return (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
void *
|
|
||||||
slab_alloc(void *p, size_t size)
|
|
||||||
{
|
|
||||||
uint64_t div;
|
|
||||||
struct slabentry *slab;
|
|
||||||
|
|
||||||
if (bypass) return (malloc(size));
|
|
||||||
ATOMIC_ADD(total_allocs, 1);
|
|
||||||
slab = NULL;
|
|
||||||
|
|
||||||
/* First check if we can use a dynamic slab of this size. */
|
|
||||||
slab = try_dynamic_slab(size);
|
|
||||||
|
|
||||||
if (!slab) {
|
|
||||||
if (size <= ONEM) {
|
|
||||||
/* First fifteen slots are power of 2 sizes upto 1M. */
|
|
||||||
slab = &slabheads[find_slot(size)];
|
|
||||||
} else {
|
|
||||||
/* Next slots are in intervals of 1M. */
|
|
||||||
div = size / ONEM;
|
|
||||||
if (size % ONEM) div++;
|
|
||||||
if (div < NUM_LINEAR) slab = &slabheads[div + NUM_POW2 - 1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!slab) {
|
|
||||||
struct bufentry *buf = (struct bufentry *)malloc(sizeof (struct bufentry));
|
|
||||||
uint32_t hindx;
|
|
||||||
|
|
||||||
buf->ptr = malloc(size);
|
|
||||||
buf->slab = NULL;
|
|
||||||
hindx = hash6432shift((unsigned long)(buf->ptr)) & (HTABLE_SZ - 1);
|
|
||||||
|
|
||||||
pthread_mutex_lock(&hbucket_locks[hindx]);
|
|
||||||
buf->next = htable[hindx];
|
|
||||||
htable[hindx] = buf;
|
|
||||||
pthread_mutex_unlock(&hbucket_locks[hindx]);
|
|
||||||
ATOMIC_ADD(oversize_allocs, 1);
|
|
||||||
ATOMIC_ADD(hash_entries, 1);
|
|
||||||
return (buf->ptr);
|
|
||||||
} else {
|
|
||||||
struct bufentry *buf;
|
|
||||||
uint32_t hindx;
|
|
||||||
|
|
||||||
pthread_mutex_lock(&(slab->slab_lock));
|
|
||||||
if (slab->avail == NULL) {
|
|
||||||
slab->allocs++;
|
|
||||||
pthread_mutex_unlock(&(slab->slab_lock));
|
|
||||||
buf = (struct bufentry *)malloc(sizeof (struct bufentry));
|
|
||||||
buf->ptr = malloc(slab->sz);
|
|
||||||
buf->slab = slab;
|
|
||||||
} else {
|
|
||||||
buf = slab->avail;
|
|
||||||
slab->avail = buf->next;
|
|
||||||
slab->hits++;
|
|
||||||
pthread_mutex_unlock(&(slab->slab_lock));
|
|
||||||
}
|
|
||||||
|
|
||||||
hindx = hash6432shift((unsigned long)(buf->ptr)) & (HTABLE_SZ - 1);
|
|
||||||
if (htable[hindx]) ATOMIC_ADD(hash_collisions, 1);
|
|
||||||
pthread_mutex_lock(&hbucket_locks[hindx]);
|
|
||||||
buf->next = htable[hindx];
|
|
||||||
htable[hindx] = buf;
|
|
||||||
pthread_mutex_unlock(&hbucket_locks[hindx]);
|
|
||||||
ATOMIC_ADD(hash_entries, 1);
|
|
||||||
return (buf->ptr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
slab_free_real(void *p, void *address, int do_free)
|
|
||||||
{
|
|
||||||
struct bufentry *buf, *pbuf;
|
|
||||||
int found = 0;
|
|
||||||
uint32_t hindx;
|
|
||||||
|
|
||||||
if (!address) return;
|
|
||||||
if (bypass) { free(address); return; }
|
|
||||||
hindx = hash6432shift((uint64_t)(address)) & (HTABLE_SZ - 1);
|
|
||||||
|
|
||||||
pthread_mutex_lock(&hbucket_locks[hindx]);
|
|
||||||
buf = htable[hindx];
|
|
||||||
pbuf = NULL;
|
|
||||||
while (buf) {
|
|
||||||
if (buf->ptr == address) {
|
|
||||||
if (hash_entries <=0) {
|
|
||||||
log_msg(LOG_ERR, 0, "Inconsistent allocation hash\n");
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
if (pbuf)
|
|
||||||
pbuf->next = buf->next;
|
|
||||||
else
|
|
||||||
htable[hindx] = buf->next;
|
|
||||||
pthread_mutex_unlock(&hbucket_locks[hindx]);
|
|
||||||
found = 1;
|
|
||||||
ATOMIC_SUB(hash_entries, 1);
|
|
||||||
|
|
||||||
if (buf->slab == NULL || do_free) {
|
|
||||||
free(buf->ptr);
|
|
||||||
free(buf);
|
|
||||||
} else {
|
|
||||||
pthread_mutex_lock(&(buf->slab->slab_lock));
|
|
||||||
buf->next = buf->slab->avail;
|
|
||||||
buf->slab->avail = buf;
|
|
||||||
pthread_mutex_unlock(&(buf->slab->slab_lock));
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
pbuf = buf;
|
|
||||||
buf = buf->next;
|
|
||||||
}
|
|
||||||
if (!found) {
|
|
||||||
pthread_mutex_unlock(&hbucket_locks[hindx]);
|
|
||||||
log_msg(LOG_ERR, 0, "Freed buf(%p) not in slab allocations!\n", address);
|
|
||||||
free(address);
|
|
||||||
abort();
|
|
||||||
fflush(stderr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
slab_free(void *p, void *address)
|
|
||||||
{
|
|
||||||
slab_free_real(p, address, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
slab_release(void *p, void *address)
|
|
||||||
{
|
|
||||||
slab_free_real(p, address, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
void
|
|
||||||
slab_init() {}
|
|
||||||
|
|
||||||
void
|
|
||||||
slab_cleanup(int quiet) {}
|
|
||||||
|
|
||||||
void
|
|
||||||
*slab_alloc(void *p, size_t size)
|
|
||||||
{
|
|
||||||
return (malloc(size));
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
*slab_calloc(void *p, size_t items, size_t size)
|
|
||||||
{
|
|
||||||
return (calloc(items, size));
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
slab_free(void *p, void *address)
|
|
||||||
{
|
|
||||||
free(address);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
slab_release(void *p, void *address)
|
|
||||||
{
|
|
||||||
free(address);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
slab_cache_add(uint64_t size)
|
|
||||||
{
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
41
allocator.h
41
allocator.h
|
@ -1,41 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is a part of Pcompress, a chunked parallel multi-
|
|
||||||
* algorithm lossless compression and decompression program.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2012-2013 Moinak Ghosh. All rights reserved.
|
|
||||||
* Use is subject to license terms.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 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
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this program.
|
|
||||||
* If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
* moinakg@belenix.org, http://moinakg.wordpress.com/
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ALLOCATOR_H__
|
|
||||||
#define __ALLOCATOR_H__
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <inttypes.h>
|
|
||||||
|
|
||||||
void slab_init();
|
|
||||||
void slab_cleanup(int quiet);
|
|
||||||
void *slab_alloc(void *p, size_t size);
|
|
||||||
void *slab_calloc(void *p, size_t items, size_t size);
|
|
||||||
void slab_free(void *p, void *address);
|
|
||||||
void slab_release(void *p, void *address);
|
|
||||||
int slab_cache_add(uint64_t size);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,185 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is a part of Pcompress, a chunked parallel multi-
|
|
||||||
* algorithm lossless compression and decompression program.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2014 Moinak Ghosh. All rights reserved.
|
|
||||||
* Use is subject to license terms.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 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
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this program.
|
|
||||||
* If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
* moinakg@belenix.org, http://moinakg.wordpress.com/
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <errno.h>
|
|
||||||
|
|
||||||
#include "utils.h"
|
|
||||||
#include "winsupport.h"
|
|
||||||
#include "types.hpp"
|
|
||||||
#include "dis.hpp"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef unsigned char uchar_t;
|
|
||||||
#define DISPACK_MAGIC "DisPack "
|
|
||||||
|
|
||||||
#pragma pack(1)
|
|
||||||
struct FileHeader
|
|
||||||
{
|
|
||||||
char magic[8];
|
|
||||||
sU32 SizeBefore; // number of bytes before start of code section
|
|
||||||
sU32 SizeAfter; // number of bytes after code section
|
|
||||||
sU32 SizeTransformed; // size of transformed code section
|
|
||||||
sU32 SizeOriginal; // size of untransformed code section
|
|
||||||
sU32 Origin; // virtual address of first byte
|
|
||||||
};
|
|
||||||
#pragma pack()
|
|
||||||
|
|
||||||
size_t
|
|
||||||
dispack_filter_encode(uchar_t *inData, size_t len, uchar_t **out_buf)
|
|
||||||
{
|
|
||||||
uchar_t *pos;
|
|
||||||
FileHeader hdr;
|
|
||||||
sU32 sizeNow;
|
|
||||||
|
|
||||||
*out_buf = (uchar_t *)malloc(len);
|
|
||||||
if (*out_buf == NULL)
|
|
||||||
return (0);
|
|
||||||
|
|
||||||
// assume the input file is a PE executable.
|
|
||||||
IMAGE_DOS_HEADER *doshdr = (IMAGE_DOS_HEADER *) inData;
|
|
||||||
IMAGE_NT_HEADERS *nthdr = (IMAGE_NT_HEADERS *) (inData + doshdr->e_lfanew);
|
|
||||||
|
|
||||||
if (nthdr->FileHeader.Machine != IMAGE_FILE_MACHINE_I386 ||
|
|
||||||
nthdr->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
|
|
||||||
// Only 32-bit PE files for x86 supported
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
sU32 imageBase = nthdr->OptionalHeader.ImageBase;
|
|
||||||
sU32 codeStart = nthdr->OptionalHeader.BaseOfCode;
|
|
||||||
sU32 codeSize = nthdr->OptionalHeader.SizeOfCode;
|
|
||||||
sU32 fileOffs = 0; // find file offset of first section
|
|
||||||
|
|
||||||
// find section containing code
|
|
||||||
IMAGE_SECTION_HEADER *sec = IMAGE_FIRST_SECTION(nthdr);
|
|
||||||
for (sInt i=0;i<nthdr->FileHeader.NumberOfSections;i++) {
|
|
||||||
if (codeStart >= sec[i].VirtualAddress && codeStart <
|
|
||||||
sec[i].VirtualAddress + sec[i].SizeOfRawData)
|
|
||||||
fileOffs = sec[i].PointerToRawData + (codeStart - sec[i].VirtualAddress);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fileOffs == 0) {
|
|
||||||
// Code section not found!
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Keep space for header
|
|
||||||
pos = *out_buf + sizeof (hdr);
|
|
||||||
|
|
||||||
// transform code
|
|
||||||
sU32 transSize = len - sizeof (hdr);
|
|
||||||
if (fileOffs + codeSize > len) {
|
|
||||||
codeSize = len - fileOffs;
|
|
||||||
}
|
|
||||||
if (DisFilter(inData + fileOffs, codeSize, imageBase + codeStart, pos, transSize) == NULL) {
|
|
||||||
goto cmp_E89;
|
|
||||||
}
|
|
||||||
pos += transSize;
|
|
||||||
|
|
||||||
// Give up if dispack savings is not enough for header space and we can overflow the buffer.
|
|
||||||
memcpy(hdr.magic, DISPACK_MAGIC, strlen(DISPACK_MAGIC));
|
|
||||||
hdr.SizeBefore = fileOffs;
|
|
||||||
hdr.SizeAfter = len - (fileOffs + codeSize);
|
|
||||||
hdr.SizeTransformed = transSize;
|
|
||||||
hdr.SizeOriginal = codeSize;
|
|
||||||
hdr.Origin = imageBase + codeStart;
|
|
||||||
sizeNow = pos - *out_buf;
|
|
||||||
if (sizeNow + hdr.SizeBefore + hdr.SizeAfter >= len) {
|
|
||||||
goto cmp_E89;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Now plonk the header
|
|
||||||
memcpy(*out_buf, &hdr, sizeof (hdr));
|
|
||||||
|
|
||||||
if (hdr.SizeBefore > 0) {
|
|
||||||
// Copy rest of the data
|
|
||||||
memcpy(pos, inData, hdr.SizeBefore);
|
|
||||||
pos += hdr.SizeBefore;
|
|
||||||
}
|
|
||||||
if (hdr.SizeAfter > 0) {
|
|
||||||
memcpy(pos, inData + (fileOffs + codeSize), hdr.SizeAfter);
|
|
||||||
pos += hdr.SizeAfter;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (pos - *out_buf);
|
|
||||||
cmp_E89:
|
|
||||||
// Apply an E8E9 filter this does not put the DISPACK_MAGIC into the
|
|
||||||
// file header. So, when decoding, that is detected and E8E9 decode
|
|
||||||
// is applied.
|
|
||||||
memcpy(*out_buf, inData, len);
|
|
||||||
if (Forward_E89(*out_buf, len) != 0)
|
|
||||||
return (0);
|
|
||||||
return (len);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t
|
|
||||||
dispack_filter_decode(uchar_t *inData, size_t len, uchar_t **out_buf)
|
|
||||||
{
|
|
||||||
uchar_t *decoded;
|
|
||||||
FileHeader *hdr = (FileHeader *)inData;
|
|
||||||
|
|
||||||
sU8 *transformed = inData + sizeof (FileHeader);
|
|
||||||
sU8 *before = transformed + hdr->SizeTransformed;
|
|
||||||
sU8 *after = before + hdr->SizeBefore;
|
|
||||||
|
|
||||||
// alloc buffer for unfiltered code
|
|
||||||
*out_buf = (uchar_t *)malloc(len);
|
|
||||||
if (*out_buf == NULL)
|
|
||||||
return (0);
|
|
||||||
|
|
||||||
if (memcmp(hdr->magic, DISPACK_MAGIC, strlen(DISPACK_MAGIC)) != 0)
|
|
||||||
goto dec_E89;
|
|
||||||
|
|
||||||
decoded = *out_buf;
|
|
||||||
memcpy(decoded, before, hdr->SizeBefore);
|
|
||||||
decoded += hdr->SizeBefore;
|
|
||||||
|
|
||||||
if (!DisUnFilter(transformed, hdr->SizeTransformed, decoded,
|
|
||||||
hdr->SizeOriginal, hdr->Origin)) {
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
decoded += hdr->SizeOriginal;
|
|
||||||
memcpy(decoded, after, hdr->SizeAfter);
|
|
||||||
decoded += hdr->SizeAfter;
|
|
||||||
|
|
||||||
return (decoded - *out_buf);
|
|
||||||
dec_E89:
|
|
||||||
memcpy(*out_buf, inData, len);
|
|
||||||
if (Inverse_E89(*out_buf, len) == -1)
|
|
||||||
return (0);
|
|
||||||
return (len);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,60 +0,0 @@
|
||||||
The libarchive distribution as a whole is Copyright by Tim Kientzle
|
|
||||||
and is subject to the copyright notice reproduced at the bottom of
|
|
||||||
this file.
|
|
||||||
|
|
||||||
Each individual file in this distribution should have a clear
|
|
||||||
copyright/licensing statement at the beginning of the file. If any do
|
|
||||||
not, please let me know and I will rectify it. The following is
|
|
||||||
intended to summarize the copyright status of the individual files;
|
|
||||||
the actual statements in the files are controlling.
|
|
||||||
|
|
||||||
* Except as listed below, all C sources (including .c and .h files)
|
|
||||||
and documentation files are subject to the copyright notice reproduced
|
|
||||||
at the bottom of this file.
|
|
||||||
|
|
||||||
* The following source files are also subject in whole or in part to
|
|
||||||
a 3-clause UC Regents copyright; please read the individual source
|
|
||||||
files for details:
|
|
||||||
libarchive/archive_entry.c
|
|
||||||
libarchive/archive_read_support_filter_compress.c
|
|
||||||
libarchive/archive_write_set_filter_compress.c
|
|
||||||
libarchive/mtree.5
|
|
||||||
tar/matching.c
|
|
||||||
|
|
||||||
* The following source files are in the public domain:
|
|
||||||
tar/getdate.c
|
|
||||||
|
|
||||||
* The build files---including Makefiles, configure scripts,
|
|
||||||
and auxiliary scripts used as part of the compile process---have
|
|
||||||
widely varying licensing terms. Please check individual files before
|
|
||||||
distributing them to see if those restrictions apply to you.
|
|
||||||
|
|
||||||
I intend for all new source code to use the license below and hope over
|
|
||||||
time to replace code with other licenses with new implementations that
|
|
||||||
do use the license below. The varying licensing of the build scripts
|
|
||||||
seems to be an unavoidable mess.
|
|
||||||
|
|
||||||
|
|
||||||
Copyright (c) 2003-2009 <author(s)>
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions
|
|
||||||
are met:
|
|
||||||
1. Redistributions of source code must retain the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer
|
|
||||||
in this position and unchanged.
|
|
||||||
2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
notice, this list of conditions and the following disclaimer in the
|
|
||||||
documentation and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
@ -1,35 +0,0 @@
|
||||||
More complete build documentation is available on the libarchive
|
|
||||||
Wiki: http://libarchive.googlecode.com/
|
|
||||||
|
|
||||||
On most Unix-like systems, you should be able to install libarchive,
|
|
||||||
bsdtar, and bsdcpio using the following common steps:
|
|
||||||
./configure
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
|
|
||||||
If you need to customize the target directories or otherwise adjust
|
|
||||||
the build setting, use
|
|
||||||
./configure --help
|
|
||||||
to list the configure options.
|
|
||||||
|
|
||||||
If you are developing libarchive and need to update the
|
|
||||||
configure script and other build files:
|
|
||||||
/bin/sh build/autogen.sh
|
|
||||||
|
|
||||||
To create a distribution, please use the 'distcheck' target:
|
|
||||||
/bin/sh build/autogen.sh && ./configure && make distcheck
|
|
||||||
|
|
||||||
On Unix-like and non-Unix-like systems, use the "cmake" utility (available from
|
|
||||||
http://cmake.org/) to generate suitable build files for your platform.
|
|
||||||
Cmake requires the name of the directory containing CmakeLists.txt and
|
|
||||||
the "generator" to use for your build environment. For example, to
|
|
||||||
build with Xcode on Mac OS, you can use the following command:
|
|
||||||
cmake -G "Xcode" ~/libarchive-download-dir/
|
|
||||||
The result will be appropriate makefiles, solution files, or project
|
|
||||||
files that can be used with the corresponding development tool.
|
|
||||||
The default on Unix-like systems is to generate Makefiles, so you
|
|
||||||
can also use cmake instead of the configure script:
|
|
||||||
cmake ~/libarchive-download-dir/
|
|
||||||
make
|
|
||||||
make install
|
|
||||||
See the libarchive Wiki or the cmake site for further documentation.
|
|
|
@ -1,417 +0,0 @@
|
||||||
## Process this file with automake to produce Makefile.in
|
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS= foreign subdir-objects
|
|
||||||
ACLOCAL_AMFLAGS = -I build/autoconf
|
|
||||||
|
|
||||||
#
|
|
||||||
# What to build and install
|
|
||||||
#
|
|
||||||
lib_LTLIBRARIES= libarchive.la
|
|
||||||
noinst_LTLIBRARIES= libarchive_fe.la
|
|
||||||
bin_PROGRAMS= $(bsdtar_programs) $(bsdcpio_programs)
|
|
||||||
man_MANS=
|
|
||||||
BUILT_SOURCES=
|
|
||||||
|
|
||||||
#
|
|
||||||
# What to test: We always test libarchive, test bsdtar and bsdcpio only
|
|
||||||
# if we built them.
|
|
||||||
#
|
|
||||||
check_PROGRAMS=
|
|
||||||
TESTS=
|
|
||||||
TESTS_ENVIRONMENT=
|
|
||||||
# Always build and test both bsdtar and bsdcpio as part of 'distcheck'
|
|
||||||
DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio
|
|
||||||
COMMON_CFLAGS=-Wall -Wformat -Wformat-security
|
|
||||||
# The next line is commented out by default in shipping libarchive releases.
|
|
||||||
# It is uncommented by default in trunk.
|
|
||||||
# DEV_CFLAGS=-Werror -Wextra -Wunused -Wshadow -Wmissing-prototypes -Wcast-qual
|
|
||||||
AM_CFLAGS=$(COMMON_CFLAGS) $(DEV_CFLAGS)
|
|
||||||
PLATFORMCPPFLAGS = @PLATFORMCPPFLAGS@
|
|
||||||
AM_CPPFLAGS=$(PLATFORMCPPFLAGS)
|
|
||||||
|
|
||||||
#
|
|
||||||
# What to include in the distribution
|
|
||||||
#
|
|
||||||
EXTRA_DIST= \
|
|
||||||
CMakeLists.txt \
|
|
||||||
build/autogen.sh \
|
|
||||||
build/bump-version.sh \
|
|
||||||
build/clean.sh \
|
|
||||||
build/cmake \
|
|
||||||
build/version \
|
|
||||||
contrib \
|
|
||||||
doc \
|
|
||||||
examples \
|
|
||||||
$(libarchive_EXTRA_DIST) \
|
|
||||||
$(libarchive_test_EXTRA_DIST) \
|
|
||||||
$(bsdtar_EXTRA_DIST) \
|
|
||||||
$(bsdtar_test_EXTRA_DIST) \
|
|
||||||
$(bsdcpio_EXTRA_DIST) \
|
|
||||||
$(bsdcpio_test_EXTRA_DIST)
|
|
||||||
|
|
||||||
# a) Clean out some unneeded files and directories
|
|
||||||
# b) Collect all documentation and format it for distribution.
|
|
||||||
dist-hook:
|
|
||||||
rm -rf `find $(distdir) -name CVS -type d`
|
|
||||||
rm -rf `find $(distdir) -name .svn -type d`
|
|
||||||
rm -f `find $(distdir) -name '*~'`
|
|
||||||
rm -f `find $(distdir) -name '*.out'`
|
|
||||||
rm -f `find $(distdir) -name '*.core'`
|
|
||||||
-rm -f $(distdir)/*/Makefile $(distdir)/*/*/Makefile
|
|
||||||
cd $(distdir)/doc && /bin/sh update.sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Extra rules for cleanup
|
|
||||||
#
|
|
||||||
DISTCLEANFILES= \
|
|
||||||
libarchive/test/list.h \
|
|
||||||
tar/test/list.h \
|
|
||||||
cpio/test/list.h
|
|
||||||
|
|
||||||
distclean-local:
|
|
||||||
-rm -rf .ref
|
|
||||||
-rm -rf autom4te.cache/
|
|
||||||
-rm -f *~
|
|
||||||
-[ -f libarchive/Makefile ] && cd libarchive && make clean
|
|
||||||
-[ -f libarchive/test/Makefile ] && cd libarchive/test && make clean
|
|
||||||
-[ -f tar/Makefile ] && cd tar && make clean
|
|
||||||
-[ -f tar/test/Makefile ] && cd tar/test && make clean
|
|
||||||
-[ -f cpio/Makefile ] && cd cpio && make clean
|
|
||||||
-[ -f cpio/test/Makefile ] && cd cpio/test && make clean
|
|
||||||
|
|
||||||
#
|
|
||||||
# Libarchive headers, source, etc.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
|
|
||||||
include_HEADERS= libarchive/archive.h libarchive/archive_entry.h
|
|
||||||
|
|
||||||
libarchive_la_SOURCES= \
|
|
||||||
libarchive/archive_acl.c \
|
|
||||||
libarchive/archive_acl_private.h \
|
|
||||||
libarchive/archive_check_magic.c \
|
|
||||||
libarchive/archive_cmdline.c \
|
|
||||||
libarchive/archive_cmdline_private.h \
|
|
||||||
libarchive/archive_crc32.h \
|
|
||||||
libarchive/archive_crypto.c \
|
|
||||||
libarchive/archive_crypto_private.h \
|
|
||||||
libarchive/archive_endian.h \
|
|
||||||
libarchive/archive_entry.c \
|
|
||||||
libarchive/archive_entry.h \
|
|
||||||
libarchive/archive_entry_copy_stat.c \
|
|
||||||
libarchive/archive_entry_link_resolver.c \
|
|
||||||
libarchive/archive_entry_locale.h \
|
|
||||||
libarchive/archive_entry_private.h \
|
|
||||||
libarchive/archive_entry_sparse.c \
|
|
||||||
libarchive/archive_entry_stat.c \
|
|
||||||
libarchive/archive_entry_strmode.c \
|
|
||||||
libarchive/archive_entry_xattr.c \
|
|
||||||
libarchive/archive_getdate.c \
|
|
||||||
libarchive/archive_match.c \
|
|
||||||
libarchive/archive_options.c \
|
|
||||||
libarchive/archive_options_private.h \
|
|
||||||
libarchive/archive_pathmatch.c \
|
|
||||||
libarchive/archive_pathmatch.h \
|
|
||||||
libarchive/archive_platform.h \
|
|
||||||
libarchive/archive_ppmd_private.h \
|
|
||||||
libarchive/archive_ppmd7.c \
|
|
||||||
libarchive/archive_ppmd7_private.h \
|
|
||||||
libarchive/archive_private.h \
|
|
||||||
libarchive/archive_rb.c \
|
|
||||||
libarchive/archive_rb.h \
|
|
||||||
libarchive/archive_read.c \
|
|
||||||
libarchive/archive_read_append_filter.c \
|
|
||||||
libarchive/archive_read_data_into_fd.c \
|
|
||||||
libarchive/archive_read_disk_entry_from_file.c \
|
|
||||||
libarchive/archive_read_disk_posix.c \
|
|
||||||
libarchive/archive_read_disk_private.h \
|
|
||||||
libarchive/archive_read_disk_set_standard_lookup.c \
|
|
||||||
libarchive/archive_read_extract.c \
|
|
||||||
libarchive/archive_read_open_fd.c \
|
|
||||||
libarchive/archive_read_open_file.c \
|
|
||||||
libarchive/archive_read_open_filename.c \
|
|
||||||
libarchive/archive_read_open_memory.c \
|
|
||||||
libarchive/archive_read_private.h \
|
|
||||||
libarchive/archive_read_set_format.c \
|
|
||||||
libarchive/archive_read_set_options.c \
|
|
||||||
libarchive/archive_read_support_filter_all.c \
|
|
||||||
libarchive/archive_read_support_filter_bzip2.c \
|
|
||||||
libarchive/archive_read_support_filter_compress.c \
|
|
||||||
libarchive/archive_read_support_filter_grzip.c \
|
|
||||||
libarchive/archive_read_support_filter_gzip.c \
|
|
||||||
libarchive/archive_read_support_filter_lrzip.c \
|
|
||||||
libarchive/archive_read_support_filter_lzop.c \
|
|
||||||
libarchive/archive_read_support_filter_none.c \
|
|
||||||
libarchive/archive_read_support_filter_program.c \
|
|
||||||
libarchive/archive_read_support_filter_rpm.c \
|
|
||||||
libarchive/archive_read_support_filter_uu.c \
|
|
||||||
libarchive/archive_read_support_filter_xz.c \
|
|
||||||
libarchive/archive_read_support_format_7zip.c \
|
|
||||||
libarchive/archive_read_support_format_all.c \
|
|
||||||
libarchive/archive_read_support_format_ar.c \
|
|
||||||
libarchive/archive_read_support_format_by_code.c \
|
|
||||||
libarchive/archive_read_support_format_cab.c \
|
|
||||||
libarchive/archive_read_support_format_cpio.c \
|
|
||||||
libarchive/archive_read_support_format_empty.c \
|
|
||||||
libarchive/archive_read_support_format_iso9660.c \
|
|
||||||
libarchive/archive_read_support_format_lha.c \
|
|
||||||
libarchive/archive_read_support_format_mtree.c \
|
|
||||||
libarchive/archive_read_support_format_rar.c \
|
|
||||||
libarchive/archive_read_support_format_raw.c \
|
|
||||||
libarchive/archive_read_support_format_tar.c \
|
|
||||||
libarchive/archive_read_support_format_xar.c \
|
|
||||||
libarchive/archive_read_support_format_zip.c \
|
|
||||||
libarchive/archive_string.c \
|
|
||||||
libarchive/archive_string.h \
|
|
||||||
libarchive/archive_string_composition.h \
|
|
||||||
libarchive/archive_string_sprintf.c \
|
|
||||||
libarchive/archive_util.c \
|
|
||||||
libarchive/archive_virtual.c \
|
|
||||||
libarchive/archive_write.c \
|
|
||||||
libarchive/archive_write_disk_acl.c \
|
|
||||||
libarchive/archive_write_disk_posix.c \
|
|
||||||
libarchive/archive_write_disk_private.h \
|
|
||||||
libarchive/archive_write_disk_set_standard_lookup.c \
|
|
||||||
libarchive/archive_write_open_fd.c \
|
|
||||||
libarchive/archive_write_open_file.c \
|
|
||||||
libarchive/archive_write_open_filename.c \
|
|
||||||
libarchive/archive_write_open_memory.c \
|
|
||||||
libarchive/archive_write_private.h \
|
|
||||||
libarchive/archive_write_add_filter.c \
|
|
||||||
libarchive/archive_write_add_filter_b64encode.c \
|
|
||||||
libarchive/archive_write_add_filter_by_name.c \
|
|
||||||
libarchive/archive_write_add_filter_bzip2.c \
|
|
||||||
libarchive/archive_write_add_filter_compress.c \
|
|
||||||
libarchive/archive_write_add_filter_grzip.c \
|
|
||||||
libarchive/archive_write_add_filter_gzip.c \
|
|
||||||
libarchive/archive_write_add_filter_lrzip.c \
|
|
||||||
libarchive/archive_write_add_filter_lzop.c \
|
|
||||||
libarchive/archive_write_add_filter_none.c \
|
|
||||||
libarchive/archive_write_add_filter_program.c \
|
|
||||||
libarchive/archive_write_add_filter_uuencode.c \
|
|
||||||
libarchive/archive_write_add_filter_xz.c \
|
|
||||||
libarchive/archive_write_set_format.c \
|
|
||||||
libarchive/archive_write_set_format_7zip.c \
|
|
||||||
libarchive/archive_write_set_format_ar.c \
|
|
||||||
libarchive/archive_write_set_format_by_name.c \
|
|
||||||
libarchive/archive_write_set_format_cpio.c \
|
|
||||||
libarchive/archive_write_set_format_cpio_newc.c \
|
|
||||||
libarchive/archive_write_set_format_iso9660.c \
|
|
||||||
libarchive/archive_write_set_format_mtree.c \
|
|
||||||
libarchive/archive_write_set_format_pax.c \
|
|
||||||
libarchive/archive_write_set_format_shar.c \
|
|
||||||
libarchive/archive_write_set_format_ustar.c \
|
|
||||||
libarchive/archive_write_set_format_v7tar.c \
|
|
||||||
libarchive/archive_write_set_format_gnutar.c \
|
|
||||||
libarchive/archive_write_set_format_xar.c \
|
|
||||||
libarchive/archive_write_set_format_zip.c \
|
|
||||||
libarchive/archive_write_set_options.c \
|
|
||||||
libarchive/config_freebsd.h \
|
|
||||||
libarchive/filter_fork_posix.c \
|
|
||||||
libarchive/filter_fork.h
|
|
||||||
|
|
||||||
if INC_WINDOWS_FILES
|
|
||||||
libarchive_la_SOURCES+= \
|
|
||||||
libarchive/archive_entry_copy_bhfi.c \
|
|
||||||
libarchive/archive_read_disk_windows.c \
|
|
||||||
libarchive/archive_windows.h \
|
|
||||||
libarchive/archive_windows.c \
|
|
||||||
libarchive/archive_write_disk_windows.c \
|
|
||||||
libarchive/filter_fork_windows.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
# -no-undefined marks that libarchive doesn't rely on symbols
|
|
||||||
# defined in the application. This is mandatory for cygwin.
|
|
||||||
libarchive_la_LDFLAGS= -no-undefined -version-info $(ARCHIVE_LIBTOOL_VERSION)
|
|
||||||
libarchive_la_LIBADD= $(LTLIBICONV)
|
|
||||||
|
|
||||||
# Manpages to install
|
|
||||||
libarchive_man_MANS=
|
|
||||||
|
|
||||||
# Additional libarchive files to include in the distribution
|
|
||||||
libarchive_EXTRA_DIST= \
|
|
||||||
libarchive/archive_windows.c \
|
|
||||||
libarchive/archive_windows.h \
|
|
||||||
libarchive/filter_fork_windows.c \
|
|
||||||
libarchive/CMakeLists.txt \
|
|
||||||
$(libarchive_man_MANS)
|
|
||||||
|
|
||||||
# pkgconfig
|
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
|
||||||
pkgconfig_DATA = build/pkgconfig/libarchive.pc
|
|
||||||
|
|
||||||
# Sources needed by all test programs
|
|
||||||
test_utils_SOURCES=
|
|
||||||
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# libarchive_test program
|
|
||||||
#
|
|
||||||
#
|
|
||||||
libarchive_test_SOURCES=
|
|
||||||
|
|
||||||
libarchive_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/test_utils -I$(top_builddir)/libarchive/test -DLIBARCHIVE_STATIC $(PLATFORMCPPFLAGS)
|
|
||||||
libarchive_test_LDADD= $(LTLIBICONV)
|
|
||||||
|
|
||||||
libarchive_TESTS_ENVIRONMENT=
|
|
||||||
|
|
||||||
libarchive_test_EXTRA_DIST=
|
|
||||||
|
|
||||||
#
|
|
||||||
# Common code for libarchive frontends (cpio, tar)
|
|
||||||
#
|
|
||||||
libarchive_fe_la_SOURCES= \
|
|
||||||
libarchive_fe/err.c \
|
|
||||||
libarchive_fe/err.h \
|
|
||||||
libarchive_fe/lafe_platform.h \
|
|
||||||
libarchive_fe/line_reader.c \
|
|
||||||
libarchive_fe/line_reader.h
|
|
||||||
|
|
||||||
libarchive_fe_la_CPPFLAGS= -I$(top_srcdir)/libarchive
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# bsdtar source, docs, etc.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
|
|
||||||
bsdtar_SOURCES= \
|
|
||||||
tar/bsdtar.c \
|
|
||||||
tar/bsdtar.h \
|
|
||||||
tar/bsdtar_platform.h \
|
|
||||||
tar/cmdline.c \
|
|
||||||
tar/creation_set.c \
|
|
||||||
tar/read.c \
|
|
||||||
tar/subst.c \
|
|
||||||
tar/util.c \
|
|
||||||
tar/write.c
|
|
||||||
|
|
||||||
if INC_WINDOWS_FILES
|
|
||||||
bsdtar_SOURCES+= \
|
|
||||||
tar/bsdtar_windows.h \
|
|
||||||
tar/bsdtar_windows.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
bsdtar_DEPENDENCIES= libarchive.la libarchive_fe.la
|
|
||||||
|
|
||||||
if STATIC_BSDTAR
|
|
||||||
bsdtar_ldstatic= -static
|
|
||||||
bsdtar_ccstatic= -DLIBARCHIVE_STATIC
|
|
||||||
else
|
|
||||||
bsdtar_ldstatic=
|
|
||||||
bsdtar_ccstatic=
|
|
||||||
endif
|
|
||||||
|
|
||||||
bsdtar_LDADD= libarchive.la libarchive_fe.la $(LTLIBICONV)
|
|
||||||
bsdtar_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdtar_ccstatic) $(PLATFORMCPPFLAGS)
|
|
||||||
bsdtar_LDFLAGS= $(bsdtar_ldstatic)
|
|
||||||
|
|
||||||
bsdtar_EXTRA_DIST= \
|
|
||||||
tar/bsdtar.1 \
|
|
||||||
tar/bsdtar_windows.h \
|
|
||||||
tar/bsdtar_windows.c \
|
|
||||||
tar/CMakeLists.txt \
|
|
||||||
tar/config_freebsd.h
|
|
||||||
|
|
||||||
|
|
||||||
if BUILD_BSDTAR
|
|
||||||
bsdtar_man_MANS= tar/bsdtar.1
|
|
||||||
bsdtar_programs= bsdtar
|
|
||||||
else
|
|
||||||
bsdtar_man_MANS=
|
|
||||||
bsdtar_programs=
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
|
||||||
# bsdtar_test
|
|
||||||
#
|
|
||||||
|
|
||||||
bsdtar_test_SOURCES=
|
|
||||||
|
|
||||||
bsdtar_test_CPPFLAGS=\
|
|
||||||
-I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe \
|
|
||||||
-I$(top_srcdir)/test_utils \
|
|
||||||
-I$(top_srcdir)/tar -I$(top_builddir)/tar/test \
|
|
||||||
$(PLATFORMCPPFLAGS)
|
|
||||||
|
|
||||||
if BUILD_BSDTAR
|
|
||||||
bsdtar_test_programs=
|
|
||||||
bsdtar_TESTS_ENVIRONMENT= BSDTAR=`cd $(top_builddir);/bin/pwd`/bsdtar$(EXEEXT) BSDTAR_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/tar/test
|
|
||||||
else
|
|
||||||
bsdtar_test_programs=
|
|
||||||
bsdtar_TESTS_ENVIRONMENT=
|
|
||||||
endif
|
|
||||||
|
|
||||||
bsdtar_test_EXTRA_DIST=
|
|
||||||
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# bsdcpio source, docs, etc.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
|
|
||||||
bsdcpio_SOURCES= \
|
|
||||||
cpio/cmdline.c \
|
|
||||||
cpio/cpio.c \
|
|
||||||
cpio/cpio.h \
|
|
||||||
cpio/cpio_platform.h
|
|
||||||
|
|
||||||
if INC_WINDOWS_FILES
|
|
||||||
bsdcpio_SOURCES+= \
|
|
||||||
cpio/cpio_windows.h \
|
|
||||||
cpio/cpio_windows.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
bsdcpio_DEPENDENCIES = libarchive.la libarchive_fe.la
|
|
||||||
|
|
||||||
|
|
||||||
if STATIC_BSDCPIO
|
|
||||||
bsdcpio_ldstatic= -static
|
|
||||||
bsdcpio_ccstatic= -DLIBARCHIVE_STATIC
|
|
||||||
else
|
|
||||||
bsdcpio_ldstatic=
|
|
||||||
bsdcpio_ccstatic=
|
|
||||||
endif
|
|
||||||
|
|
||||||
bsdcpio_LDADD= libarchive_fe.la libarchive.la $(LTLIBICONV)
|
|
||||||
bsdcpio_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdcpio_ccstatic) $(PLATFORMCPPFLAGS)
|
|
||||||
bsdcpio_LDFLAGS= $(bsdcpio_ldstatic)
|
|
||||||
|
|
||||||
bsdcpio_EXTRA_DIST= \
|
|
||||||
cpio/bsdcpio.1 \
|
|
||||||
cpio/cpio_windows.h \
|
|
||||||
cpio/cpio_windows.c \
|
|
||||||
cpio/CMakeLists.txt \
|
|
||||||
cpio/config_freebsd.h
|
|
||||||
|
|
||||||
|
|
||||||
if BUILD_BSDCPIO
|
|
||||||
# Manpages to install
|
|
||||||
bsdcpio_man_MANS=
|
|
||||||
bsdcpio_programs= bsdcpio
|
|
||||||
else
|
|
||||||
bsdcpio_man_MANS=
|
|
||||||
bsdcpio_programs=
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
|
||||||
# bsdcpio_test
|
|
||||||
#
|
|
||||||
|
|
||||||
bsdcpio_test_SOURCES=
|
|
||||||
|
|
||||||
bsdcpio_test_CPPFLAGS= \
|
|
||||||
-I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe \
|
|
||||||
-I$(top_srcdir)/test_utils \
|
|
||||||
-I$(top_srcdir)/cpio -I$(top_builddir)/cpio/test \
|
|
||||||
$(PLATFORMCPPFLAGS)
|
|
||||||
bsdcpio_test_LDADD=libarchive_fe.la
|
|
||||||
|
|
||||||
if BUILD_BSDCPIO
|
|
||||||
bsdcpio_test_programs=
|
|
||||||
bsdcpio_TESTS_ENVIRONMENT= BSDCPIO=`cd $(top_builddir);/bin/pwd`/bsdcpio$(EXEEXT) BSDCPIO_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/cpio/test
|
|
||||||
else
|
|
||||||
bsdcpio_test_programs=
|
|
||||||
bsdcpio_TESTS_ENVIRONMENT=
|
|
||||||
endif
|
|
||||||
|
|
||||||
bsdcpio_test_EXTRA_DIST=
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,626 +0,0 @@
|
||||||
Feb 09, 2013: libarchive 3.1.2 released
|
|
||||||
|
|
||||||
Jan 28, 2013: libarchive's new website moved to http://www.libarchive.org.
|
|
||||||
|
|
||||||
Jan 13, 2013: libarchive 3.1.1 released
|
|
||||||
|
|
||||||
Jan 13, 2013: libarchive 3.1.0 released
|
|
||||||
|
|
||||||
Dec 07, 2012: Implement functions to manually set the format and filters used.
|
|
||||||
|
|
||||||
Nov 11, 2012: Add support for __MACOSX directory in Zip archives, which resource
|
|
||||||
forks are stored in.
|
|
||||||
|
|
||||||
Oct 20, 2012: Add support for writing v7 tar format.
|
|
||||||
|
|
||||||
Oct 09, 2012: Add support for grzip compression.
|
|
||||||
|
|
||||||
Oct 07, 2012: Introduce b64encode filter.
|
|
||||||
Oct 07, 2012: Introduce uuencode filter.
|
|
||||||
|
|
||||||
Oct 06, 2012: Add support for lzop.
|
|
||||||
|
|
||||||
Sep 27, 2012: Implement function used to seek within data blocks.
|
|
||||||
(Currently only supported for uncompressed RAR archives).
|
|
||||||
|
|
||||||
Apr 22, 2012: Add basic archive read and write filter support for lrzip.
|
|
||||||
|
|
||||||
Mar 27, 2012: libarchive 3.0.4 released
|
|
||||||
|
|
||||||
Feb 05, 2012: libarchive development now hosted at GitHub.
|
|
||||||
http://libarchive.github.com/
|
|
||||||
Feb 05, 2012: libarchive's issue tracker remains at Google Code.
|
|
||||||
http://code.google.com/p/libarchive/issues/list
|
|
||||||
Feb 05, 2012: libarchive's mailing lists remain at Google Groups.
|
|
||||||
|
|
||||||
Dec 24, 2011: libarchive 3.0.2 released
|
|
||||||
Dec 23, 2011: Various fixes merged from FreeBSD
|
|
||||||
Dec 23, 2011: Symlink support in Zip reader and writer
|
|
||||||
Dec 23, 2011: Robustness fixes to 7Zip reader
|
|
||||||
|
|
||||||
Nov 27, 2011: libarchive 3.0.1b released
|
|
||||||
|
|
||||||
Nov 26, 2011: 7Zip reader
|
|
||||||
Nov 26, 2011: Small fixes to ISO and Zip to improve robustness with corrupted input
|
|
||||||
Nov 24, 2011: Improve streaming Zip reader's support for uncompressed entries
|
|
||||||
Nov 20, 2011: New seeking Zip reader supports SFX Zip archives
|
|
||||||
Nov 20, 2011: Build fixes on Windows
|
|
||||||
|
|
||||||
Nov 13, 2011: libarchive 3.0.0a released
|
|
||||||
|
|
||||||
Nov 06, 2011: Update shared-library version calculations for libarchive 3.x
|
|
||||||
Sep 04, 2011: Fix tar -s; follow GNU tar for controlling hardlink/symlink substitutions
|
|
||||||
Aug 18, 2011: Fix reading ISO images built by NetBSD's mkisofs
|
|
||||||
Aug 15, 2011: Old archive_read_support_compression_XXX functions are deprecated and
|
|
||||||
will disappear in libarchive 4.0.
|
|
||||||
Jun 26, 2011: RAR reader
|
|
||||||
Jun 16, 2011: Add tar:compat-2x option to emulate broken libarchive 2.x
|
|
||||||
handling of pax UTF-8 headers
|
|
||||||
Apr 25, 2011: Refactor read_open() into a collection of single-item setters;
|
|
||||||
support the old interfaces as wrappers
|
|
||||||
Apr 12, 2011: Split disk writer into separate POSIX and Windows implementations
|
|
||||||
Apr 10, 2011: Improvements to character translations on Windows.
|
|
||||||
Mar 30, 2011: More work to return errors instead of calling abort()
|
|
||||||
Mar 23, 2011: Add charset option to many writers to control MBCS filenames
|
|
||||||
Mar 17, 2011: Overhauled support for per-format extension options
|
|
||||||
Mar 17, 2011: Track character set used for mbcs strings, support
|
|
||||||
translating to/from user-specified locale
|
|
||||||
Mar 09, 2011: Recognize mtree files without requiring a signature
|
|
||||||
Mar 06, 2011: Use iconv to convert to/from Unicode instead of making bad
|
|
||||||
assumptions about the C90 character set translation functions
|
|
||||||
Feb 17, 2011: Fixes for AIX, TRU64, and other platforms
|
|
||||||
Dec 22, 2010: CAB reader
|
|
||||||
Dec 20, 2010: LHA/LZH reader
|
|
||||||
Jul 03, 2010: minitar example demonstrates archive_read_disk directory traversal
|
|
||||||
Jun 29, 2010: Many improvements to ISO reader compatibility
|
|
||||||
Jun 26, 2010: Use larger buffers when copy files into an archive
|
|
||||||
Jun 18, 2010: Reimplement Mac OS extensions in libarchive
|
|
||||||
Jun 09, 2010: archive_read_disk now supports traversals
|
|
||||||
May 28, 2010: XAR writer
|
|
||||||
May 16, 2010: Fix ^T handling; don't exit on interrupted reads and writes
|
|
||||||
May 09, 2010: Improved detection of platform-specific crypto support
|
|
||||||
May 04, 2010: lzip read and write filters
|
|
||||||
May 01, 2010: New options: tar --gid --gname --uid --uname
|
|
||||||
Apr 28, 2010: Use Red-black tree for ISO reader/writer to improve performance
|
|
||||||
Apr 17, 2010: Minimal writer for legacy GNU tar format
|
|
||||||
Mar 12, 2010: Don't dereference symlinks on Linux when reading ACLs.
|
|
||||||
Mar 06, 2010: Fix build when an older libarchive is already installed
|
|
||||||
Feb 28, 2010: Relax handling of state failures; misuse by clients now generally
|
|
||||||
results in a sticky ARCHIVE_FATAL rather than a visit to abort()
|
|
||||||
Feb 25, 2010: ISO writer
|
|
||||||
Feb 21, 2010: Split many man pages into smaller chunks.
|
|
||||||
Feb 21, 2010: Performance: Cheat on block sizes when reading archives from disk.
|
|
||||||
Feb 21, 2010: Use int64_t instead of off_t, dev_t, ino_t, uid_t, and gid_t
|
|
||||||
Feb 20, 2010: Document new ACL functions.
|
|
||||||
Feb 19, 2010: Support multiple write filters
|
|
||||||
Feb 07, 2010: Remove some legacy libarchive 1.x APIs
|
|
||||||
Feb 04, 2010: Read afio headers
|
|
||||||
Feb 02, 2010: Archive sparse files compatibly with GNU tar
|
|
||||||
Feb 01, 2010: Integrate Apple extensions for Mac OS extended attributes into bsdtar
|
|
||||||
Jan 31, 2010: Support cpio -V
|
|
||||||
|
|
||||||
Feb 04, 2010: libarchive 2.8.0 released
|
|
||||||
Jan 17, 2010: Fix error handling for 'echo nonexistent | cpio -o'
|
|
||||||
Jan 17, 2010: Don't use futimes() on Cygwin
|
|
||||||
|
|
||||||
Jan 02, 2010: libarchive 2.7.902a released (test release for 2.8)
|
|
||||||
Jan 02, 2010: Fix tar/test/test_windows on MinGW
|
|
||||||
Jan 02, 2010: Fix memory leaks in libarchive tests
|
|
||||||
Jan 01, 2010: Fix memory leak when filter startup fails
|
|
||||||
|
|
||||||
Dec 27, 2009: libarchive 2.7.901a released (test release for 2.8)
|
|
||||||
|
|
||||||
Aug 04, 2009: libarchive 2.7.1 released
|
|
||||||
Jul 20, 2009: Suppress bogus warning about unxz
|
|
||||||
Jul 19, 2009: Support Cygwin 1.7
|
|
||||||
Jun 11, 2009: Support lzma/xz files compressed with larger buffer sizes.
|
|
||||||
May 24, 2009: Handle gzip files signed with OpenBSD "gzsig" program.
|
|
||||||
May 07, 2009: Avoid false failures when reading from pipe.
|
|
||||||
|
|
||||||
Apr 16, 2009: libarchive 2.7.0 released
|
|
||||||
|
|
||||||
Apr 10, 2009: libarchive 2.6.992a released
|
|
||||||
Apr 09, 2009: Fix SIGPIPE issue building with MSVC.
|
|
||||||
Apr 09, 2009: Fix several minor memory leaks in libarchive and libarchive_test
|
|
||||||
|
|
||||||
Apr 08, 2009: libarchive 2.6.991a released
|
|
||||||
Apr 07, 2009: Additional tests added to bsdcpio_test
|
|
||||||
|
|
||||||
Apr 01, 2009: libarchive 2.6.990a released
|
|
||||||
Apr 01, 2009: Use command-line gunzip, bunzip2, unxz, unlzma for
|
|
||||||
decompression if the library is built without suitable
|
|
||||||
libraries. The setup functions return ARCHIVE_WARN
|
|
||||||
in this case so clients can adapt if necessary.
|
|
||||||
Apr 01, 2009: Use getpw*_r and getgr*_r functions for thread-safety.
|
|
||||||
Mar 24, 2009: Add archive_read_next_header2(), which is up to 25%
|
|
||||||
more efficient for some clients; from Brian Harring.
|
|
||||||
Mar 22, 2009: PDF versions of manpages are now included in the distribution.
|
|
||||||
Mar, 2009: Major work to improve Cygwin build by Charles Wilson.
|
|
||||||
Feb/Mar, 2009: Major work on cmake build support, mostly by Michihiro NAKAJIMA.
|
|
||||||
Feb/Mar, 2009: Major work on Visual Studio support by Michihiro NAKAJIMA.
|
|
||||||
All tests now pass.
|
|
||||||
Feb 25, 2009: Fix Debian Bug #516577
|
|
||||||
Feb 21, 2009: Yacc is no longer needed to build; date parser rewritten in C.
|
|
||||||
Jan/Feb, 2009: Mtree work by Michihiro.
|
|
||||||
Feb, 2009: Joliet support by Andreas Henriksson.
|
|
||||||
Jan/Feb, 2009: New options framework by Michihiro.
|
|
||||||
Feb, 2009: High-res timestamps on Tru64, AIX, and GNU Hurd, by Björn Jacke.
|
|
||||||
Jan 18, 2009: Extended attributes work on FreeBSD and Linux now with pax format.
|
|
||||||
Jan 07, 2009: New archive_read_disk_entry_from_file() knows about ACLs,
|
|
||||||
extended attributes, etc so that bsdtar and bsdcpio don't require
|
|
||||||
such system-specific knowledge.
|
|
||||||
Jan 03, 2009: Read filter system extensively refactored. In particular,
|
|
||||||
read filter pipelines are now built out automatically and individual
|
|
||||||
filters should be much easier to implement. Documentation on the
|
|
||||||
Googlecode Wiki explains how to implement new filters.
|
|
||||||
Dec 28, 2008: Many Windows/Visual Studio fixes from Michihiro NAKAJIMA.
|
|
||||||
|
|
||||||
Dec 28, 2008: Main libarchive development moved from FreeBSD Perforce
|
|
||||||
server to Google Code. This should make it easier for more
|
|
||||||
people to participate in libarchive development.
|
|
||||||
|
|
||||||
Dec 28, 2008: libarchive 2.6.0 released
|
|
||||||
Dec 25, 2008: libarchive 2.5.905a released
|
|
||||||
Dec 10, 2008: libarchive 2.5.904a released
|
|
||||||
Dec 04, 2008: libarchive 2.5.903a released
|
|
||||||
Nov 09, 2008: libarchive 2.5.902a released
|
|
||||||
Nov 08, 2008: libarchive 2.5.901a released
|
|
||||||
Nov 08, 2008: Start of pre-release testing for libarchive 2.6
|
|
||||||
|
|
||||||
Nov 07, 2008: Read filter refactor: The decompression routines just
|
|
||||||
consume and produce arbitrarily-sized blocks. The reblocking
|
|
||||||
from read_support_compression_none() has been pulled into the
|
|
||||||
read core. Also, the decompression bid now makes multiple
|
|
||||||
passes and stacks read filters.
|
|
||||||
Oct 21, 2008: bsdcpio: New command-line parser.
|
|
||||||
Oct 19, 2008: Internal read_ahead change: short reads are now an error
|
|
||||||
Oct 06, 2008: bsdtar: option parser no longer uses getopt_long(),
|
|
||||||
gives consistent option parsing on all platforms.
|
|
||||||
Sep 19, 2008: Jaakko Heinonen: shar utility built on libarchive
|
|
||||||
Sep 17, 2008: Pedro Giffuni: birthtime support
|
|
||||||
Sep 17, 2008: Miklos Vajna: lzma reader and test. Note: I still have
|
|
||||||
some concerns about the auto-detection (LZMA file format
|
|
||||||
doesn't support auto-detection well), so this is not yet
|
|
||||||
enabled under archive_read_support_compression_all(). For
|
|
||||||
now, you must call archive_read_support_compression_lzma() if
|
|
||||||
you want LZMA read support.
|
|
||||||
Sep 11, 2008: Ivailo Petrov: Many fixes to Windows build, new solution files
|
|
||||||
Jul 26, 2008: archive_entry now tracks which values have not been set.
|
|
||||||
This helps zip extraction (file size is often "unknown") and
|
|
||||||
time restores (tar usually doesn't know atime).
|
|
||||||
Jul 26, 2008: Joerg Sonnenberger: Performance improvements to shar writer
|
|
||||||
Jul 25, 2008: Joerg Sonnenberger: mtree write support
|
|
||||||
|
|
||||||
Jul 02, 2008: libarchive 2.5.5 released
|
|
||||||
|
|
||||||
Jul 02, 2008: libarchive 2.5.5b released
|
|
||||||
Jul 01, 2008: bsdcpio is being used by enough people, we can call it 1.0.0 now
|
|
||||||
Jun 20, 2008: bsdcpio: If a -l link fails with EXDEV, copy the file instead
|
|
||||||
Jun 19, 2008: bsdcpio: additional long options for better GNU cpio compat
|
|
||||||
Jun 15, 2008: Many small portability and bugfixes since 2.5.4b.
|
|
||||||
|
|
||||||
May 25, 2008: libarchive 2.5.4b released
|
|
||||||
May 21, 2008: Joerg Sonnenberger: fix bsdtar hardlink handling for newc format
|
|
||||||
|
|
||||||
May 21, 2008: More progress on Windows building. Thanks to "Scott"
|
|
||||||
for the Windows makefiles, thanks to Kees Zeelenberg for
|
|
||||||
code contributions.
|
|
||||||
|
|
||||||
May 21, 2008: Fix a number of non-exploitable integer and buffer overflows,
|
|
||||||
thanks to David Remahl at Apple for pointing these out.
|
|
||||||
|
|
||||||
May 21, 2008: Colin Percival: SIGINFO or SIGUSR1 to bsdtar prints progress info
|
|
||||||
|
|
||||||
May 16, 2008: bsdtar's test harness no longer depends on file ordering.
|
|
||||||
This was causing spurious test failures on a lot of systems.
|
|
||||||
Thanks to Bernhard R. Link for the diagnosis.
|
|
||||||
|
|
||||||
May 14, 2008: Joerg Sonnenberger: -s substitution support for bsdtar
|
|
||||||
|
|
||||||
May 13, 2008: Joerg Sonnenberger: Many mtree improvements
|
|
||||||
|
|
||||||
May 11, 2008: Joerg Sonnenberger: fix hardlink extraction when
|
|
||||||
hardlinks have different permissions from original file
|
|
||||||
|
|
||||||
April 30, 2008: Primary libarchive work has been moved into the FreeBSD
|
|
||||||
project's Perforce repository: http://perforce.freebsd.org/
|
|
||||||
The libarchive project can be browsed at
|
|
||||||
//depot/user/kientzle/libarchive-portable
|
|
||||||
Direct link: http://preview.tinyurl.com/46mdgr
|
|
||||||
|
|
||||||
May 04, 2008: libarchive 2.5.3b released
|
|
||||||
* libarchive: Several fixes to link resolver to address bsdcpio crashes
|
|
||||||
* bsdcpio: -p hardlink handling fixes
|
|
||||||
* tar/pax: Ensure ustar dirnames end in '/'; be more careful about
|
|
||||||
measuring filenames when deciding what pathname fields to use
|
|
||||||
* libarchive: Mark which entry strings are set; be accurate about
|
|
||||||
distinguishing empty strings ("") from unset ones (NULL)
|
|
||||||
* tar: Don't crash reading entries with empty filenames
|
|
||||||
* libarchive_test, bsdtar_test, bsdcpio_test: Better detaults:
|
|
||||||
run all tests, delete temp dirs, summarize repeated failures
|
|
||||||
* -no-undefined to libtool for Cygwin
|
|
||||||
* libarchive_test: Skip large file tests on systems with 32-bit off_t
|
|
||||||
* iso9660: Don't bother trying to find the body of an empty file;
|
|
||||||
this works around strange behavior from some ISO9660 writers
|
|
||||||
* tar: allow -r -T to be used together
|
|
||||||
* tar: allow --format with -r or -u
|
|
||||||
* libarchive: Don't build archive.h
|
|
||||||
|
|
||||||
May 04, 2008: Simplified building: archive.h is no longer constructed
|
|
||||||
This may require additional #if conditionals on some platforms.
|
|
||||||
|
|
||||||
Mar 30, 2008: libarchive 2.5.1b released
|
|
||||||
|
|
||||||
Mar 15, 2008: libarchive 2.5.0b released
|
|
||||||
Mar 15, 2008: bsdcpio now seems to correctly write hardlinks into newc,
|
|
||||||
ustar, and old cpio archives. Just a little more testing before
|
|
||||||
bsdcpio 1.0 becomes a reality.
|
|
||||||
Mar 15, 2008: I think the new linkify() interface is finally handling
|
|
||||||
all known hardlink strategies.
|
|
||||||
Mar 15, 2008: Mtree read fixes from Joerg Sonnenberger.
|
|
||||||
Mar 15, 2008: Many new bsdtar and bsdcpio options from Joerg Sonnenberger.
|
|
||||||
Mar 15, 2008: test harnesses no longer require uudecode; they
|
|
||||||
now have built-in decoding logic that decodes the reference
|
|
||||||
files as they are needed.
|
|
||||||
|
|
||||||
Mar 14, 2008: libarchive 2.4.14 released; identical to 2.4.13 except for
|
|
||||||
a point fix for gname/uname mixup in pax format that was introduced
|
|
||||||
with the UTF-8 fixes.
|
|
||||||
|
|
||||||
Feb 26, 2008: libarchive 2.4.13 released
|
|
||||||
Feb 25, 2008: Handle path, linkname, gname, or uname that can't be converted
|
|
||||||
to/from UTF-8. Implement "hdrcharset" attribute from SUS-2008.
|
|
||||||
Feb 25, 2008: Fix name clash on NetBSD.
|
|
||||||
Feb 18, 2008: Fix writing empty 'ar' archives, per Kai Wang
|
|
||||||
Feb 18, 2008: [bsdtar] Permit appending on block devices.
|
|
||||||
Feb 09, 2008: New "linkify" resolver to help with newc hardlink writing;
|
|
||||||
bsdcpio still needs to be converted to use this.
|
|
||||||
Feb 02, 2008: Windows compatibility fixes from Ivailo Petrov, Kees Zeelenberg
|
|
||||||
Jan 30, 2008: Ignore hardlink size for non-POSIX tar archives.
|
|
||||||
|
|
||||||
Jan 22, 2008: libarchive 2.4.12 released
|
|
||||||
Jan 22, 2008: Fix bad padding when writing symlinks to newc cpio archives.
|
|
||||||
Jan 22, 2008: Verify bsdcpio_test by getting it to work against GNU cpio 2.9.
|
|
||||||
bsdcpio_test complains about missing options (-y and -z), format
|
|
||||||
of informational messages (--version, --help), and a minor formatting
|
|
||||||
issue in odc format output. After this update, bsdcpio_test uncovered
|
|
||||||
several more cosmetic issues in bsdcpio, all now fixed.
|
|
||||||
Jan 22, 2008: Experimental support for self-extracting Zip archives.
|
|
||||||
Jan 22, 2008: Extend hardlink restore strategy to work correctly with
|
|
||||||
hardlinks extracted from newc cpio files. (Which store the body
|
|
||||||
only with the last occurrence of a link.)
|
|
||||||
|
|
||||||
Dec 30, 2007: libarchive 2.4.11 released
|
|
||||||
Dec 30, 2007: Fixed a compile error in bsdcpio on some systems.
|
|
||||||
|
|
||||||
Dec 29, 2007: libarchive 2.4.10 released
|
|
||||||
Dec 29, 2007: bsdcpio 0.9.0 is ready for wider use.
|
|
||||||
Dec 29, 2007: Completed initial test harness for bsdcpio.
|
|
||||||
|
|
||||||
Dec 22, 2007: libarchive 2.4.9 released
|
|
||||||
Dec 22, 2007: Implement the remaining options for bsdcpio: -a, -q, -L, -f,
|
|
||||||
pattern selection for -i and -it.
|
|
||||||
|
|
||||||
Dec 13, 2007: libarchive 2.4.8 released
|
|
||||||
Dec 13, 2007: gzip and bzip2 compression now handle zero-byte writes correctly,
|
|
||||||
Thanks to Damien Golding for bringing this to my attention.
|
|
||||||
|
|
||||||
Dec 12, 2007: libarchive 2.4.7 released
|
|
||||||
|
|
||||||
Dec 10, 2007: libarchive 2.4.6 released
|
|
||||||
Dec 09, 2007: tar/test/test_copy.c verifies "tar -c | tar -x" copy pipeline
|
|
||||||
Dec 07, 2007: Fix a couple of minor memory leaks.
|
|
||||||
|
|
||||||
Dec 04, 2007: libarchive 2.4.5 released
|
|
||||||
Dec 04, 2007: Fix cpio/test/test_write_odc by setting the umask first.
|
|
||||||
|
|
||||||
Dec 03, 2007: libarchive 2.4.4 released
|
|
||||||
Dec 03, 2007: New configure options --disable-xattr and --disable-acl,
|
|
||||||
thanks to Samuli Suominen.
|
|
||||||
|
|
||||||
Dec 03, 2007: libarchive 2.4.3 released
|
|
||||||
Dec 03, 2007: Thanks to Lapo Luchini for sending me a ZIP file that
|
|
||||||
libarchive couldn't handle. Fixed a bug in handling of
|
|
||||||
"length at end" flags in ZIP files.
|
|
||||||
Dec 03, 2007: Fixed bsdcpio -help, bsdtar -help tests.
|
|
||||||
Dec 02, 2007: First cut at real bsdtar test harness.
|
|
||||||
|
|
||||||
Dec 02, 2007: libarchive 2.4.2 released
|
|
||||||
|
|
||||||
Dec 02, 2007: libarchive 2.4.1 released
|
|
||||||
Dec 02, 2007: Minor fixes, rough cut of mdoc-to-man conversion for
|
|
||||||
man pages.
|
|
||||||
|
|
||||||
Oct 30, 2007: libarchive 2.4.0 released
|
|
||||||
Oct 30, 2007: Minor compile fix thanks to Joerg Schilling.
|
|
||||||
Oct 30, 2007: Only run the format auction once at the beginning of the
|
|
||||||
archive. This is simpler and supports better error recovery.
|
|
||||||
Oct 29, 2007: Test support for very large entries in tar archives:
|
|
||||||
libarchive_test now exercises entries from 2GB up to 1TB.
|
|
||||||
|
|
||||||
Oct 27, 2007: libarchive 2.3.5 released
|
|
||||||
Oct 27, 2007: Correct some unnecessary internal data copying in the
|
|
||||||
"compression none" reader and writer; this reduces user time
|
|
||||||
by up to 2/3 in some tests. (Thanks to Jan Psota for
|
|
||||||
publishing his performance test results to GNU tar's bug-tar
|
|
||||||
mailing list; those results pointed me towards this problem.)
|
|
||||||
Oct 27, 2007: Fix for skipping archive entries that are exactly
|
|
||||||
a multiple of 4G on 32-bit platforms.
|
|
||||||
Oct 25, 2007: Fix for reading very large (>8G) tar archives; this was
|
|
||||||
broken when I put in support for new GNU tar sparse formats.
|
|
||||||
Oct 20, 2007: Initial work on new pattern-matching code for cpio; I
|
|
||||||
hope this eventually replaces the code currently in bsdtar.
|
|
||||||
|
|
||||||
Oct 08, 2007: libarchive 2.3.4 released
|
|
||||||
Oct 05, 2007: Continuing work on bsdcpio test suite.
|
|
||||||
Oct 05, 2007: New cpio.5 manpage, updates to "History" of bsdcpio.1 and
|
|
||||||
bsdtar.1 manpages.
|
|
||||||
Oct 05, 2007: Fix zip reader to immediately return EOF if you try
|
|
||||||
to read body of non-regular file. In particular, this fixes
|
|
||||||
bsdtar extraction of zip archives.
|
|
||||||
|
|
||||||
Sep 30, 2007: libarchive 2.3.3 released
|
|
||||||
Sep 26, 2007: Rework Makefile.am so that the enable/disable options
|
|
||||||
actually do the right things.
|
|
||||||
Sep 26, 2007: cpio-odc and cpio-newc archives no longer write bodies
|
|
||||||
for non-regular files.
|
|
||||||
Sep 26, 2007: Test harness for bsdcpio is in place, needs more tests written.
|
|
||||||
This is much nicer than the ragtag collection of test scripts
|
|
||||||
that bsdtar has.
|
|
||||||
|
|
||||||
Sep 20, 2007: libarchive 2.3.2 released
|
|
||||||
Sep 20, 2007: libarchive 2.3.1 broke bsdtar because the archive_write_data()
|
|
||||||
fix was implemented incorrectly.
|
|
||||||
|
|
||||||
Sep 16, 2007: libarchive 2.3.1 released
|
|
||||||
Sep 16, 2007: Many fixes to bsdcpio 0.3: handle hardlinks with -p, recognize
|
|
||||||
block size on writing, fix a couple of segfaults.
|
|
||||||
Sep 16, 2007: Fixed return value from archive_write_data() when used
|
|
||||||
with archive_write_disk() to match the documentation and other
|
|
||||||
instances of this same function.
|
|
||||||
Sep 15, 2007: Add archive_entry_link_resolver, archive_entry_strmode
|
|
||||||
|
|
||||||
Sep 11, 2007: libarchive 2.2.8 released
|
|
||||||
Sep 09, 2007: bsdcpio 0.2 supports most (not yet all) of the old POSIX spec.
|
|
||||||
|
|
||||||
Sep 01, 2007: libarchive 2.2.7 released
|
|
||||||
Aug 31, 2007: Support for reading mtree files, including an mtree.5 manpage
|
|
||||||
(A little experimental still.)
|
|
||||||
Aug 18, 2007: Read gtar 1.17 --posix --sparse entries.
|
|
||||||
Aug 13, 2007: Refined suid/sgid restore handling; it is no longer
|
|
||||||
an error if suid/sgid bits are dropped when you request
|
|
||||||
perm restore but don't request owner restore.
|
|
||||||
Aug 06, 2007: Use --enable-bsdcpio if you want to try bsdcpio
|
|
||||||
|
|
||||||
Aug 05, 2007: libarchive 2.2.6 released
|
|
||||||
Aug 05, 2007: New configure option --disable-bsdtar, thanks to Joerg
|
|
||||||
Sonnenberger.
|
|
||||||
Aug 05, 2007: Several bug fixes from FreeBSD CVS repo.
|
|
||||||
|
|
||||||
Jul 13, 2007: libarchive 2.2.5 released
|
|
||||||
|
|
||||||
Jul 12, 2007: libarchive 2.2.4 released
|
|
||||||
Jul 12, 2007: Thanks to Colin Percival's help in diagnosing and
|
|
||||||
fixing several critical security bugs. Details available at
|
|
||||||
http://security.freebsd.org/advisories/FreeBSD-SA-07:05.libarchive.asc
|
|
||||||
|
|
||||||
May 26, 2007: libarchive 2.2.3 released
|
|
||||||
May 26, 2007: Fix memory leaks in ZIP reader and shar writer, add some
|
|
||||||
missing system headers to archive_entry.h, dead code cleanup
|
|
||||||
from Colin Percival, more tests for gzip/bzip2, fix an
|
|
||||||
EOF anomaly in bzip2 decompression.
|
|
||||||
|
|
||||||
May 12, 2007: libarchive 2.2.2 released
|
|
||||||
May 12, 2007: Fix archive_write_disk permission restore by cloning
|
|
||||||
entry passed into write_header so that permission info is
|
|
||||||
still available at finish_entry time. (archive_read_extract()
|
|
||||||
worked okay because it held onto the passed-in entry, but
|
|
||||||
direct consumers of archive_write_disk would break). This
|
|
||||||
required fixing archive_entry_clone(), which now works and has
|
|
||||||
a reasonably complete test case.
|
|
||||||
May 10, 2007: Skeletal cpio implementation.
|
|
||||||
|
|
||||||
May 06, 2007: libarchive 2.2.1 released
|
|
||||||
May 06, 2007: Flesh out a lot more of test_entry.c so as to catch
|
|
||||||
problems such as the device node breakage before releasing <sigh>.
|
|
||||||
May 05, 2007: Fix a bad bug introduced in 2.1.9 that broke device
|
|
||||||
node entries in tar archives.
|
|
||||||
May 03, 2007: Move 'struct stat' out of archive_entry core as well.
|
|
||||||
This removes some portability headaches and fixes a bunch
|
|
||||||
of corner cases that arise when manipulating archives on
|
|
||||||
dissimilar systems.
|
|
||||||
|
|
||||||
Apr 30, 2007: libarchive 2.1.10 released
|
|
||||||
Apr 31, 2007: Minor code cleanup.
|
|
||||||
|
|
||||||
Apr 24, 2007: libarchive 2.1.9 released
|
|
||||||
Apr 24, 2007: Fix some recently-introduced problems with libraries
|
|
||||||
(Just let automake handle it and it all works much better.)
|
|
||||||
Finish isolating major()/minor()/makedev() in archive_entry.c.
|
|
||||||
|
|
||||||
Apr 23, 2007: libarchive 2.1.8 released
|
|
||||||
Apr 23, 2007: Minor fixes found from building on MacOS X
|
|
||||||
|
|
||||||
Apr 22, 2007: libarchive 2.1.7 released
|
|
||||||
Apr 22, 2007: Eliminated all uses of 'struct stat' from the
|
|
||||||
format readers/writers. This should improve portability;
|
|
||||||
'struct stat' is now only used in archive_entry and in
|
|
||||||
code that actually touches the disk.
|
|
||||||
|
|
||||||
Apr 17, 2007: libarchive 2.1.6 released
|
|
||||||
Libarchive now compiles and passes all tests on Interix.
|
|
||||||
|
|
||||||
Apr 16, 2007: libarchive 2.1.5 released
|
|
||||||
|
|
||||||
Apr 15, 2007: libarchive 2.1b2 released
|
|
||||||
Apr 15, 2007: New libarchive_internals.3 documentation of internal APIs.
|
|
||||||
Not complete, but should prove helpful.
|
|
||||||
Apr 15, 2007: Experimental "read_compress_program" and "write_compress_program"
|
|
||||||
for using libarchive with external compression. Not yet
|
|
||||||
well tested, and likely has portability issues. Feedback
|
|
||||||
appreciated.
|
|
||||||
|
|
||||||
Apr 14, 2007: libarchive 2.0.31 released
|
|
||||||
Apr 14, 2007: More fixes for Interix, more 'ar' work
|
|
||||||
|
|
||||||
Apr 14, 2007: libarchive 2.0.30 released
|
|
||||||
Apr 13, 2007: libarchive now enforces trailing '/' on dirs
|
|
||||||
written to tar archives
|
|
||||||
|
|
||||||
Apr 11, 2007: libarchive 2.0.29 released
|
|
||||||
Apr 11, 2007: Make it easier to statically configure for different platforms.
|
|
||||||
Apr 11, 2007: Updated config.guess, config.sub, libtool
|
|
||||||
|
|
||||||
Apr 06, 2007: libarchive 2.0.28 released
|
|
||||||
Apr 06, 2007: 'ar' format read/write support thanks to Kai Wang.
|
|
||||||
|
|
||||||
Apr 01, 2007: libarchive 2.0.27 released
|
|
||||||
Mar 31, 2007: Several minor fixes from Colin Percival and Joerg Sonnenberger.
|
|
||||||
|
|
||||||
Mar 12, 2007: libarchive 2.0.25 released
|
|
||||||
Mar 12, 2007: Fix broken --unlink flag.
|
|
||||||
|
|
||||||
Mar 11, 2007: libarchive 2.0.24 released
|
|
||||||
Mar 10, 2007: Correct an ACL blunder that causes any ACL with an entry
|
|
||||||
that refers to a non-existent user or group to not be restored correctly.
|
|
||||||
The fix both makes the parser more tolerant (so that archives created
|
|
||||||
with the buggy ACLs can be read now) and corrects the ACL formatter.
|
|
||||||
Mar 10, 2007: More work on test portability to Linux.
|
|
||||||
|
|
||||||
Mar 10, 2007: libarchive 2.0.22 released
|
|
||||||
Mar 10, 2007: Header cleanups; added linux/fs.h, removed
|
|
||||||
some unnecessary headers, added #include guards in bsdtar.
|
|
||||||
If you see any obvious compile failures from this, let me know.
|
|
||||||
Mar 10, 2007: Work on bsdtar test scripts: not yet robust enough
|
|
||||||
to enable as part of "make check", but getting better.
|
|
||||||
Mar 10, 2007: libarchive now returns ARCHIVE_FAILED when
|
|
||||||
a header write fails in a way that only affects this item.
|
|
||||||
Less bad than ARCHIVE_FATAL, but worse than ARCHIVE_WARN.
|
|
||||||
|
|
||||||
Mar 07, 2007: libarchive 2.0.21 released
|
|
||||||
Mar 07, 2007: Add some ACL tests (only for the system-independent
|
|
||||||
portion of the ACL support for now).
|
|
||||||
Mar 07, 2007: tar's ability to read ACLs off disk got
|
|
||||||
turned off for FreeBSD; re-enable it. (ACL restores and
|
|
||||||
libarchive support for storing/reading ACLs from pax
|
|
||||||
archives was unaffected.)
|
|
||||||
|
|
||||||
Mar 02, 2007: libarchive 2.0.20 released
|
|
||||||
Mar 2, 2007: It's not perfect, but it's pretty good.
|
|
||||||
Libarchive 2.0 is officially out of beta.
|
|
||||||
|
|
||||||
Feb 28, 2007: libarchive 2.0b17 released
|
|
||||||
Feb 27, 2007: Make the GID restore checks more robust by checking
|
|
||||||
whether the current user has too few or too many privileges.
|
|
||||||
|
|
||||||
Feb 26, 2007: libarchive 2.0b15 released
|
|
||||||
Feb 26, 2007: Don't lose symlinks when extracting from ISOs.
|
|
||||||
Thanks to Diego "Flameeyes" Pettenò for telling me about the
|
|
||||||
broken testcase on Gentoo that (finally!) led me to the cause
|
|
||||||
of this long-standing bug.
|
|
||||||
|
|
||||||
Feb 26, 2007: libarchive 2.0b14 released
|
|
||||||
Feb 26, 2007: Fix a broken test on platforms that lack lchmod().
|
|
||||||
|
|
||||||
Feb 25, 2007: libarchive 2.0b13 released
|
|
||||||
Feb 25, 2007: Empty archives were being written as empty files,
|
|
||||||
without a proper end-of-archive marker. Fixed.
|
|
||||||
|
|
||||||
Feb 23, 2007: libarchive 2.0b12 released
|
|
||||||
Feb 22, 2007: Basic security checks added: _EXTRACT_SECURE_NODOTDOT
|
|
||||||
and _EXTRACT_SECURE_SYMLINK. These checks used to be in bsdtar,
|
|
||||||
but they belong down in libarchive where they can be used by
|
|
||||||
other tools and where they can be better optimized.
|
|
||||||
|
|
||||||
Feb 11, 2007: libarchive 2.0b11 released
|
|
||||||
Feb 10, 2007: Fixed a bunch of errors in libarchive's handling
|
|
||||||
of EXTRACT_PERM and EXTRACT_OWNER, especially relating
|
|
||||||
to SUID and SGID bits.
|
|
||||||
|
|
||||||
Jan 31, 2007: libarchive 2.0b9 released
|
|
||||||
Jan 31, 2007: Added read support for "empty" archives as a
|
|
||||||
distinct archive format. Bsdtar uses this to handle, e.g.,
|
|
||||||
"touch foo.tar; tar -rf foo.tar"
|
|
||||||
|
|
||||||
Jan 22, 2007: libarchive 2.0b6 released
|
|
||||||
Jan 22, 2007: archive_write_disk API is now in place. It provides
|
|
||||||
a finer-grained interface than archive_read_extract. In particular,
|
|
||||||
you can use it to create objects on disk without having an archive
|
|
||||||
around (just feed it archive_entry objects describing what you
|
|
||||||
want to create), you can override the uname/gname-to-uid/gid lookups
|
|
||||||
(minitar uses this to avoid getpwXXX() and getgrXXX() bloat).
|
|
||||||
|
|
||||||
Jan 09, 2007: libarchive 2.0a3 released
|
|
||||||
Jan 9, 2007: archive_extract is now much better; it handles the
|
|
||||||
most common cases with a minimal number of system calls.
|
|
||||||
Some features still need a lot of testing, especially corner
|
|
||||||
cases involving objects that already exist on disk. I expect
|
|
||||||
the next round of API overhaul will simplify building test cases.
|
|
||||||
Jan 9, 2007: a number of fixes thanks to Colin Percival, especially
|
|
||||||
corrections to the skip() framework and handling of large files.
|
|
||||||
Jan 9, 2007: Fixes for large ISOs. The code should correctly handle
|
|
||||||
very large ISOs with entries up to 4G. Thanks to Robert Sciuk
|
|
||||||
for pointing out these issues.
|
|
||||||
|
|
||||||
Sep 05, 2006: libarchive 1.3.1 released
|
|
||||||
Sep 5, 2006: Bump version to 1.3 for new I/O wrappers.
|
|
||||||
Sep 4, 2006: New memory and FILE read/write wrappers.
|
|
||||||
Sep 4, 2006: libarchive test harness is now minimally functional;
|
|
||||||
it's located a few minor bugs in error-handling logic
|
|
||||||
|
|
||||||
Aug 17, 2006: libarchive 1.2.54 released
|
|
||||||
Aug 17, 2006: Outline ABI changes for libarchive 2.0; these
|
|
||||||
are protected behind #ifdef's until I think I've found everything
|
|
||||||
that needs to change.
|
|
||||||
Aug 17, 2006: Fix error-handling in archive_read/write_close()
|
|
||||||
They weren't returning any errors before.
|
|
||||||
Aug 17, 2006: Fix recursive-add logic to not trigger if it's not set
|
|
||||||
Fixes a bug adding files when writing archive to pipe or when
|
|
||||||
using archive_write_open() directly.
|
|
||||||
Jul 2006: New "skip" handling improves performance extracting
|
|
||||||
single files from large uncompressed archives.
|
|
||||||
|
|
||||||
Mar 21, 2006: 1.2.52 released
|
|
||||||
Mar 21, 2006: Fix -p on platforms that don't have platform-specific
|
|
||||||
extended attribute code.
|
|
||||||
Mar 20, 2006: Add NEWS file; fill in some older history from other
|
|
||||||
files. I'll try to keep this file up-to-date from now on.
|
|
||||||
|
|
||||||
OLDER NEWS SUMMARIES
|
|
||||||
|
|
||||||
Mar 19, 2006: libarchive 1.2.51 released
|
|
||||||
Mar 18, 2006: Many fixes to extended attribute support, including a redesign
|
|
||||||
of the storage format to simplify debugging.
|
|
||||||
Mar 12, 2006: Remove 'tp' support; it was a fun idea, but not worth
|
|
||||||
spending much time on.
|
|
||||||
Mar 11, 2006: Incorporated Jaakko Heinonen's still-experimental support
|
|
||||||
for extended attributes (Currently Linux-only.).
|
|
||||||
Mar 11, 2006: Reorganized distribution package: There is now one tar.gz
|
|
||||||
file that builds both libarchive and bsdtar.
|
|
||||||
Feb 13, 2006: Minor bug fixes: correctly read cpio device entries, write
|
|
||||||
Pax attribute entry names.
|
|
||||||
Nov 7, 2005: Experimental 'tp' format support in libarchive. Feedback
|
|
||||||
appreciated; this is not enabled by archive_read_support_format_all()
|
|
||||||
yet as I'm not quite content with the format detection heuristics.
|
|
||||||
Nov 7, 2005: Some more portability improvements thanks to Darin Broady,
|
|
||||||
minor bugfixes.
|
|
||||||
Oct 12, 2005: Use GNU libtool to build shared libraries on many systems.
|
|
||||||
Aug 9, 2005: Correctly detect that MacOS X does not have POSIX ACLs.
|
|
||||||
Apr 17, 2005: Kees Zeelenberg has ported libarchive and bsdtar to Windows:
|
|
||||||
http://gnuwin32.sourceforge.net/
|
|
||||||
Apr 11, 2005: Extended Zip/Zip64 support thanks to Dan Nelson. -L/-h
|
|
||||||
fix from Jaakko Heinonen.
|
|
||||||
Mar 12, 2005: archive_read_extract can now handle very long
|
|
||||||
pathnames (I've tested with pathnames up to 1MB).
|
|
||||||
Mar 12, 2005: Marcus Geiger has written an article about libarchive
|
|
||||||
http://xsnil.antbear.org/2005/02/05/archive-mit-libarchive-verarbeiten/
|
|
||||||
including examples of using it from Objective-C. His MoinX
|
|
||||||
http://moinx.antbear.org/ desktop Wiki uses
|
|
||||||
libarchive for archiving and restoring Wiki pages.
|
|
||||||
Jan 22, 2005: Preliminary ZIP extraction support,
|
|
||||||
new directory-walking code for bsdtar.
|
|
||||||
Jan 16, 2005: ISO9660 extraction code added; manpage corrections.
|
|
||||||
May 22, 2004: Many gtar-compatible long options have been added; almost
|
|
||||||
all FreeBSD ports extract correctly with bsdtar.
|
|
||||||
May 18, 2004: bsdtar can read Solaris, HP-UX, Unixware, star, gtar,
|
|
||||||
and pdtar archives.
|
|
|
@ -1,155 +0,0 @@
|
||||||
README for libarchive bundle.
|
|
||||||
|
|
||||||
Questions? Issues?
|
|
||||||
* http://www.libarchive.org is the home for ongoing
|
|
||||||
libarchive development, including documentation, and
|
|
||||||
links to the libarchive mailing lists.
|
|
||||||
* To report an issue, use the issue tracker at
|
|
||||||
http://code.google.com/p/libarchive/issues/list
|
|
||||||
* To submit an enhancement to libarchive, please submit
|
|
||||||
a pull request via GitHub.
|
|
||||||
https://github.com/libarchive/libarchive/pulls
|
|
||||||
|
|
||||||
This distribution bundle includes the following components:
|
|
||||||
* libarchive: a library for reading and writing streaming archives
|
|
||||||
* tar: the 'bsdtar' program is a full-featured 'tar'
|
|
||||||
replacement built on libarchive
|
|
||||||
* cpio: the 'bsdcpio' program is a different interface to
|
|
||||||
essentially the same functionality
|
|
||||||
* examples: Some small example programs that you may find useful.
|
|
||||||
* examples/minitar: a compact sample demonstrating use of libarchive.
|
|
||||||
* contrib: Various items sent to me by third parties;
|
|
||||||
please contact the authors with any questions.
|
|
||||||
|
|
||||||
The top-level directory contains the following information files:
|
|
||||||
* NEWS - highlights of recent changes
|
|
||||||
* COPYING - what you can do with this
|
|
||||||
* INSTALL - installation instructions
|
|
||||||
* README - this file
|
|
||||||
* configure - configuration script, see INSTALL for details.
|
|
||||||
* CMakeLists.txt - input for "cmake" build tool, see INSTALL
|
|
||||||
|
|
||||||
The following files in the top-level directory are used by the
|
|
||||||
'configure' script:
|
|
||||||
* Makefile.am, aclocal.m4, configure.ac
|
|
||||||
- used to build this distribution, only needed by maintainers
|
|
||||||
* Makefile.in, config.h.in
|
|
||||||
- templates used by configure script
|
|
||||||
|
|
||||||
Guide to Documentation installed by this system:
|
|
||||||
* bsdtar.1 explains the use of the bsdtar program
|
|
||||||
* bsdcpio.1 explains the use of the bsdcpio program
|
|
||||||
* libarchive.3 gives an overview of the library as a whole
|
|
||||||
* archive_read.3, archive_write.3, archive_write_disk.3, and
|
|
||||||
archive_read_disk.3 provide detailed calling sequences for the read
|
|
||||||
and write APIs
|
|
||||||
* archive_entry.3 details the "struct archive_entry" utility class
|
|
||||||
* archive_internals.3 provides some insight into libarchive's
|
|
||||||
internal structure and operation.
|
|
||||||
* libarchive-formats.5 documents the file formats supported by the library
|
|
||||||
* cpio.5, mtree.5, and tar.5 provide detailed information about these
|
|
||||||
popular archive formats, including hard-to-find details about
|
|
||||||
modern cpio and tar variants.
|
|
||||||
The manual pages above are provided in the 'doc' directory in
|
|
||||||
a number of different formats.
|
|
||||||
|
|
||||||
You should also read the copious comments in "archive.h" and the
|
|
||||||
source code for the sample programs for more details. Please let us
|
|
||||||
know about any errors or omissions you find.
|
|
||||||
|
|
||||||
Currently, the library automatically detects and reads the following fomats:
|
|
||||||
* GNU tar format (including GNU long filenames, long link names, and sparse files)
|
|
||||||
* Solaris 9 extended tar format (including ACLs)
|
|
||||||
* Old V7 tar archives
|
|
||||||
* POSIX ustar
|
|
||||||
* POSIX pax interchange format
|
|
||||||
* POSIX octet-oriented cpio
|
|
||||||
* SVR4 ASCII cpio
|
|
||||||
* POSIX octet-oriented cpio
|
|
||||||
* Binary cpio (big-endian or little-endian)
|
|
||||||
* ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions)
|
|
||||||
* ZIP archives (with uncompressed or "deflate" compressed entries)
|
|
||||||
* GNU and BSD 'ar' archives
|
|
||||||
* 'mtree' format
|
|
||||||
* 7-Zip archives
|
|
||||||
* Microsoft CAB format
|
|
||||||
* LHA and LZH archives
|
|
||||||
* RAR archives
|
|
||||||
* XAR archives
|
|
||||||
|
|
||||||
The library also detects and handles any of the following before evaluating the archive:
|
|
||||||
* uuencoded files
|
|
||||||
* files with RPM wrapper
|
|
||||||
* gzip compression
|
|
||||||
* bzip2 compression
|
|
||||||
* compress/LZW compression
|
|
||||||
* lzma, lzip, and xz compression
|
|
||||||
|
|
||||||
The library can create archives in any of the following formats:
|
|
||||||
* POSIX ustar
|
|
||||||
* POSIX pax interchange format
|
|
||||||
* "restricted" pax format, which will create ustar archives except for
|
|
||||||
entries that require pax extensions (for long filenames, ACLs, etc).
|
|
||||||
* Old GNU tar format
|
|
||||||
* POSIX octet-oriented cpio
|
|
||||||
* SVR4 "newc" cpio
|
|
||||||
* shar archives
|
|
||||||
* ZIP archives (with uncompressed or "deflate" compressed entries)
|
|
||||||
* GNU and BSD 'ar' archives
|
|
||||||
* 'mtree' format
|
|
||||||
* ISO9660 format
|
|
||||||
* 7-Zip archives
|
|
||||||
* XAR archives
|
|
||||||
|
|
||||||
When creating archives, the result can be filtered with any of the following:
|
|
||||||
* uuencode
|
|
||||||
* gzip compression
|
|
||||||
* bzip2 compression
|
|
||||||
* compress/LZW compression
|
|
||||||
* lzma, lzip, and xz compression
|
|
||||||
|
|
||||||
Notes about the library architecture:
|
|
||||||
|
|
||||||
* This is a heavily stream-oriented system. There is no direct
|
|
||||||
support for in-place modification or random access.
|
|
||||||
|
|
||||||
* The library is designed to be extended with new compression and
|
|
||||||
archive formats. The only requirement is that the format be
|
|
||||||
readable or writable as a stream and that each archive entry be
|
|
||||||
independent. There are articles on the libarchive Wiki explaining
|
|
||||||
how to extend libarchive.
|
|
||||||
|
|
||||||
* On read, compression and format are always detected automatically.
|
|
||||||
|
|
||||||
* I've attempted to minimize static link pollution. If you don't
|
|
||||||
explicitly invoke a particular feature (such as support for a
|
|
||||||
particular compression or format), it won't get pulled in.
|
|
||||||
In particular, if you don't explicitly enable a particular
|
|
||||||
compression or decompression support, you won't need to link
|
|
||||||
against the corresponding compression or decompression libraries.
|
|
||||||
This also reduces the size of statically-linked binaries in
|
|
||||||
environments where that matters.
|
|
||||||
|
|
||||||
* On read, the library accepts whatever blocks you hand it.
|
|
||||||
Your read callback is free to pass the library a byte at a time
|
|
||||||
or mmap the entire archive and give it to the library at once.
|
|
||||||
On write, the library always produces correctly-blocked output.
|
|
||||||
|
|
||||||
* The object-style approach allows you to have multiple archive streams
|
|
||||||
open at once. bsdtar uses this in its "@archive" extension.
|
|
||||||
|
|
||||||
* The archive itself is read/written using callback functions.
|
|
||||||
You can read an archive directly from an in-memory buffer or
|
|
||||||
write it to a socket, if you wish. There are some utility
|
|
||||||
functions to provide easy-to-use "open file," etc, capabilities.
|
|
||||||
|
|
||||||
* The read/write APIs are designed to allow individual entries
|
|
||||||
to be read or written to any data source: You can create
|
|
||||||
a block of data in memory and add it to a tar archive without
|
|
||||||
first writing a temporary file. You can also read an entry from
|
|
||||||
an archive and write the data directly to a socket. If you want
|
|
||||||
to read/write entries to disk, there are convenience functions to
|
|
||||||
make this especially easy.
|
|
||||||
|
|
||||||
* Note: "pax interchange format" is really an extended tar format,
|
|
||||||
despite what the name says.
|
|
|
@ -1 +0,0 @@
|
||||||
3.1.2
|
|
9675
archive/libarchive/aclocal.m4
vendored
9675
archive/libarchive/aclocal.m4
vendored
File diff suppressed because it is too large
Load diff
|
@ -1,51 +0,0 @@
|
||||||
# AC_LANG_STDCALL_FUNC_LINK_TRY(FUNCTION, SIGNATURE)
|
|
||||||
# -------------------------------
|
|
||||||
# Produce a source which links correctly iff the FUNCTION exists.
|
|
||||||
AC_DEFUN([AC_LANG_STDCALL_FUNC_LINK_TRY],
|
|
||||||
[_AC_LANG_DISPATCH([$0], _AC_LANG, $@)])
|
|
||||||
|
|
||||||
# AC_CHECK_STDCALL_FUNC(FUNCTION, SIGNATURE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
|
||||||
# -----------------------------------------------------------------
|
|
||||||
AC_DEFUN([AC_CHECK_STDCALL_FUNC],
|
|
||||||
[AS_VAR_PUSHDEF([ac_var], [ac_cv_func_$1])dnl
|
|
||||||
AC_CACHE_CHECK([for $1], ac_var,
|
|
||||||
[AC_LINK_IFELSE([AC_LANG_STDCALL_FUNC_LINK_TRY([$1],[$2])],
|
|
||||||
[AS_VAR_SET(ac_var, yes)],
|
|
||||||
[AS_VAR_SET(ac_var, no)])])
|
|
||||||
AS_IF([test AS_VAR_GET(ac_var) = yes], [$3], [$4])dnl
|
|
||||||
AS_VAR_POPDEF([ac_var])dnl
|
|
||||||
])# AC_CHECK_FUNC
|
|
||||||
|
|
||||||
# AC_LANG_STDCALL_FUNC_LINK_TRY(C)(FUNCTION, SIGNATURE)
|
|
||||||
# ----------------------------------
|
|
||||||
# Don't include <ctype.h> because on OSF/1 3.0 it includes
|
|
||||||
# <sys/types.h> which includes <sys/select.h> which contains a
|
|
||||||
# prototype for select. Similarly for bzero.
|
|
||||||
m4_define([AC_LANG_STDCALL_FUNC_LINK_TRY(C)],
|
|
||||||
[AC_LANG_PROGRAM(
|
|
||||||
[/* System header to define __stub macros and hopefully few prototypes,
|
|
||||||
which can conflict with char __stdcall $1 ( $2 ) below. */
|
|
||||||
#include <assert.h>
|
|
||||||
/* Override any gcc2 internal prototype to avoid an error. */
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
|
||||||
#endif
|
|
||||||
/* We use char because int might match the return type of a gcc2
|
|
||||||
builtin and then its argument prototype would still apply. */
|
|
||||||
char __stdcall $1 ( $2 );
|
|
||||||
char (*f) ( $2 );
|
|
||||||
],
|
|
||||||
[/* The GNU C library defines this for functions which it implements
|
|
||||||
to always fail with ENOSYS. Some functions are actually named
|
|
||||||
something starting with __ and the normal name is an alias. */
|
|
||||||
#if defined (__stub_$1) || defined (__stub___$1)
|
|
||||||
choke me
|
|
||||||
#else
|
|
||||||
f = $1;
|
|
||||||
#endif
|
|
||||||
])])
|
|
||||||
|
|
||||||
# AC_LANG_STDCALL_FUNC_LINK_TRY(C++)(FUNCTION)
|
|
||||||
# ------------------------------------
|
|
||||||
m4_copy([AC_LANG_STDCALL_FUNC_LINK_TRY(C)], [AC_LANG_STDCALL_FUNC_LINK_TRY(C++)])
|
|
||||||
|
|
|
@ -1,343 +0,0 @@
|
||||||
#! /bin/sh
|
|
||||||
# Wrapper for compilers which do not understand '-c -o'.
|
|
||||||
|
|
||||||
scriptversion=2012-03-05.13; # UTC
|
|
||||||
|
|
||||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
|
|
||||||
# Software Foundation, Inc.
|
|
||||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; either version 2, 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/>.
|
|
||||||
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
|
||||||
# distribute this file as part of a program that contains a
|
|
||||||
# configuration script generated by Autoconf, you may include it under
|
|
||||||
# the same distribution terms that you use for the rest of that program.
|
|
||||||
|
|
||||||
# This file is maintained in Automake, please report
|
|
||||||
# bugs to <bug-automake@gnu.org> or send patches to
|
|
||||||
# <automake-patches@gnu.org>.
|
|
||||||
|
|
||||||
nl='
|
|
||||||
'
|
|
||||||
|
|
||||||
# We need space, tab and new line, in precisely that order. Quoting is
|
|
||||||
# there to prevent tools from complaining about whitespace usage.
|
|
||||||
IFS=" "" $nl"
|
|
||||||
|
|
||||||
file_conv=
|
|
||||||
|
|
||||||
# func_file_conv build_file lazy
|
|
||||||
# Convert a $build file to $host form and store it in $file
|
|
||||||
# Currently only supports Windows hosts. If the determined conversion
|
|
||||||
# type is listed in (the comma separated) LAZY, no conversion will
|
|
||||||
# take place.
|
|
||||||
func_file_conv ()
|
|
||||||
{
|
|
||||||
file=$1
|
|
||||||
case $file in
|
|
||||||
/ | /[!/]*) # absolute file, and not a UNC file
|
|
||||||
if test -z "$file_conv"; then
|
|
||||||
# lazily determine how to convert abs files
|
|
||||||
case `uname -s` in
|
|
||||||
MINGW*)
|
|
||||||
file_conv=mingw
|
|
||||||
;;
|
|
||||||
CYGWIN*)
|
|
||||||
file_conv=cygwin
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
file_conv=wine
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
case $file_conv/,$2, in
|
|
||||||
*,$file_conv,*)
|
|
||||||
;;
|
|
||||||
mingw/*)
|
|
||||||
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
|
||||||
;;
|
|
||||||
cygwin/*)
|
|
||||||
file=`cygpath -m "$file" || echo "$file"`
|
|
||||||
;;
|
|
||||||
wine/*)
|
|
||||||
file=`winepath -w "$file" || echo "$file"`
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
# func_cl_dashL linkdir
|
|
||||||
# Make cl look for libraries in LINKDIR
|
|
||||||
func_cl_dashL ()
|
|
||||||
{
|
|
||||||
func_file_conv "$1"
|
|
||||||
if test -z "$lib_path"; then
|
|
||||||
lib_path=$file
|
|
||||||
else
|
|
||||||
lib_path="$lib_path;$file"
|
|
||||||
fi
|
|
||||||
linker_opts="$linker_opts -LIBPATH:$file"
|
|
||||||
}
|
|
||||||
|
|
||||||
# func_cl_dashl library
|
|
||||||
# Do a library search-path lookup for cl
|
|
||||||
func_cl_dashl ()
|
|
||||||
{
|
|
||||||
lib=$1
|
|
||||||
found=no
|
|
||||||
save_IFS=$IFS
|
|
||||||
IFS=';'
|
|
||||||
for dir in $lib_path $LIB
|
|
||||||
do
|
|
||||||
IFS=$save_IFS
|
|
||||||
if $shared && test -f "$dir/$lib.dll.lib"; then
|
|
||||||
found=yes
|
|
||||||
lib=$dir/$lib.dll.lib
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
if test -f "$dir/$lib.lib"; then
|
|
||||||
found=yes
|
|
||||||
lib=$dir/$lib.lib
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
IFS=$save_IFS
|
|
||||||
|
|
||||||
if test "$found" != yes; then
|
|
||||||
lib=$lib.lib
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# func_cl_wrapper cl arg...
|
|
||||||
# Adjust compile command to suit cl
|
|
||||||
func_cl_wrapper ()
|
|
||||||
{
|
|
||||||
# Assume a capable shell
|
|
||||||
lib_path=
|
|
||||||
shared=:
|
|
||||||
linker_opts=
|
|
||||||
for arg
|
|
||||||
do
|
|
||||||
if test -n "$eat"; then
|
|
||||||
eat=
|
|
||||||
else
|
|
||||||
case $1 in
|
|
||||||
-o)
|
|
||||||
# configure might choose to run compile as 'compile cc -o foo foo.c'.
|
|
||||||
eat=1
|
|
||||||
case $2 in
|
|
||||||
*.o | *.[oO][bB][jJ])
|
|
||||||
func_file_conv "$2"
|
|
||||||
set x "$@" -Fo"$file"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
func_file_conv "$2"
|
|
||||||
set x "$@" -Fe"$file"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
-I)
|
|
||||||
eat=1
|
|
||||||
func_file_conv "$2" mingw
|
|
||||||
set x "$@" -I"$file"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
-I*)
|
|
||||||
func_file_conv "${1#-I}" mingw
|
|
||||||
set x "$@" -I"$file"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
-l)
|
|
||||||
eat=1
|
|
||||||
func_cl_dashl "$2"
|
|
||||||
set x "$@" "$lib"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
-l*)
|
|
||||||
func_cl_dashl "${1#-l}"
|
|
||||||
set x "$@" "$lib"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
-L)
|
|
||||||
eat=1
|
|
||||||
func_cl_dashL "$2"
|
|
||||||
;;
|
|
||||||
-L*)
|
|
||||||
func_cl_dashL "${1#-L}"
|
|
||||||
;;
|
|
||||||
-static)
|
|
||||||
shared=false
|
|
||||||
;;
|
|
||||||
-Wl,*)
|
|
||||||
arg=${1#-Wl,}
|
|
||||||
save_ifs="$IFS"; IFS=','
|
|
||||||
for flag in $arg; do
|
|
||||||
IFS="$save_ifs"
|
|
||||||
linker_opts="$linker_opts $flag"
|
|
||||||
done
|
|
||||||
IFS="$save_ifs"
|
|
||||||
;;
|
|
||||||
-Xlinker)
|
|
||||||
eat=1
|
|
||||||
linker_opts="$linker_opts $2"
|
|
||||||
;;
|
|
||||||
-*)
|
|
||||||
set x "$@" "$1"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
|
|
||||||
func_file_conv "$1"
|
|
||||||
set x "$@" -Tp"$file"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
|
|
||||||
func_file_conv "$1" mingw
|
|
||||||
set x "$@" "$file"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
set x "$@" "$1"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
if test -n "$linker_opts"; then
|
|
||||||
linker_opts="-link$linker_opts"
|
|
||||||
fi
|
|
||||||
exec "$@" $linker_opts
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
eat=
|
|
||||||
|
|
||||||
case $1 in
|
|
||||||
'')
|
|
||||||
echo "$0: No command. Try '$0 --help' for more information." 1>&2
|
|
||||||
exit 1;
|
|
||||||
;;
|
|
||||||
-h | --h*)
|
|
||||||
cat <<\EOF
|
|
||||||
Usage: compile [--help] [--version] PROGRAM [ARGS]
|
|
||||||
|
|
||||||
Wrapper for compilers which do not understand '-c -o'.
|
|
||||||
Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
|
|
||||||
arguments, and rename the output as expected.
|
|
||||||
|
|
||||||
If you are trying to build a whole package this is not the
|
|
||||||
right script to run: please start by reading the file 'INSTALL'.
|
|
||||||
|
|
||||||
Report bugs to <bug-automake@gnu.org>.
|
|
||||||
EOF
|
|
||||||
exit $?
|
|
||||||
;;
|
|
||||||
-v | --v*)
|
|
||||||
echo "compile $scriptversion"
|
|
||||||
exit $?
|
|
||||||
;;
|
|
||||||
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
|
|
||||||
func_cl_wrapper "$@" # Doesn't return...
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
ofile=
|
|
||||||
cfile=
|
|
||||||
|
|
||||||
for arg
|
|
||||||
do
|
|
||||||
if test -n "$eat"; then
|
|
||||||
eat=
|
|
||||||
else
|
|
||||||
case $1 in
|
|
||||||
-o)
|
|
||||||
# configure might choose to run compile as 'compile cc -o foo foo.c'.
|
|
||||||
# So we strip '-o arg' only if arg is an object.
|
|
||||||
eat=1
|
|
||||||
case $2 in
|
|
||||||
*.o | *.obj)
|
|
||||||
ofile=$2
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
set x "$@" -o "$2"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
*.c)
|
|
||||||
cfile=$1
|
|
||||||
set x "$@" "$1"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
set x "$@" "$1"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
if test -z "$ofile" || test -z "$cfile"; then
|
|
||||||
# If no '-o' option was seen then we might have been invoked from a
|
|
||||||
# pattern rule where we don't need one. That is ok -- this is a
|
|
||||||
# normal compilation that the losing compiler can handle. If no
|
|
||||||
# '.c' file was seen then we are probably linking. That is also
|
|
||||||
# ok.
|
|
||||||
exec "$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Name of file we expect compiler to create.
|
|
||||||
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
|
|
||||||
|
|
||||||
# Create the lock directory.
|
|
||||||
# Note: use '[/\\:.-]' here to ensure that we don't use the same name
|
|
||||||
# that we are using for the .o file. Also, base the name on the expected
|
|
||||||
# object file name, since that is what matters with a parallel build.
|
|
||||||
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
|
|
||||||
while true; do
|
|
||||||
if mkdir "$lockdir" >/dev/null 2>&1; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
# FIXME: race condition here if user kills between mkdir and trap.
|
|
||||||
trap "rmdir '$lockdir'; exit 1" 1 2 15
|
|
||||||
|
|
||||||
# Run the compile.
|
|
||||||
"$@"
|
|
||||||
ret=$?
|
|
||||||
|
|
||||||
if test -f "$cofile"; then
|
|
||||||
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
|
|
||||||
elif test -f "${cofile}bj"; then
|
|
||||||
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rmdir "$lockdir"
|
|
||||||
exit $ret
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# mode: shell-script
|
|
||||||
# sh-indentation: 2
|
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
||||||
# time-stamp-start: "scriptversion="
|
|
||||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
||||||
# time-stamp-time-zone: "UTC"
|
|
||||||
# time-stamp-end: "; # UTC"
|
|
||||||
# End:
|
|
1531
archive/libarchive/build/autoconf/config.guess
vendored
1531
archive/libarchive/build/autoconf/config.guess
vendored
File diff suppressed because it is too large
Load diff
|
@ -1,696 +0,0 @@
|
||||||
#! /bin/sh
|
|
||||||
#
|
|
||||||
# NOTE: This file was brought from
|
|
||||||
# http://git.savannah.gnu.org/cgit/gnulib.git/plain/build-aux/config.rpath
|
|
||||||
# You should sometimes check if the file is updated and bring it to
|
|
||||||
# our trunk and copy this note to the top of that file.
|
|
||||||
#
|
|
||||||
# Output a system dependent set of variables, describing how to set the
|
|
||||||
# run time search path of shared libraries in an executable.
|
|
||||||
#
|
|
||||||
# Copyright 1996-2011 Free Software Foundation, Inc.
|
|
||||||
# Taken from GNU libtool, 2001
|
|
||||||
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
|
||||||
#
|
|
||||||
# This file is free software; the Free Software Foundation gives
|
|
||||||
# unlimited permission to copy and/or distribute it, with or without
|
|
||||||
# modifications, as long as this notice is preserved.
|
|
||||||
#
|
|
||||||
# The first argument passed to this file is the canonical host specification,
|
|
||||||
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
|
|
||||||
# or
|
|
||||||
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
|
|
||||||
# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
|
|
||||||
# should be set by the caller.
|
|
||||||
#
|
|
||||||
# The set of defined variables is at the end of this script.
|
|
||||||
|
|
||||||
# Known limitations:
|
|
||||||
# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
|
|
||||||
# than 256 bytes, otherwise the compiler driver will dump core. The only
|
|
||||||
# known workaround is to choose shorter directory names for the build
|
|
||||||
# directory and/or the installation directory.
|
|
||||||
|
|
||||||
# All known linkers require a `.a' archive for static linking (except MSVC,
|
|
||||||
# which needs '.lib').
|
|
||||||
libext=a
|
|
||||||
shrext=.so
|
|
||||||
|
|
||||||
host="$1"
|
|
||||||
host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
||||||
host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
||||||
host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
||||||
|
|
||||||
# Code taken from libtool.m4's _LT_CC_BASENAME.
|
|
||||||
|
|
||||||
for cc_temp in $CC""; do
|
|
||||||
case $cc_temp in
|
|
||||||
compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
|
|
||||||
distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
|
|
||||||
\-*) ;;
|
|
||||||
*) break;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
|
|
||||||
|
|
||||||
# Code taken from libtool.m4's _LT_COMPILER_PIC.
|
|
||||||
|
|
||||||
wl=
|
|
||||||
if test "$GCC" = yes; then
|
|
||||||
wl='-Wl,'
|
|
||||||
else
|
|
||||||
case "$host_os" in
|
|
||||||
aix*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
mingw* | cygwin* | pw32* | os2* | cegcc*)
|
|
||||||
;;
|
|
||||||
hpux9* | hpux10* | hpux11*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
irix5* | irix6* | nonstopux*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
||||||
case $cc_basename in
|
|
||||||
ecc*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
icc* | ifort*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
lf95*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
nagfor*)
|
|
||||||
wl='-Wl,-Wl,,'
|
|
||||||
;;
|
|
||||||
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
ccc*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
xl* | bgxl* | bgf* | mpixl*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
como)
|
|
||||||
wl='-lopt='
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
case `$CC -V 2>&1 | sed 5q` in
|
|
||||||
*Sun\ F* | *Sun*Fortran*)
|
|
||||||
wl=
|
|
||||||
;;
|
|
||||||
*Sun\ C*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
newsos6)
|
|
||||||
;;
|
|
||||||
*nto* | *qnx*)
|
|
||||||
;;
|
|
||||||
osf3* | osf4* | osf5*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
rdos*)
|
|
||||||
;;
|
|
||||||
solaris*)
|
|
||||||
case $cc_basename in
|
|
||||||
f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
|
|
||||||
wl='-Qoption ld '
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
sunos4*)
|
|
||||||
wl='-Qoption ld '
|
|
||||||
;;
|
|
||||||
sysv4 | sysv4.2uw2* | sysv4.3*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
sysv4*MP*)
|
|
||||||
;;
|
|
||||||
sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
unicos*)
|
|
||||||
wl='-Wl,'
|
|
||||||
;;
|
|
||||||
uts4*)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
|
|
||||||
|
|
||||||
hardcode_libdir_flag_spec=
|
|
||||||
hardcode_libdir_separator=
|
|
||||||
hardcode_direct=no
|
|
||||||
hardcode_minus_L=no
|
|
||||||
|
|
||||||
case "$host_os" in
|
|
||||||
cygwin* | mingw* | pw32* | cegcc*)
|
|
||||||
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
|
||||||
# When not using gcc, we currently assume that we are using
|
|
||||||
# Microsoft Visual C++.
|
|
||||||
if test "$GCC" != yes; then
|
|
||||||
with_gnu_ld=no
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
interix*)
|
|
||||||
# we just hope/assume this is gcc and not c89 (= MSVC++)
|
|
||||||
with_gnu_ld=yes
|
|
||||||
;;
|
|
||||||
openbsd*)
|
|
||||||
with_gnu_ld=no
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
ld_shlibs=yes
|
|
||||||
if test "$with_gnu_ld" = yes; then
|
|
||||||
# Set some defaults for GNU ld with shared library support. These
|
|
||||||
# are reset later if shared libraries are not supported. Putting them
|
|
||||||
# here allows them to be overridden if necessary.
|
|
||||||
# Unlike libtool, we use -rpath here, not --rpath, since the documented
|
|
||||||
# option of GNU ld is called -rpath, not --rpath.
|
|
||||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
||||||
case "$host_os" in
|
|
||||||
aix[3-9]*)
|
|
||||||
# On AIX/PPC, the GNU linker is very broken
|
|
||||||
if test "$host_cpu" != ia64; then
|
|
||||||
ld_shlibs=no
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
amigaos*)
|
|
||||||
case "$host_cpu" in
|
|
||||||
powerpc)
|
|
||||||
;;
|
|
||||||
m68k)
|
|
||||||
hardcode_libdir_flag_spec='-L$libdir'
|
|
||||||
hardcode_minus_L=yes
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
beos*)
|
|
||||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
ld_shlibs=no
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
cygwin* | mingw* | pw32* | cegcc*)
|
|
||||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
||||||
# no search path for DLLs.
|
|
||||||
hardcode_libdir_flag_spec='-L$libdir'
|
|
||||||
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
ld_shlibs=no
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
haiku*)
|
|
||||||
;;
|
|
||||||
interix[3-9]*)
|
|
||||||
hardcode_direct=no
|
|
||||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
||||||
;;
|
|
||||||
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
||||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
ld_shlibs=no
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
netbsd*)
|
|
||||||
;;
|
|
||||||
solaris*)
|
|
||||||
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
|
|
||||||
ld_shlibs=no
|
|
||||||
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
ld_shlibs=no
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
|
|
||||||
case `$LD -v 2>&1` in
|
|
||||||
*\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
|
|
||||||
ld_shlibs=no
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
|
||||||
hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
|
|
||||||
else
|
|
||||||
ld_shlibs=no
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
sunos4*)
|
|
||||||
hardcode_direct=yes
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
ld_shlibs=no
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
if test "$ld_shlibs" = no; then
|
|
||||||
hardcode_libdir_flag_spec=
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
case "$host_os" in
|
|
||||||
aix3*)
|
|
||||||
# Note: this linker hardcodes the directories in LIBPATH if there
|
|
||||||
# are no directories specified by -L.
|
|
||||||
hardcode_minus_L=yes
|
|
||||||
if test "$GCC" = yes; then
|
|
||||||
# Neither direct hardcoding nor static linking is supported with a
|
|
||||||
# broken collect2.
|
|
||||||
hardcode_direct=unsupported
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
aix[4-9]*)
|
|
||||||
if test "$host_cpu" = ia64; then
|
|
||||||
# On IA64, the linker does run time linking by default, so we don't
|
|
||||||
# have to do anything special.
|
|
||||||
aix_use_runtimelinking=no
|
|
||||||
else
|
|
||||||
aix_use_runtimelinking=no
|
|
||||||
# Test if we are trying to use run time linking or normal
|
|
||||||
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
|
||||||
# need to do runtime linking.
|
|
||||||
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
|
|
||||||
for ld_flag in $LDFLAGS; do
|
|
||||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
|
||||||
aix_use_runtimelinking=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
hardcode_direct=yes
|
|
||||||
hardcode_libdir_separator=':'
|
|
||||||
if test "$GCC" = yes; then
|
|
||||||
case $host_os in aix4.[012]|aix4.[012].*)
|
|
||||||
collect2name=`${CC} -print-prog-name=collect2`
|
|
||||||
if test -f "$collect2name" && \
|
|
||||||
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
|
||||||
then
|
|
||||||
# We have reworked collect2
|
|
||||||
:
|
|
||||||
else
|
|
||||||
# We have old collect2
|
|
||||||
hardcode_direct=unsupported
|
|
||||||
hardcode_minus_L=yes
|
|
||||||
hardcode_libdir_flag_spec='-L$libdir'
|
|
||||||
hardcode_libdir_separator=
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
# Begin _LT_AC_SYS_LIBPATH_AIX.
|
|
||||||
echo 'int main () { return 0; }' > conftest.c
|
|
||||||
${CC} ${LDFLAGS} conftest.c -o conftest
|
|
||||||
aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
|
|
||||||
}'`
|
|
||||||
if test -z "$aix_libpath"; then
|
|
||||||
aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
|
|
||||||
}'`
|
|
||||||
fi
|
|
||||||
if test -z "$aix_libpath"; then
|
|
||||||
aix_libpath="/usr/lib:/lib"
|
|
||||||
fi
|
|
||||||
rm -f conftest.c conftest
|
|
||||||
# End _LT_AC_SYS_LIBPATH_AIX.
|
|
||||||
if test "$aix_use_runtimelinking" = yes; then
|
|
||||||
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
||||||
else
|
|
||||||
if test "$host_cpu" = ia64; then
|
|
||||||
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
|
|
||||||
else
|
|
||||||
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
amigaos*)
|
|
||||||
case "$host_cpu" in
|
|
||||||
powerpc)
|
|
||||||
;;
|
|
||||||
m68k)
|
|
||||||
hardcode_libdir_flag_spec='-L$libdir'
|
|
||||||
hardcode_minus_L=yes
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
bsdi[45]*)
|
|
||||||
;;
|
|
||||||
cygwin* | mingw* | pw32* | cegcc*)
|
|
||||||
# When not using gcc, we currently assume that we are using
|
|
||||||
# Microsoft Visual C++.
|
|
||||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
||||||
# no search path for DLLs.
|
|
||||||
hardcode_libdir_flag_spec=' '
|
|
||||||
libext=lib
|
|
||||||
;;
|
|
||||||
darwin* | rhapsody*)
|
|
||||||
hardcode_direct=no
|
|
||||||
if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
ld_shlibs=no
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
dgux*)
|
|
||||||
hardcode_libdir_flag_spec='-L$libdir'
|
|
||||||
;;
|
|
||||||
freebsd2.2*)
|
|
||||||
hardcode_libdir_flag_spec='-R$libdir'
|
|
||||||
hardcode_direct=yes
|
|
||||||
;;
|
|
||||||
freebsd2*)
|
|
||||||
hardcode_direct=yes
|
|
||||||
hardcode_minus_L=yes
|
|
||||||
;;
|
|
||||||
freebsd* | dragonfly*)
|
|
||||||
hardcode_libdir_flag_spec='-R$libdir'
|
|
||||||
hardcode_direct=yes
|
|
||||||
;;
|
|
||||||
hpux9*)
|
|
||||||
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
|
|
||||||
hardcode_libdir_separator=:
|
|
||||||
hardcode_direct=yes
|
|
||||||
# hardcode_minus_L: Not really in the search PATH,
|
|
||||||
# but as the default location of the library.
|
|
||||||
hardcode_minus_L=yes
|
|
||||||
;;
|
|
||||||
hpux10*)
|
|
||||||
if test "$with_gnu_ld" = no; then
|
|
||||||
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
|
|
||||||
hardcode_libdir_separator=:
|
|
||||||
hardcode_direct=yes
|
|
||||||
# hardcode_minus_L: Not really in the search PATH,
|
|
||||||
# but as the default location of the library.
|
|
||||||
hardcode_minus_L=yes
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
hpux11*)
|
|
||||||
if test "$with_gnu_ld" = no; then
|
|
||||||
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
|
|
||||||
hardcode_libdir_separator=:
|
|
||||||
case $host_cpu in
|
|
||||||
hppa*64*|ia64*)
|
|
||||||
hardcode_direct=no
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
hardcode_direct=yes
|
|
||||||
# hardcode_minus_L: Not really in the search PATH,
|
|
||||||
# but as the default location of the library.
|
|
||||||
hardcode_minus_L=yes
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
irix5* | irix6* | nonstopux*)
|
|
||||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
||||||
hardcode_libdir_separator=:
|
|
||||||
;;
|
|
||||||
netbsd*)
|
|
||||||
hardcode_libdir_flag_spec='-R$libdir'
|
|
||||||
hardcode_direct=yes
|
|
||||||
;;
|
|
||||||
newsos6)
|
|
||||||
hardcode_direct=yes
|
|
||||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
||||||
hardcode_libdir_separator=:
|
|
||||||
;;
|
|
||||||
*nto* | *qnx*)
|
|
||||||
;;
|
|
||||||
openbsd*)
|
|
||||||
if test -f /usr/libexec/ld.so; then
|
|
||||||
hardcode_direct=yes
|
|
||||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
||||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
||||||
else
|
|
||||||
case "$host_os" in
|
|
||||||
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
|
||||||
hardcode_libdir_flag_spec='-R$libdir'
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
ld_shlibs=no
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
os2*)
|
|
||||||
hardcode_libdir_flag_spec='-L$libdir'
|
|
||||||
hardcode_minus_L=yes
|
|
||||||
;;
|
|
||||||
osf3*)
|
|
||||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
||||||
hardcode_libdir_separator=:
|
|
||||||
;;
|
|
||||||
osf4* | osf5*)
|
|
||||||
if test "$GCC" = yes; then
|
|
||||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
||||||
else
|
|
||||||
# Both cc and cxx compiler support -rpath directly
|
|
||||||
hardcode_libdir_flag_spec='-rpath $libdir'
|
|
||||||
fi
|
|
||||||
hardcode_libdir_separator=:
|
|
||||||
;;
|
|
||||||
solaris*)
|
|
||||||
hardcode_libdir_flag_spec='-R$libdir'
|
|
||||||
;;
|
|
||||||
sunos4*)
|
|
||||||
hardcode_libdir_flag_spec='-L$libdir'
|
|
||||||
hardcode_direct=yes
|
|
||||||
hardcode_minus_L=yes
|
|
||||||
;;
|
|
||||||
sysv4)
|
|
||||||
case $host_vendor in
|
|
||||||
sni)
|
|
||||||
hardcode_direct=yes # is this really true???
|
|
||||||
;;
|
|
||||||
siemens)
|
|
||||||
hardcode_direct=no
|
|
||||||
;;
|
|
||||||
motorola)
|
|
||||||
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
sysv4.3*)
|
|
||||||
;;
|
|
||||||
sysv4*MP*)
|
|
||||||
if test -d /usr/nec; then
|
|
||||||
ld_shlibs=yes
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
|
|
||||||
;;
|
|
||||||
sysv5* | sco3.2v5* | sco5v6*)
|
|
||||||
hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
|
|
||||||
hardcode_libdir_separator=':'
|
|
||||||
;;
|
|
||||||
uts4*)
|
|
||||||
hardcode_libdir_flag_spec='-L$libdir'
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
ld_shlibs=no
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check dynamic linker characteristics
|
|
||||||
# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
|
|
||||||
# Unlike libtool.m4, here we don't care about _all_ names of the library, but
|
|
||||||
# only about the one the linker finds when passed -lNAME. This is the last
|
|
||||||
# element of library_names_spec in libtool.m4, or possibly two of them if the
|
|
||||||
# linker has special search rules.
|
|
||||||
library_names_spec= # the last element of library_names_spec in libtool.m4
|
|
||||||
libname_spec='lib$name'
|
|
||||||
case "$host_os" in
|
|
||||||
aix3*)
|
|
||||||
library_names_spec='$libname.a'
|
|
||||||
;;
|
|
||||||
aix[4-9]*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
amigaos*)
|
|
||||||
case "$host_cpu" in
|
|
||||||
powerpc*)
|
|
||||||
library_names_spec='$libname$shrext' ;;
|
|
||||||
m68k)
|
|
||||||
library_names_spec='$libname.a' ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
beos*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
bsdi[45]*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
cygwin* | mingw* | pw32* | cegcc*)
|
|
||||||
shrext=.dll
|
|
||||||
library_names_spec='$libname.dll.a $libname.lib'
|
|
||||||
;;
|
|
||||||
darwin* | rhapsody*)
|
|
||||||
shrext=.dylib
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
dgux*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
freebsd* | dragonfly*)
|
|
||||||
case "$host_os" in
|
|
||||||
freebsd[123]*)
|
|
||||||
library_names_spec='$libname$shrext$versuffix' ;;
|
|
||||||
*)
|
|
||||||
library_names_spec='$libname$shrext' ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
gnu*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
haiku*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
hpux9* | hpux10* | hpux11*)
|
|
||||||
case $host_cpu in
|
|
||||||
ia64*)
|
|
||||||
shrext=.so
|
|
||||||
;;
|
|
||||||
hppa*64*)
|
|
||||||
shrext=.sl
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
shrext=.sl
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
interix[3-9]*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
irix5* | irix6* | nonstopux*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
case "$host_os" in
|
|
||||||
irix5* | nonstopux*)
|
|
||||||
libsuff= shlibsuff=
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
case $LD in
|
|
||||||
*-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
|
|
||||||
*-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
|
|
||||||
*-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
|
|
||||||
*) libsuff= shlibsuff= ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
linux*oldld* | linux*aout* | linux*coff*)
|
|
||||||
;;
|
|
||||||
linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
knetbsd*-gnu)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
netbsd*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
newsos6)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
*nto* | *qnx*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
openbsd*)
|
|
||||||
library_names_spec='$libname$shrext$versuffix'
|
|
||||||
;;
|
|
||||||
os2*)
|
|
||||||
libname_spec='$name'
|
|
||||||
shrext=.dll
|
|
||||||
library_names_spec='$libname.a'
|
|
||||||
;;
|
|
||||||
osf3* | osf4* | osf5*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
rdos*)
|
|
||||||
;;
|
|
||||||
solaris*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
sunos4*)
|
|
||||||
library_names_spec='$libname$shrext$versuffix'
|
|
||||||
;;
|
|
||||||
sysv4 | sysv4.3*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
sysv4*MP*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
tpf*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
uts4*)
|
|
||||||
library_names_spec='$libname$shrext'
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
|
|
||||||
escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
|
||||||
shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
|
|
||||||
escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
|
||||||
escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
|
||||||
escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
|
||||||
|
|
||||||
LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
|
|
||||||
|
|
||||||
# How to pass a linker flag through the compiler.
|
|
||||||
wl="$escaped_wl"
|
|
||||||
|
|
||||||
# Static library suffix (normally "a").
|
|
||||||
libext="$libext"
|
|
||||||
|
|
||||||
# Shared library suffix (normally "so").
|
|
||||||
shlibext="$shlibext"
|
|
||||||
|
|
||||||
# Format of library name prefix.
|
|
||||||
libname_spec="$escaped_libname_spec"
|
|
||||||
|
|
||||||
# Library names that the linker finds when passed -lNAME.
|
|
||||||
library_names_spec="$escaped_library_names_spec"
|
|
||||||
|
|
||||||
# Flag to hardcode \$libdir into a binary during linking.
|
|
||||||
# This must work even if \$libdir does not exist.
|
|
||||||
hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
|
|
||||||
|
|
||||||
# Whether we need a single -rpath flag with a separated argument.
|
|
||||||
hardcode_libdir_separator="$hardcode_libdir_separator"
|
|
||||||
|
|
||||||
# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
|
|
||||||
# resulting binary.
|
|
||||||
hardcode_direct="$hardcode_direct"
|
|
||||||
|
|
||||||
# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
|
|
||||||
# resulting binary.
|
|
||||||
hardcode_minus_L="$hardcode_minus_L"
|
|
||||||
|
|
||||||
EOF
|
|
1785
archive/libarchive/build/autoconf/config.sub
vendored
1785
archive/libarchive/build/autoconf/config.sub
vendored
File diff suppressed because it is too large
Load diff
|
@ -1,708 +0,0 @@
|
||||||
#! /bin/sh
|
|
||||||
# depcomp - compile a program generating dependencies as side-effects
|
|
||||||
|
|
||||||
scriptversion=2012-03-27.16; # UTC
|
|
||||||
|
|
||||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
|
|
||||||
# 2011, 2012 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; either version 2, 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/>.
|
|
||||||
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
|
||||||
# distribute this file as part of a program that contains a
|
|
||||||
# configuration script generated by Autoconf, you may include it under
|
|
||||||
# the same distribution terms that you use for the rest of that program.
|
|
||||||
|
|
||||||
# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
|
|
||||||
|
|
||||||
case $1 in
|
|
||||||
'')
|
|
||||||
echo "$0: No command. Try '$0 --help' for more information." 1>&2
|
|
||||||
exit 1;
|
|
||||||
;;
|
|
||||||
-h | --h*)
|
|
||||||
cat <<\EOF
|
|
||||||
Usage: depcomp [--help] [--version] PROGRAM [ARGS]
|
|
||||||
|
|
||||||
Run PROGRAMS ARGS to compile a file, generating dependencies
|
|
||||||
as side-effects.
|
|
||||||
|
|
||||||
Environment variables:
|
|
||||||
depmode Dependency tracking mode.
|
|
||||||
source Source file read by 'PROGRAMS ARGS'.
|
|
||||||
object Object file output by 'PROGRAMS ARGS'.
|
|
||||||
DEPDIR directory where to store dependencies.
|
|
||||||
depfile Dependency file to output.
|
|
||||||
tmpdepfile Temporary file to use when outputting dependencies.
|
|
||||||
libtool Whether libtool is used (yes/no).
|
|
||||||
|
|
||||||
Report bugs to <bug-automake@gnu.org>.
|
|
||||||
EOF
|
|
||||||
exit $?
|
|
||||||
;;
|
|
||||||
-v | --v*)
|
|
||||||
echo "depcomp $scriptversion"
|
|
||||||
exit $?
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# A tabulation character.
|
|
||||||
tab=' '
|
|
||||||
# A newline character.
|
|
||||||
nl='
|
|
||||||
'
|
|
||||||
|
|
||||||
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
|
|
||||||
echo "depcomp: Variables source, object and depmode must be set" 1>&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
|
|
||||||
depfile=${depfile-`echo "$object" |
|
|
||||||
sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
|
|
||||||
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
|
|
||||||
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
|
|
||||||
# Some modes work just like other modes, but use different flags. We
|
|
||||||
# parameterize here, but still list the modes in the big case below,
|
|
||||||
# to make depend.m4 easier to write. Note that we *cannot* use a case
|
|
||||||
# here, because this file can only contain one case statement.
|
|
||||||
if test "$depmode" = hp; then
|
|
||||||
# HP compiler uses -M and no extra arg.
|
|
||||||
gccflag=-M
|
|
||||||
depmode=gcc
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$depmode" = dashXmstdout; then
|
|
||||||
# This is just like dashmstdout with a different argument.
|
|
||||||
dashmflag=-xM
|
|
||||||
depmode=dashmstdout
|
|
||||||
fi
|
|
||||||
|
|
||||||
cygpath_u="cygpath -u -f -"
|
|
||||||
if test "$depmode" = msvcmsys; then
|
|
||||||
# This is just like msvisualcpp but w/o cygpath translation.
|
|
||||||
# Just convert the backslash-escaped backslashes to single forward
|
|
||||||
# slashes to satisfy depend.m4
|
|
||||||
cygpath_u='sed s,\\\\,/,g'
|
|
||||||
depmode=msvisualcpp
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$depmode" = msvc7msys; then
|
|
||||||
# This is just like msvc7 but w/o cygpath translation.
|
|
||||||
# Just convert the backslash-escaped backslashes to single forward
|
|
||||||
# slashes to satisfy depend.m4
|
|
||||||
cygpath_u='sed s,\\\\,/,g'
|
|
||||||
depmode=msvc7
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$depmode" = xlc; then
|
|
||||||
# IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
|
|
||||||
gccflag=-qmakedep=gcc,-MF
|
|
||||||
depmode=gcc
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$depmode" in
|
|
||||||
gcc3)
|
|
||||||
## gcc 3 implements dependency tracking that does exactly what
|
|
||||||
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
|
|
||||||
## it if -MD -MP comes after the -MF stuff. Hmm.
|
|
||||||
## Unfortunately, FreeBSD c89 acceptance of flags depends upon
|
|
||||||
## the command line argument order; so add the flags where they
|
|
||||||
## appear in depend2.am. Note that the slowdown incurred here
|
|
||||||
## affects only configure: in makefiles, %FASTDEP% shortcuts this.
|
|
||||||
for arg
|
|
||||||
do
|
|
||||||
case $arg in
|
|
||||||
-c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
|
|
||||||
*) set fnord "$@" "$arg" ;;
|
|
||||||
esac
|
|
||||||
shift # fnord
|
|
||||||
shift # $arg
|
|
||||||
done
|
|
||||||
"$@"
|
|
||||||
stat=$?
|
|
||||||
if test $stat -eq 0; then :
|
|
||||||
else
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
exit $stat
|
|
||||||
fi
|
|
||||||
mv "$tmpdepfile" "$depfile"
|
|
||||||
;;
|
|
||||||
|
|
||||||
gcc)
|
|
||||||
## There are various ways to get dependency output from gcc. Here's
|
|
||||||
## why we pick this rather obscure method:
|
|
||||||
## - Don't want to use -MD because we'd like the dependencies to end
|
|
||||||
## up in a subdir. Having to rename by hand is ugly.
|
|
||||||
## (We might end up doing this anyway to support other compilers.)
|
|
||||||
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
|
|
||||||
## -MM, not -M (despite what the docs say).
|
|
||||||
## - Using -M directly means running the compiler twice (even worse
|
|
||||||
## than renaming).
|
|
||||||
if test -z "$gccflag"; then
|
|
||||||
gccflag=-MD,
|
|
||||||
fi
|
|
||||||
"$@" -Wp,"$gccflag$tmpdepfile"
|
|
||||||
stat=$?
|
|
||||||
if test $stat -eq 0; then :
|
|
||||||
else
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
exit $stat
|
|
||||||
fi
|
|
||||||
rm -f "$depfile"
|
|
||||||
echo "$object : \\" > "$depfile"
|
|
||||||
alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
|
|
||||||
## The second -e expression handles DOS-style file names with drive letters.
|
|
||||||
sed -e 's/^[^:]*: / /' \
|
|
||||||
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
|
|
||||||
## This next piece of magic avoids the "deleted header file" problem.
|
|
||||||
## The problem is that when a header file which appears in a .P file
|
|
||||||
## is deleted, the dependency causes make to die (because there is
|
|
||||||
## typically no way to rebuild the header). We avoid this by adding
|
|
||||||
## dummy dependencies for each header file. Too bad gcc doesn't do
|
|
||||||
## this for us directly.
|
|
||||||
tr ' ' "$nl" < "$tmpdepfile" |
|
|
||||||
## Some versions of gcc put a space before the ':'. On the theory
|
|
||||||
## that the space means something, we add a space to the output as
|
|
||||||
## well. hp depmode also adds that space, but also prefixes the VPATH
|
|
||||||
## to the object. Take care to not repeat it in the output.
|
|
||||||
## Some versions of the HPUX 10.20 sed can't process this invocation
|
|
||||||
## correctly. Breaking it into two sed invocations is a workaround.
|
|
||||||
sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
|
|
||||||
| sed -e 's/$/ :/' >> "$depfile"
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
;;
|
|
||||||
|
|
||||||
hp)
|
|
||||||
# This case exists only to let depend.m4 do its work. It works by
|
|
||||||
# looking at the text of this script. This case will never be run,
|
|
||||||
# since it is checked for above.
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
|
|
||||||
sgi)
|
|
||||||
if test "$libtool" = yes; then
|
|
||||||
"$@" "-Wp,-MDupdate,$tmpdepfile"
|
|
||||||
else
|
|
||||||
"$@" -MDupdate "$tmpdepfile"
|
|
||||||
fi
|
|
||||||
stat=$?
|
|
||||||
if test $stat -eq 0; then :
|
|
||||||
else
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
exit $stat
|
|
||||||
fi
|
|
||||||
rm -f "$depfile"
|
|
||||||
|
|
||||||
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
|
|
||||||
echo "$object : \\" > "$depfile"
|
|
||||||
|
|
||||||
# Clip off the initial element (the dependent). Don't try to be
|
|
||||||
# clever and replace this with sed code, as IRIX sed won't handle
|
|
||||||
# lines with more than a fixed number of characters (4096 in
|
|
||||||
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
|
|
||||||
# the IRIX cc adds comments like '#:fec' to the end of the
|
|
||||||
# dependency line.
|
|
||||||
tr ' ' "$nl" < "$tmpdepfile" \
|
|
||||||
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
|
|
||||||
tr "$nl" ' ' >> "$depfile"
|
|
||||||
echo >> "$depfile"
|
|
||||||
|
|
||||||
# The second pass generates a dummy entry for each header file.
|
|
||||||
tr ' ' "$nl" < "$tmpdepfile" \
|
|
||||||
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
|
|
||||||
>> "$depfile"
|
|
||||||
else
|
|
||||||
# The sourcefile does not contain any dependencies, so just
|
|
||||||
# store a dummy comment line, to avoid errors with the Makefile
|
|
||||||
# "include basename.Plo" scheme.
|
|
||||||
echo "#dummy" > "$depfile"
|
|
||||||
fi
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
;;
|
|
||||||
|
|
||||||
xlc)
|
|
||||||
# This case exists only to let depend.m4 do its work. It works by
|
|
||||||
# looking at the text of this script. This case will never be run,
|
|
||||||
# since it is checked for above.
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
|
|
||||||
aix)
|
|
||||||
# The C for AIX Compiler uses -M and outputs the dependencies
|
|
||||||
# in a .u file. In older versions, this file always lives in the
|
|
||||||
# current directory. Also, the AIX compiler puts '$object:' at the
|
|
||||||
# start of each line; $object doesn't have directory information.
|
|
||||||
# Version 6 uses the directory in both cases.
|
|
||||||
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
|
||||||
test "x$dir" = "x$object" && dir=
|
|
||||||
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
|
|
||||||
if test "$libtool" = yes; then
|
|
||||||
tmpdepfile1=$dir$base.u
|
|
||||||
tmpdepfile2=$base.u
|
|
||||||
tmpdepfile3=$dir.libs/$base.u
|
|
||||||
"$@" -Wc,-M
|
|
||||||
else
|
|
||||||
tmpdepfile1=$dir$base.u
|
|
||||||
tmpdepfile2=$dir$base.u
|
|
||||||
tmpdepfile3=$dir$base.u
|
|
||||||
"$@" -M
|
|
||||||
fi
|
|
||||||
stat=$?
|
|
||||||
|
|
||||||
if test $stat -eq 0; then :
|
|
||||||
else
|
|
||||||
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
|
||||||
exit $stat
|
|
||||||
fi
|
|
||||||
|
|
||||||
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
|
|
||||||
do
|
|
||||||
test -f "$tmpdepfile" && break
|
|
||||||
done
|
|
||||||
if test -f "$tmpdepfile"; then
|
|
||||||
# Each line is of the form 'foo.o: dependent.h'.
|
|
||||||
# Do two passes, one to just change these to
|
|
||||||
# '$object: dependent.h' and one to simply 'dependent.h:'.
|
|
||||||
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
|
|
||||||
sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
|
||||||
else
|
|
||||||
# The sourcefile does not contain any dependencies, so just
|
|
||||||
# store a dummy comment line, to avoid errors with the Makefile
|
|
||||||
# "include basename.Plo" scheme.
|
|
||||||
echo "#dummy" > "$depfile"
|
|
||||||
fi
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
;;
|
|
||||||
|
|
||||||
icc)
|
|
||||||
# Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
|
|
||||||
# However on
|
|
||||||
# $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
|
|
||||||
# ICC 7.0 will fill foo.d with something like
|
|
||||||
# foo.o: sub/foo.c
|
|
||||||
# foo.o: sub/foo.h
|
|
||||||
# which is wrong. We want
|
|
||||||
# sub/foo.o: sub/foo.c
|
|
||||||
# sub/foo.o: sub/foo.h
|
|
||||||
# sub/foo.c:
|
|
||||||
# sub/foo.h:
|
|
||||||
# ICC 7.1 will output
|
|
||||||
# foo.o: sub/foo.c sub/foo.h
|
|
||||||
# and will wrap long lines using '\':
|
|
||||||
# foo.o: sub/foo.c ... \
|
|
||||||
# sub/foo.h ... \
|
|
||||||
# ...
|
|
||||||
# tcc 0.9.26 (FIXME still under development at the moment of writing)
|
|
||||||
# will emit a similar output, but also prepend the continuation lines
|
|
||||||
# with horizontal tabulation characters.
|
|
||||||
"$@" -MD -MF "$tmpdepfile"
|
|
||||||
stat=$?
|
|
||||||
if test $stat -eq 0; then :
|
|
||||||
else
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
exit $stat
|
|
||||||
fi
|
|
||||||
rm -f "$depfile"
|
|
||||||
# Each line is of the form 'foo.o: dependent.h',
|
|
||||||
# or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
|
|
||||||
# Do two passes, one to just change these to
|
|
||||||
# '$object: dependent.h' and one to simply 'dependent.h:'.
|
|
||||||
sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
|
|
||||||
< "$tmpdepfile" > "$depfile"
|
|
||||||
sed '
|
|
||||||
s/[ '"$tab"'][ '"$tab"']*/ /g
|
|
||||||
s/^ *//
|
|
||||||
s/ *\\*$//
|
|
||||||
s/^[^:]*: *//
|
|
||||||
/^$/d
|
|
||||||
/:$/d
|
|
||||||
s/$/ :/
|
|
||||||
' < "$tmpdepfile" >> "$depfile"
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
;;
|
|
||||||
|
|
||||||
hp2)
|
|
||||||
# The "hp" stanza above does not work with aCC (C++) and HP's ia64
|
|
||||||
# compilers, which have integrated preprocessors. The correct option
|
|
||||||
# to use with these is +Maked; it writes dependencies to a file named
|
|
||||||
# 'foo.d', which lands next to the object file, wherever that
|
|
||||||
# happens to be.
|
|
||||||
# Much of this is similar to the tru64 case; see comments there.
|
|
||||||
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
|
||||||
test "x$dir" = "x$object" && dir=
|
|
||||||
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
|
|
||||||
if test "$libtool" = yes; then
|
|
||||||
tmpdepfile1=$dir$base.d
|
|
||||||
tmpdepfile2=$dir.libs/$base.d
|
|
||||||
"$@" -Wc,+Maked
|
|
||||||
else
|
|
||||||
tmpdepfile1=$dir$base.d
|
|
||||||
tmpdepfile2=$dir$base.d
|
|
||||||
"$@" +Maked
|
|
||||||
fi
|
|
||||||
stat=$?
|
|
||||||
if test $stat -eq 0; then :
|
|
||||||
else
|
|
||||||
rm -f "$tmpdepfile1" "$tmpdepfile2"
|
|
||||||
exit $stat
|
|
||||||
fi
|
|
||||||
|
|
||||||
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
|
|
||||||
do
|
|
||||||
test -f "$tmpdepfile" && break
|
|
||||||
done
|
|
||||||
if test -f "$tmpdepfile"; then
|
|
||||||
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
|
|
||||||
# Add 'dependent.h:' lines.
|
|
||||||
sed -ne '2,${
|
|
||||||
s/^ *//
|
|
||||||
s/ \\*$//
|
|
||||||
s/$/:/
|
|
||||||
p
|
|
||||||
}' "$tmpdepfile" >> "$depfile"
|
|
||||||
else
|
|
||||||
echo "#dummy" > "$depfile"
|
|
||||||
fi
|
|
||||||
rm -f "$tmpdepfile" "$tmpdepfile2"
|
|
||||||
;;
|
|
||||||
|
|
||||||
tru64)
|
|
||||||
# The Tru64 compiler uses -MD to generate dependencies as a side
|
|
||||||
# effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
|
|
||||||
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
|
|
||||||
# dependencies in 'foo.d' instead, so we check for that too.
|
|
||||||
# Subdirectories are respected.
|
|
||||||
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
|
||||||
test "x$dir" = "x$object" && dir=
|
|
||||||
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
|
|
||||||
|
|
||||||
if test "$libtool" = yes; then
|
|
||||||
# With Tru64 cc, shared objects can also be used to make a
|
|
||||||
# static library. This mechanism is used in libtool 1.4 series to
|
|
||||||
# handle both shared and static libraries in a single compilation.
|
|
||||||
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
|
|
||||||
#
|
|
||||||
# With libtool 1.5 this exception was removed, and libtool now
|
|
||||||
# generates 2 separate objects for the 2 libraries. These two
|
|
||||||
# compilations output dependencies in $dir.libs/$base.o.d and
|
|
||||||
# in $dir$base.o.d. We have to check for both files, because
|
|
||||||
# one of the two compilations can be disabled. We should prefer
|
|
||||||
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
|
|
||||||
# automatically cleaned when .libs/ is deleted, while ignoring
|
|
||||||
# the former would cause a distcleancheck panic.
|
|
||||||
tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
|
|
||||||
tmpdepfile2=$dir$base.o.d # libtool 1.5
|
|
||||||
tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
|
|
||||||
tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
|
|
||||||
"$@" -Wc,-MD
|
|
||||||
else
|
|
||||||
tmpdepfile1=$dir$base.o.d
|
|
||||||
tmpdepfile2=$dir$base.d
|
|
||||||
tmpdepfile3=$dir$base.d
|
|
||||||
tmpdepfile4=$dir$base.d
|
|
||||||
"$@" -MD
|
|
||||||
fi
|
|
||||||
|
|
||||||
stat=$?
|
|
||||||
if test $stat -eq 0; then :
|
|
||||||
else
|
|
||||||
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
|
|
||||||
exit $stat
|
|
||||||
fi
|
|
||||||
|
|
||||||
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
|
|
||||||
do
|
|
||||||
test -f "$tmpdepfile" && break
|
|
||||||
done
|
|
||||||
if test -f "$tmpdepfile"; then
|
|
||||||
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
|
|
||||||
sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
|
||||||
else
|
|
||||||
echo "#dummy" > "$depfile"
|
|
||||||
fi
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
;;
|
|
||||||
|
|
||||||
msvc7)
|
|
||||||
if test "$libtool" = yes; then
|
|
||||||
showIncludes=-Wc,-showIncludes
|
|
||||||
else
|
|
||||||
showIncludes=-showIncludes
|
|
||||||
fi
|
|
||||||
"$@" $showIncludes > "$tmpdepfile"
|
|
||||||
stat=$?
|
|
||||||
grep -v '^Note: including file: ' "$tmpdepfile"
|
|
||||||
if test "$stat" = 0; then :
|
|
||||||
else
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
exit $stat
|
|
||||||
fi
|
|
||||||
rm -f "$depfile"
|
|
||||||
echo "$object : \\" > "$depfile"
|
|
||||||
# The first sed program below extracts the file names and escapes
|
|
||||||
# backslashes for cygpath. The second sed program outputs the file
|
|
||||||
# name when reading, but also accumulates all include files in the
|
|
||||||
# hold buffer in order to output them again at the end. This only
|
|
||||||
# works with sed implementations that can handle large buffers.
|
|
||||||
sed < "$tmpdepfile" -n '
|
|
||||||
/^Note: including file: *\(.*\)/ {
|
|
||||||
s//\1/
|
|
||||||
s/\\/\\\\/g
|
|
||||||
p
|
|
||||||
}' | $cygpath_u | sort -u | sed -n '
|
|
||||||
s/ /\\ /g
|
|
||||||
s/\(.*\)/'"$tab"'\1 \\/p
|
|
||||||
s/.\(.*\) \\/\1:/
|
|
||||||
H
|
|
||||||
$ {
|
|
||||||
s/.*/'"$tab"'/
|
|
||||||
G
|
|
||||||
p
|
|
||||||
}' >> "$depfile"
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
;;
|
|
||||||
|
|
||||||
msvc7msys)
|
|
||||||
# This case exists only to let depend.m4 do its work. It works by
|
|
||||||
# looking at the text of this script. This case will never be run,
|
|
||||||
# since it is checked for above.
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
|
|
||||||
#nosideeffect)
|
|
||||||
# This comment above is used by automake to tell side-effect
|
|
||||||
# dependency tracking mechanisms from slower ones.
|
|
||||||
|
|
||||||
dashmstdout)
|
|
||||||
# Important note: in order to support this mode, a compiler *must*
|
|
||||||
# always write the preprocessed file to stdout, regardless of -o.
|
|
||||||
"$@" || exit $?
|
|
||||||
|
|
||||||
# Remove the call to Libtool.
|
|
||||||
if test "$libtool" = yes; then
|
|
||||||
while test "X$1" != 'X--mode=compile'; do
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
shift
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove '-o $object'.
|
|
||||||
IFS=" "
|
|
||||||
for arg
|
|
||||||
do
|
|
||||||
case $arg in
|
|
||||||
-o)
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
$object)
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
set fnord "$@" "$arg"
|
|
||||||
shift # fnord
|
|
||||||
shift # $arg
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
test -z "$dashmflag" && dashmflag=-M
|
|
||||||
# Require at least two characters before searching for ':'
|
|
||||||
# in the target name. This is to cope with DOS-style filenames:
|
|
||||||
# a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
|
|
||||||
"$@" $dashmflag |
|
|
||||||
sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
|
|
||||||
rm -f "$depfile"
|
|
||||||
cat < "$tmpdepfile" > "$depfile"
|
|
||||||
tr ' ' "$nl" < "$tmpdepfile" | \
|
|
||||||
## Some versions of the HPUX 10.20 sed can't process this invocation
|
|
||||||
## correctly. Breaking it into two sed invocations is a workaround.
|
|
||||||
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
;;
|
|
||||||
|
|
||||||
dashXmstdout)
|
|
||||||
# This case only exists to satisfy depend.m4. It is never actually
|
|
||||||
# run, as this mode is specially recognized in the preamble.
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
|
|
||||||
makedepend)
|
|
||||||
"$@" || exit $?
|
|
||||||
# Remove any Libtool call
|
|
||||||
if test "$libtool" = yes; then
|
|
||||||
while test "X$1" != 'X--mode=compile'; do
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
shift
|
|
||||||
fi
|
|
||||||
# X makedepend
|
|
||||||
shift
|
|
||||||
cleared=no eat=no
|
|
||||||
for arg
|
|
||||||
do
|
|
||||||
case $cleared in
|
|
||||||
no)
|
|
||||||
set ""; shift
|
|
||||||
cleared=yes ;;
|
|
||||||
esac
|
|
||||||
if test $eat = yes; then
|
|
||||||
eat=no
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
case "$arg" in
|
|
||||||
-D*|-I*)
|
|
||||||
set fnord "$@" "$arg"; shift ;;
|
|
||||||
# Strip any option that makedepend may not understand. Remove
|
|
||||||
# the object too, otherwise makedepend will parse it as a source file.
|
|
||||||
-arch)
|
|
||||||
eat=yes ;;
|
|
||||||
-*|$object)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
set fnord "$@" "$arg"; shift ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
obj_suffix=`echo "$object" | sed 's/^.*\././'`
|
|
||||||
touch "$tmpdepfile"
|
|
||||||
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
|
|
||||||
rm -f "$depfile"
|
|
||||||
# makedepend may prepend the VPATH from the source file name to the object.
|
|
||||||
# No need to regex-escape $object, excess matching of '.' is harmless.
|
|
||||||
sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
|
|
||||||
sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
|
|
||||||
## Some versions of the HPUX 10.20 sed can't process this invocation
|
|
||||||
## correctly. Breaking it into two sed invocations is a workaround.
|
|
||||||
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
|
|
||||||
rm -f "$tmpdepfile" "$tmpdepfile".bak
|
|
||||||
;;
|
|
||||||
|
|
||||||
cpp)
|
|
||||||
# Important note: in order to support this mode, a compiler *must*
|
|
||||||
# always write the preprocessed file to stdout.
|
|
||||||
"$@" || exit $?
|
|
||||||
|
|
||||||
# Remove the call to Libtool.
|
|
||||||
if test "$libtool" = yes; then
|
|
||||||
while test "X$1" != 'X--mode=compile'; do
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
shift
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove '-o $object'.
|
|
||||||
IFS=" "
|
|
||||||
for arg
|
|
||||||
do
|
|
||||||
case $arg in
|
|
||||||
-o)
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
$object)
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
set fnord "$@" "$arg"
|
|
||||||
shift # fnord
|
|
||||||
shift # $arg
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
"$@" -E |
|
|
||||||
sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
|
|
||||||
-e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
|
|
||||||
sed '$ s: \\$::' > "$tmpdepfile"
|
|
||||||
rm -f "$depfile"
|
|
||||||
echo "$object : \\" > "$depfile"
|
|
||||||
cat < "$tmpdepfile" >> "$depfile"
|
|
||||||
sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
;;
|
|
||||||
|
|
||||||
msvisualcpp)
|
|
||||||
# Important note: in order to support this mode, a compiler *must*
|
|
||||||
# always write the preprocessed file to stdout.
|
|
||||||
"$@" || exit $?
|
|
||||||
|
|
||||||
# Remove the call to Libtool.
|
|
||||||
if test "$libtool" = yes; then
|
|
||||||
while test "X$1" != 'X--mode=compile'; do
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
shift
|
|
||||||
fi
|
|
||||||
|
|
||||||
IFS=" "
|
|
||||||
for arg
|
|
||||||
do
|
|
||||||
case "$arg" in
|
|
||||||
-o)
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
$object)
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
|
|
||||||
set fnord "$@"
|
|
||||||
shift
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
set fnord "$@" "$arg"
|
|
||||||
shift
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
"$@" -E 2>/dev/null |
|
|
||||||
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
|
|
||||||
rm -f "$depfile"
|
|
||||||
echo "$object : \\" > "$depfile"
|
|
||||||
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
|
|
||||||
echo "$tab" >> "$depfile"
|
|
||||||
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
|
|
||||||
rm -f "$tmpdepfile"
|
|
||||||
;;
|
|
||||||
|
|
||||||
msvcmsys)
|
|
||||||
# This case exists only to let depend.m4 do its work. It works by
|
|
||||||
# looking at the text of this script. This case will never be run,
|
|
||||||
# since it is checked for above.
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
|
|
||||||
none)
|
|
||||||
exec "$@"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
echo "Unknown depmode $depmode" 1>&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# mode: shell-script
|
|
||||||
# sh-indentation: 2
|
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
||||||
# time-stamp-start: "scriptversion="
|
|
||||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
||||||
# time-stamp-time-zone: "UTC"
|
|
||||||
# time-stamp-end: "; # UTC"
|
|
||||||
# End:
|
|
|
@ -1,268 +0,0 @@
|
||||||
# iconv.m4 serial 18 (gettext-0.18.2)
|
|
||||||
dnl Copyright (C) 2000-2002, 2007-2011 Free Software Foundation, Inc.
|
|
||||||
dnl This file is free software; the Free Software Foundation
|
|
||||||
dnl gives unlimited permission to copy and/or distribute it,
|
|
||||||
dnl with or without modifications, as long as this notice is preserved.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
|
||||||
|
|
||||||
AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
|
|
||||||
[
|
|
||||||
dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
|
|
||||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
||||||
AC_REQUIRE([AC_LIB_RPATH])
|
|
||||||
|
|
||||||
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
|
||||||
dnl accordingly.
|
|
||||||
AC_LIB_LINKFLAGS_BODY([iconv])
|
|
||||||
])
|
|
||||||
|
|
||||||
AC_DEFUN([AM_ICONV_LINK],
|
|
||||||
[
|
|
||||||
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
|
|
||||||
dnl those with the standalone portable GNU libiconv installed).
|
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
|
|
||||||
|
|
||||||
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
|
||||||
dnl accordingly.
|
|
||||||
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
|
||||||
|
|
||||||
dnl Add $INCICONV to CPPFLAGS before performing the following checks,
|
|
||||||
dnl because if the user has installed libiconv and not disabled its use
|
|
||||||
dnl via --without-libiconv-prefix, he wants to use it. The first
|
|
||||||
dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
|
|
||||||
am_save_CPPFLAGS="$CPPFLAGS"
|
|
||||||
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
|
|
||||||
|
|
||||||
AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
|
|
||||||
am_cv_func_iconv="no, consider installing GNU libiconv"
|
|
||||||
am_cv_lib_iconv=no
|
|
||||||
AC_LINK_IFELSE(
|
|
||||||
[AC_LANG_PROGRAM(
|
|
||||||
[[
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <iconv.h>
|
|
||||||
]],
|
|
||||||
[[iconv_t cd = iconv_open("","");
|
|
||||||
iconv(cd,NULL,NULL,NULL,NULL);
|
|
||||||
iconv_close(cd);]])],
|
|
||||||
[am_cv_func_iconv=yes])
|
|
||||||
if test "$am_cv_func_iconv" != yes; then
|
|
||||||
am_save_LIBS="$LIBS"
|
|
||||||
LIBS="$LIBS $LIBICONV"
|
|
||||||
AC_LINK_IFELSE(
|
|
||||||
[AC_LANG_PROGRAM(
|
|
||||||
[[
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <iconv.h>
|
|
||||||
]],
|
|
||||||
[[iconv_t cd = iconv_open("","");
|
|
||||||
iconv(cd,NULL,NULL,NULL,NULL);
|
|
||||||
iconv_close(cd);]])],
|
|
||||||
[am_cv_lib_iconv=yes]
|
|
||||||
[am_cv_func_iconv=yes])
|
|
||||||
LIBS="$am_save_LIBS"
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
if test "$am_cv_func_iconv" = yes; then
|
|
||||||
AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
|
|
||||||
dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
|
|
||||||
dnl Solaris 10.
|
|
||||||
am_save_LIBS="$LIBS"
|
|
||||||
if test $am_cv_lib_iconv = yes; then
|
|
||||||
LIBS="$LIBS $LIBICONV"
|
|
||||||
fi
|
|
||||||
AC_RUN_IFELSE(
|
|
||||||
[AC_LANG_SOURCE([[
|
|
||||||
#include <iconv.h>
|
|
||||||
#include <string.h>
|
|
||||||
int main ()
|
|
||||||
{
|
|
||||||
int result = 0;
|
|
||||||
/* Test against AIX 5.1 bug: Failures are not distinguishable from successful
|
|
||||||
returns. */
|
|
||||||
{
|
|
||||||
iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
|
|
||||||
if (cd_utf8_to_88591 != (iconv_t)(-1))
|
|
||||||
{
|
|
||||||
static const char input[] = "\342\202\254"; /* EURO SIGN */
|
|
||||||
char buf[10];
|
|
||||||
const char *inptr = input;
|
|
||||||
size_t inbytesleft = strlen (input);
|
|
||||||
char *outptr = buf;
|
|
||||||
size_t outbytesleft = sizeof (buf);
|
|
||||||
size_t res = iconv (cd_utf8_to_88591,
|
|
||||||
(char **) &inptr, &inbytesleft,
|
|
||||||
&outptr, &outbytesleft);
|
|
||||||
if (res == 0)
|
|
||||||
result |= 1;
|
|
||||||
iconv_close (cd_utf8_to_88591);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* Test against Solaris 10 bug: Failures are not distinguishable from
|
|
||||||
successful returns. */
|
|
||||||
{
|
|
||||||
iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
|
|
||||||
if (cd_ascii_to_88591 != (iconv_t)(-1))
|
|
||||||
{
|
|
||||||
static const char input[] = "\263";
|
|
||||||
char buf[10];
|
|
||||||
const char *inptr = input;
|
|
||||||
size_t inbytesleft = strlen (input);
|
|
||||||
char *outptr = buf;
|
|
||||||
size_t outbytesleft = sizeof (buf);
|
|
||||||
size_t res = iconv (cd_ascii_to_88591,
|
|
||||||
(char **) &inptr, &inbytesleft,
|
|
||||||
&outptr, &outbytesleft);
|
|
||||||
if (res == 0)
|
|
||||||
result |= 2;
|
|
||||||
iconv_close (cd_ascii_to_88591);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* Test against AIX 6.1..7.1 bug: Buffer overrun. */
|
|
||||||
{
|
|
||||||
iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
|
|
||||||
if (cd_88591_to_utf8 != (iconv_t)(-1))
|
|
||||||
{
|
|
||||||
static const char input[] = "\304";
|
|
||||||
static char buf[2] = { (char)0xDE, (char)0xAD };
|
|
||||||
const char *inptr = input;
|
|
||||||
size_t inbytesleft = 1;
|
|
||||||
char *outptr = buf;
|
|
||||||
size_t outbytesleft = 1;
|
|
||||||
size_t res = iconv (cd_88591_to_utf8,
|
|
||||||
(char **) &inptr, &inbytesleft,
|
|
||||||
&outptr, &outbytesleft);
|
|
||||||
if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
|
|
||||||
result |= 4;
|
|
||||||
iconv_close (cd_88591_to_utf8);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#if 0 /* This bug could be worked around by the caller. */
|
|
||||||
/* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
|
|
||||||
{
|
|
||||||
iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
|
|
||||||
if (cd_88591_to_utf8 != (iconv_t)(-1))
|
|
||||||
{
|
|
||||||
static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
|
|
||||||
char buf[50];
|
|
||||||
const char *inptr = input;
|
|
||||||
size_t inbytesleft = strlen (input);
|
|
||||||
char *outptr = buf;
|
|
||||||
size_t outbytesleft = sizeof (buf);
|
|
||||||
size_t res = iconv (cd_88591_to_utf8,
|
|
||||||
(char **) &inptr, &inbytesleft,
|
|
||||||
&outptr, &outbytesleft);
|
|
||||||
if ((int)res > 0)
|
|
||||||
result |= 8;
|
|
||||||
iconv_close (cd_88591_to_utf8);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
/* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
|
|
||||||
provided. */
|
|
||||||
if (/* Try standardized names. */
|
|
||||||
iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
|
|
||||||
/* Try IRIX, OSF/1 names. */
|
|
||||||
&& iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
|
|
||||||
/* Try AIX names. */
|
|
||||||
&& iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
|
|
||||||
/* Try HP-UX names. */
|
|
||||||
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
|
|
||||||
result |= 16;
|
|
||||||
return result;
|
|
||||||
}]])],
|
|
||||||
[am_cv_func_iconv_works=yes],
|
|
||||||
[am_cv_func_iconv_works=no],
|
|
||||||
[
|
|
||||||
changequote(,)dnl
|
|
||||||
case "$host_os" in
|
|
||||||
aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
|
|
||||||
*) am_cv_func_iconv_works="guessing yes" ;;
|
|
||||||
esac
|
|
||||||
changequote([,])dnl
|
|
||||||
])
|
|
||||||
LIBS="$am_save_LIBS"
|
|
||||||
])
|
|
||||||
case "$am_cv_func_iconv_works" in
|
|
||||||
*no) am_func_iconv=no am_cv_lib_iconv=no ;;
|
|
||||||
*) am_func_iconv=yes ;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
am_func_iconv=no am_cv_lib_iconv=no
|
|
||||||
fi
|
|
||||||
if test "$am_func_iconv" = yes; then
|
|
||||||
AC_DEFINE([HAVE_ICONV], [1],
|
|
||||||
[Define if you have the iconv() function and it works.])
|
|
||||||
fi
|
|
||||||
if test "$am_cv_lib_iconv" = yes; then
|
|
||||||
AC_MSG_CHECKING([how to link with libiconv])
|
|
||||||
AC_MSG_RESULT([$LIBICONV])
|
|
||||||
else
|
|
||||||
dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
|
|
||||||
dnl either.
|
|
||||||
CPPFLAGS="$am_save_CPPFLAGS"
|
|
||||||
LIBICONV=
|
|
||||||
LTLIBICONV=
|
|
||||||
fi
|
|
||||||
AC_SUBST([LIBICONV])
|
|
||||||
AC_SUBST([LTLIBICONV])
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
|
|
||||||
dnl avoid warnings like
|
|
||||||
dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
|
|
||||||
dnl This is tricky because of the way 'aclocal' is implemented:
|
|
||||||
dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
|
|
||||||
dnl Otherwise aclocal's initial scan pass would miss the macro definition.
|
|
||||||
dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
|
|
||||||
dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
|
|
||||||
dnl warnings.
|
|
||||||
m4_define([gl_iconv_AC_DEFUN],
|
|
||||||
m4_version_prereq([2.64],
|
|
||||||
[[AC_DEFUN_ONCE(
|
|
||||||
[$1], [$2])]],
|
|
||||||
[m4_ifdef([gl_00GNULIB],
|
|
||||||
[[AC_DEFUN_ONCE(
|
|
||||||
[$1], [$2])]],
|
|
||||||
[[AC_DEFUN(
|
|
||||||
[$1], [$2])]])]))
|
|
||||||
gl_iconv_AC_DEFUN([AM_ICONV],
|
|
||||||
[
|
|
||||||
AM_ICONV_LINK
|
|
||||||
if test "$am_cv_func_iconv" = yes; then
|
|
||||||
AC_MSG_CHECKING([for iconv declaration])
|
|
||||||
AC_CACHE_VAL([am_cv_proto_iconv], [
|
|
||||||
AC_COMPILE_IFELSE(
|
|
||||||
[AC_LANG_PROGRAM(
|
|
||||||
[[
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <iconv.h>
|
|
||||||
extern
|
|
||||||
#ifdef __cplusplus
|
|
||||||
"C"
|
|
||||||
#endif
|
|
||||||
#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
|
|
||||||
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
|
|
||||||
#else
|
|
||||||
size_t iconv();
|
|
||||||
#endif
|
|
||||||
]],
|
|
||||||
[[]])],
|
|
||||||
[am_cv_proto_iconv_arg1=""],
|
|
||||||
[am_cv_proto_iconv_arg1="const"])
|
|
||||||
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
|
|
||||||
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
|
|
||||||
AC_MSG_RESULT([
|
|
||||||
$am_cv_proto_iconv])
|
|
||||||
AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
|
|
||||||
[Define as const if the declaration of iconv() needs const.])
|
|
||||||
dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
|
|
||||||
m4_ifdef([gl_ICONV_H_DEFAULTS],
|
|
||||||
[AC_REQUIRE([gl_ICONV_H_DEFAULTS])
|
|
||||||
if test -n "$am_cv_proto_iconv_arg1"; then
|
|
||||||
ICONV_CONST="const"
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
fi
|
|
||||||
])
|
|
|
@ -1,527 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
# install - install a program, script, or datafile
|
|
||||||
|
|
||||||
scriptversion=2011-01-19.21; # UTC
|
|
||||||
|
|
||||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
|
||||||
# later released in X11R6 (xc/config/util/install.sh) with the
|
|
||||||
# following copyright and license.
|
|
||||||
#
|
|
||||||
# Copyright (C) 1994 X Consortium
|
|
||||||
#
|
|
||||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
# of this software and associated documentation files (the "Software"), to
|
|
||||||
# deal in the Software without restriction, including without limitation the
|
|
||||||
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
||||||
# sell copies of the Software, and to permit persons to whom the Software is
|
|
||||||
# furnished to do so, subject to the following conditions:
|
|
||||||
#
|
|
||||||
# The above copyright notice and this permission notice shall be included in
|
|
||||||
# all copies or substantial portions of the Software.
|
|
||||||
#
|
|
||||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
|
||||||
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
|
|
||||||
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
#
|
|
||||||
# Except as contained in this notice, the name of the X Consortium shall not
|
|
||||||
# be used in advertising or otherwise to promote the sale, use or other deal-
|
|
||||||
# ings in this Software without prior written authorization from the X Consor-
|
|
||||||
# tium.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# FSF changes to this file are in the public domain.
|
|
||||||
#
|
|
||||||
# Calling this script install-sh is preferred over install.sh, to prevent
|
|
||||||
# `make' implicit rules from creating a file called install from it
|
|
||||||
# when there is no Makefile.
|
|
||||||
#
|
|
||||||
# This script is compatible with the BSD install script, but was written
|
|
||||||
# from scratch.
|
|
||||||
|
|
||||||
nl='
|
|
||||||
'
|
|
||||||
IFS=" "" $nl"
|
|
||||||
|
|
||||||
# set DOITPROG to echo to test this script
|
|
||||||
|
|
||||||
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
|
||||||
doit=${DOITPROG-}
|
|
||||||
if test -z "$doit"; then
|
|
||||||
doit_exec=exec
|
|
||||||
else
|
|
||||||
doit_exec=$doit
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Put in absolute file names if you don't have them in your path;
|
|
||||||
# or use environment vars.
|
|
||||||
|
|
||||||
chgrpprog=${CHGRPPROG-chgrp}
|
|
||||||
chmodprog=${CHMODPROG-chmod}
|
|
||||||
chownprog=${CHOWNPROG-chown}
|
|
||||||
cmpprog=${CMPPROG-cmp}
|
|
||||||
cpprog=${CPPROG-cp}
|
|
||||||
mkdirprog=${MKDIRPROG-mkdir}
|
|
||||||
mvprog=${MVPROG-mv}
|
|
||||||
rmprog=${RMPROG-rm}
|
|
||||||
stripprog=${STRIPPROG-strip}
|
|
||||||
|
|
||||||
posix_glob='?'
|
|
||||||
initialize_posix_glob='
|
|
||||||
test "$posix_glob" != "?" || {
|
|
||||||
if (set -f) 2>/dev/null; then
|
|
||||||
posix_glob=
|
|
||||||
else
|
|
||||||
posix_glob=:
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
'
|
|
||||||
|
|
||||||
posix_mkdir=
|
|
||||||
|
|
||||||
# Desired mode of installed file.
|
|
||||||
mode=0755
|
|
||||||
|
|
||||||
chgrpcmd=
|
|
||||||
chmodcmd=$chmodprog
|
|
||||||
chowncmd=
|
|
||||||
mvcmd=$mvprog
|
|
||||||
rmcmd="$rmprog -f"
|
|
||||||
stripcmd=
|
|
||||||
|
|
||||||
src=
|
|
||||||
dst=
|
|
||||||
dir_arg=
|
|
||||||
dst_arg=
|
|
||||||
|
|
||||||
copy_on_change=false
|
|
||||||
no_target_directory=
|
|
||||||
|
|
||||||
usage="\
|
|
||||||
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
|
||||||
or: $0 [OPTION]... SRCFILES... DIRECTORY
|
|
||||||
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
|
|
||||||
or: $0 [OPTION]... -d DIRECTORIES...
|
|
||||||
|
|
||||||
In the 1st form, copy SRCFILE to DSTFILE.
|
|
||||||
In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
|
|
||||||
In the 4th, create DIRECTORIES.
|
|
||||||
|
|
||||||
Options:
|
|
||||||
--help display this help and exit.
|
|
||||||
--version display version info and exit.
|
|
||||||
|
|
||||||
-c (ignored)
|
|
||||||
-C install only if different (preserve the last data modification time)
|
|
||||||
-d create directories instead of installing files.
|
|
||||||
-g GROUP $chgrpprog installed files to GROUP.
|
|
||||||
-m MODE $chmodprog installed files to MODE.
|
|
||||||
-o USER $chownprog installed files to USER.
|
|
||||||
-s $stripprog installed files.
|
|
||||||
-t DIRECTORY install into DIRECTORY.
|
|
||||||
-T report an error if DSTFILE is a directory.
|
|
||||||
|
|
||||||
Environment variables override the default commands:
|
|
||||||
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
|
|
||||||
RMPROG STRIPPROG
|
|
||||||
"
|
|
||||||
|
|
||||||
while test $# -ne 0; do
|
|
||||||
case $1 in
|
|
||||||
-c) ;;
|
|
||||||
|
|
||||||
-C) copy_on_change=true;;
|
|
||||||
|
|
||||||
-d) dir_arg=true;;
|
|
||||||
|
|
||||||
-g) chgrpcmd="$chgrpprog $2"
|
|
||||||
shift;;
|
|
||||||
|
|
||||||
--help) echo "$usage"; exit $?;;
|
|
||||||
|
|
||||||
-m) mode=$2
|
|
||||||
case $mode in
|
|
||||||
*' '* | *' '* | *'
|
|
||||||
'* | *'*'* | *'?'* | *'['*)
|
|
||||||
echo "$0: invalid mode: $mode" >&2
|
|
||||||
exit 1;;
|
|
||||||
esac
|
|
||||||
shift;;
|
|
||||||
|
|
||||||
-o) chowncmd="$chownprog $2"
|
|
||||||
shift;;
|
|
||||||
|
|
||||||
-s) stripcmd=$stripprog;;
|
|
||||||
|
|
||||||
-t) dst_arg=$2
|
|
||||||
# Protect names problematic for `test' and other utilities.
|
|
||||||
case $dst_arg in
|
|
||||||
-* | [=\(\)!]) dst_arg=./$dst_arg;;
|
|
||||||
esac
|
|
||||||
shift;;
|
|
||||||
|
|
||||||
-T) no_target_directory=true;;
|
|
||||||
|
|
||||||
--version) echo "$0 $scriptversion"; exit $?;;
|
|
||||||
|
|
||||||
--) shift
|
|
||||||
break;;
|
|
||||||
|
|
||||||
-*) echo "$0: invalid option: $1" >&2
|
|
||||||
exit 1;;
|
|
||||||
|
|
||||||
*) break;;
|
|
||||||
esac
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
|
|
||||||
# When -d is used, all remaining arguments are directories to create.
|
|
||||||
# When -t is used, the destination is already specified.
|
|
||||||
# Otherwise, the last argument is the destination. Remove it from $@.
|
|
||||||
for arg
|
|
||||||
do
|
|
||||||
if test -n "$dst_arg"; then
|
|
||||||
# $@ is not empty: it contains at least $arg.
|
|
||||||
set fnord "$@" "$dst_arg"
|
|
||||||
shift # fnord
|
|
||||||
fi
|
|
||||||
shift # arg
|
|
||||||
dst_arg=$arg
|
|
||||||
# Protect names problematic for `test' and other utilities.
|
|
||||||
case $dst_arg in
|
|
||||||
-* | [=\(\)!]) dst_arg=./$dst_arg;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test $# -eq 0; then
|
|
||||||
if test -z "$dir_arg"; then
|
|
||||||
echo "$0: no input file specified." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
# It's OK to call `install-sh -d' without argument.
|
|
||||||
# This can happen when creating conditional directories.
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -z "$dir_arg"; then
|
|
||||||
do_exit='(exit $ret); exit $ret'
|
|
||||||
trap "ret=129; $do_exit" 1
|
|
||||||
trap "ret=130; $do_exit" 2
|
|
||||||
trap "ret=141; $do_exit" 13
|
|
||||||
trap "ret=143; $do_exit" 15
|
|
||||||
|
|
||||||
# Set umask so as not to create temps with too-generous modes.
|
|
||||||
# However, 'strip' requires both read and write access to temps.
|
|
||||||
case $mode in
|
|
||||||
# Optimize common cases.
|
|
||||||
*644) cp_umask=133;;
|
|
||||||
*755) cp_umask=22;;
|
|
||||||
|
|
||||||
*[0-7])
|
|
||||||
if test -z "$stripcmd"; then
|
|
||||||
u_plus_rw=
|
|
||||||
else
|
|
||||||
u_plus_rw='% 200'
|
|
||||||
fi
|
|
||||||
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
|
|
||||||
*)
|
|
||||||
if test -z "$stripcmd"; then
|
|
||||||
u_plus_rw=
|
|
||||||
else
|
|
||||||
u_plus_rw=,u+rw
|
|
||||||
fi
|
|
||||||
cp_umask=$mode$u_plus_rw;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
for src
|
|
||||||
do
|
|
||||||
# Protect names problematic for `test' and other utilities.
|
|
||||||
case $src in
|
|
||||||
-* | [=\(\)!]) src=./$src;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if test -n "$dir_arg"; then
|
|
||||||
dst=$src
|
|
||||||
dstdir=$dst
|
|
||||||
test -d "$dstdir"
|
|
||||||
dstdir_status=$?
|
|
||||||
else
|
|
||||||
|
|
||||||
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
|
|
||||||
# might cause directories to be created, which would be especially bad
|
|
||||||
# if $src (and thus $dsttmp) contains '*'.
|
|
||||||
if test ! -f "$src" && test ! -d "$src"; then
|
|
||||||
echo "$0: $src does not exist." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -z "$dst_arg"; then
|
|
||||||
echo "$0: no destination specified." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
dst=$dst_arg
|
|
||||||
|
|
||||||
# If destination is a directory, append the input filename; won't work
|
|
||||||
# if double slashes aren't ignored.
|
|
||||||
if test -d "$dst"; then
|
|
||||||
if test -n "$no_target_directory"; then
|
|
||||||
echo "$0: $dst_arg: Is a directory" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
dstdir=$dst
|
|
||||||
dst=$dstdir/`basename "$src"`
|
|
||||||
dstdir_status=0
|
|
||||||
else
|
|
||||||
# Prefer dirname, but fall back on a substitute if dirname fails.
|
|
||||||
dstdir=`
|
|
||||||
(dirname "$dst") 2>/dev/null ||
|
|
||||||
expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
||||||
X"$dst" : 'X\(//\)[^/]' \| \
|
|
||||||
X"$dst" : 'X\(//\)$' \| \
|
|
||||||
X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
|
|
||||||
echo X"$dst" |
|
|
||||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
||||||
s//\1/
|
|
||||||
q
|
|
||||||
}
|
|
||||||
/^X\(\/\/\)[^/].*/{
|
|
||||||
s//\1/
|
|
||||||
q
|
|
||||||
}
|
|
||||||
/^X\(\/\/\)$/{
|
|
||||||
s//\1/
|
|
||||||
q
|
|
||||||
}
|
|
||||||
/^X\(\/\).*/{
|
|
||||||
s//\1/
|
|
||||||
q
|
|
||||||
}
|
|
||||||
s/.*/./; q'
|
|
||||||
`
|
|
||||||
|
|
||||||
test -d "$dstdir"
|
|
||||||
dstdir_status=$?
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
obsolete_mkdir_used=false
|
|
||||||
|
|
||||||
if test $dstdir_status != 0; then
|
|
||||||
case $posix_mkdir in
|
|
||||||
'')
|
|
||||||
# Create intermediate dirs using mode 755 as modified by the umask.
|
|
||||||
# This is like FreeBSD 'install' as of 1997-10-28.
|
|
||||||
umask=`umask`
|
|
||||||
case $stripcmd.$umask in
|
|
||||||
# Optimize common cases.
|
|
||||||
*[2367][2367]) mkdir_umask=$umask;;
|
|
||||||
.*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
|
|
||||||
|
|
||||||
*[0-7])
|
|
||||||
mkdir_umask=`expr $umask + 22 \
|
|
||||||
- $umask % 100 % 40 + $umask % 20 \
|
|
||||||
- $umask % 10 % 4 + $umask % 2
|
|
||||||
`;;
|
|
||||||
*) mkdir_umask=$umask,go-w;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# With -d, create the new directory with the user-specified mode.
|
|
||||||
# Otherwise, rely on $mkdir_umask.
|
|
||||||
if test -n "$dir_arg"; then
|
|
||||||
mkdir_mode=-m$mode
|
|
||||||
else
|
|
||||||
mkdir_mode=
|
|
||||||
fi
|
|
||||||
|
|
||||||
posix_mkdir=false
|
|
||||||
case $umask in
|
|
||||||
*[123567][0-7][0-7])
|
|
||||||
# POSIX mkdir -p sets u+wx bits regardless of umask, which
|
|
||||||
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
|
|
||||||
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
|
|
||||||
|
|
||||||
if (umask $mkdir_umask &&
|
|
||||||
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
if test -z "$dir_arg" || {
|
|
||||||
# Check for POSIX incompatibilities with -m.
|
|
||||||
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
|
|
||||||
# other-writeable bit of parent directory when it shouldn't.
|
|
||||||
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
|
|
||||||
ls_ld_tmpdir=`ls -ld "$tmpdir"`
|
|
||||||
case $ls_ld_tmpdir in
|
|
||||||
d????-?r-*) different_mode=700;;
|
|
||||||
d????-?--*) different_mode=755;;
|
|
||||||
*) false;;
|
|
||||||
esac &&
|
|
||||||
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
|
|
||||||
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
|
|
||||||
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
then posix_mkdir=:
|
|
||||||
fi
|
|
||||||
rmdir "$tmpdir/d" "$tmpdir"
|
|
||||||
else
|
|
||||||
# Remove any dirs left behind by ancient mkdir implementations.
|
|
||||||
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
|
|
||||||
fi
|
|
||||||
trap '' 0;;
|
|
||||||
esac;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if
|
|
||||||
$posix_mkdir && (
|
|
||||||
umask $mkdir_umask &&
|
|
||||||
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
|
|
||||||
)
|
|
||||||
then :
|
|
||||||
else
|
|
||||||
|
|
||||||
# The umask is ridiculous, or mkdir does not conform to POSIX,
|
|
||||||
# or it failed possibly due to a race condition. Create the
|
|
||||||
# directory the slow way, step by step, checking for races as we go.
|
|
||||||
|
|
||||||
case $dstdir in
|
|
||||||
/*) prefix='/';;
|
|
||||||
[-=\(\)!]*) prefix='./';;
|
|
||||||
*) prefix='';;
|
|
||||||
esac
|
|
||||||
|
|
||||||
eval "$initialize_posix_glob"
|
|
||||||
|
|
||||||
oIFS=$IFS
|
|
||||||
IFS=/
|
|
||||||
$posix_glob set -f
|
|
||||||
set fnord $dstdir
|
|
||||||
shift
|
|
||||||
$posix_glob set +f
|
|
||||||
IFS=$oIFS
|
|
||||||
|
|
||||||
prefixes=
|
|
||||||
|
|
||||||
for d
|
|
||||||
do
|
|
||||||
test X"$d" = X && continue
|
|
||||||
|
|
||||||
prefix=$prefix$d
|
|
||||||
if test -d "$prefix"; then
|
|
||||||
prefixes=
|
|
||||||
else
|
|
||||||
if $posix_mkdir; then
|
|
||||||
(umask=$mkdir_umask &&
|
|
||||||
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
|
|
||||||
# Don't fail if two instances are running concurrently.
|
|
||||||
test -d "$prefix" || exit 1
|
|
||||||
else
|
|
||||||
case $prefix in
|
|
||||||
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
|
|
||||||
*) qprefix=$prefix;;
|
|
||||||
esac
|
|
||||||
prefixes="$prefixes '$qprefix'"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
prefix=$prefix/
|
|
||||||
done
|
|
||||||
|
|
||||||
if test -n "$prefixes"; then
|
|
||||||
# Don't fail if two instances are running concurrently.
|
|
||||||
(umask $mkdir_umask &&
|
|
||||||
eval "\$doit_exec \$mkdirprog $prefixes") ||
|
|
||||||
test -d "$dstdir" || exit 1
|
|
||||||
obsolete_mkdir_used=true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$dir_arg"; then
|
|
||||||
{ test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
|
|
||||||
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
|
|
||||||
{ test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
|
|
||||||
test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
|
|
||||||
else
|
|
||||||
|
|
||||||
# Make a couple of temp file names in the proper directory.
|
|
||||||
dsttmp=$dstdir/_inst.$$_
|
|
||||||
rmtmp=$dstdir/_rm.$$_
|
|
||||||
|
|
||||||
# Trap to clean up those temp files at exit.
|
|
||||||
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
|
|
||||||
|
|
||||||
# Copy the file name to the temp name.
|
|
||||||
(umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
|
|
||||||
|
|
||||||
# and set any options; do chmod last to preserve setuid bits.
|
|
||||||
#
|
|
||||||
# If any of these fail, we abort the whole thing. If we want to
|
|
||||||
# ignore errors from any of these, just make sure not to ignore
|
|
||||||
# errors from the above "$doit $cpprog $src $dsttmp" command.
|
|
||||||
#
|
|
||||||
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
|
|
||||||
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
|
|
||||||
{ test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
|
|
||||||
{ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
|
|
||||||
|
|
||||||
# If -C, don't bother to copy if it wouldn't change the file.
|
|
||||||
if $copy_on_change &&
|
|
||||||
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
|
|
||||||
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
|
|
||||||
|
|
||||||
eval "$initialize_posix_glob" &&
|
|
||||||
$posix_glob set -f &&
|
|
||||||
set X $old && old=:$2:$4:$5:$6 &&
|
|
||||||
set X $new && new=:$2:$4:$5:$6 &&
|
|
||||||
$posix_glob set +f &&
|
|
||||||
|
|
||||||
test "$old" = "$new" &&
|
|
||||||
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
rm -f "$dsttmp"
|
|
||||||
else
|
|
||||||
# Rename the file to the real destination.
|
|
||||||
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
|
|
||||||
|
|
||||||
# The rename failed, perhaps because mv can't rename something else
|
|
||||||
# to itself, or perhaps because mv is so ancient that it does not
|
|
||||||
# support -f.
|
|
||||||
{
|
|
||||||
# Now remove or move aside any old file at destination location.
|
|
||||||
# We try this two ways since rm can't unlink itself on some
|
|
||||||
# systems and the destination file might be busy for other
|
|
||||||
# reasons. In this case, the final cleanup might fail but the new
|
|
||||||
# file should still install successfully.
|
|
||||||
{
|
|
||||||
test ! -f "$dst" ||
|
|
||||||
$doit $rmcmd -f "$dst" 2>/dev/null ||
|
|
||||||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
|
|
||||||
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
|
|
||||||
} ||
|
|
||||||
{ echo "$0: cannot unlink or rename $dst" >&2
|
|
||||||
(exit 1); exit 1
|
|
||||||
}
|
|
||||||
} &&
|
|
||||||
|
|
||||||
# Now rename the file to the real destination.
|
|
||||||
$doit $mvcmd "$dsttmp" "$dst"
|
|
||||||
}
|
|
||||||
fi || exit 1
|
|
||||||
|
|
||||||
trap '' 0
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Local variables:
|
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
||||||
# time-stamp-start: "scriptversion="
|
|
||||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
||||||
# time-stamp-time-zone: "UTC"
|
|
||||||
# time-stamp-end: "; # UTC"
|
|
||||||
# End:
|
|
|
@ -1,20 +0,0 @@
|
||||||
# la_TYPE_UID_T
|
|
||||||
# -------------
|
|
||||||
AC_DEFUN([la_TYPE_UID_T],
|
|
||||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
||||||
AC_CACHE_CHECK(for uid_t in sys/types.h, la_cv_type_uid_t,
|
|
||||||
[AC_EGREP_HEADER(uid_t, sys/types.h,
|
|
||||||
la_cv_type_uid_t=yes, la_cv_type_uid_t=no)])
|
|
||||||
if test $la_cv_type_uid_t = no; then
|
|
||||||
case $host in
|
|
||||||
*mingw*) def_uid_t=short ;;
|
|
||||||
*) def_uid_t=int ;;
|
|
||||||
esac
|
|
||||||
AC_DEFINE_UNQUOTED(uid_t, [$def_uid_t],
|
|
||||||
[Define to match typeof st_uid field of struct stat if <sys/types.h> doesn't define.])
|
|
||||||
AC_DEFINE_UNQUOTED(gid_t, [$def_uid_t],
|
|
||||||
[Define to match typeof st_gid field of struct stat if <sys/types.h> doesn't define.])
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
AU_ALIAS([AC_TYPE_UID_T], [la_TYPE_UID_T])
|
|
||||||
|
|
|
@ -1,109 +0,0 @@
|
||||||
# lib-ld.m4 serial 5 (gettext-0.18.2)
|
|
||||||
dnl Copyright (C) 1996-2003, 2009-2011 Free Software Foundation, Inc.
|
|
||||||
dnl This file is free software; the Free Software Foundation
|
|
||||||
dnl gives unlimited permission to copy and/or distribute it,
|
|
||||||
dnl with or without modifications, as long as this notice is preserved.
|
|
||||||
|
|
||||||
dnl Subroutines of libtool.m4,
|
|
||||||
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
|
|
||||||
dnl with libtool.m4.
|
|
||||||
|
|
||||||
dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
|
|
||||||
AC_DEFUN([AC_LIB_PROG_LD_GNU],
|
|
||||||
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
|
|
||||||
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
|
||||||
case `$LD -v 2>&1 </dev/null` in
|
|
||||||
*GNU* | *'with BFD'*)
|
|
||||||
acl_cv_prog_gnu_ld=yes ;;
|
|
||||||
*)
|
|
||||||
acl_cv_prog_gnu_ld=no ;;
|
|
||||||
esac])
|
|
||||||
with_gnu_ld=$acl_cv_prog_gnu_ld
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl From libtool-1.4. Sets the variable LD.
|
|
||||||
AC_DEFUN([AC_LIB_PROG_LD],
|
|
||||||
[AC_ARG_WITH([gnu-ld],
|
|
||||||
[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
|
||||||
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
|
||||||
AC_REQUIRE([AC_PROG_CC])dnl
|
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
||||||
# Prepare PATH_SEPARATOR.
|
|
||||||
# The user is always right.
|
|
||||||
if test "${PATH_SEPARATOR+set}" != set; then
|
|
||||||
# Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
|
|
||||||
# contains only /bin. Note that ksh looks also at the FPATH variable,
|
|
||||||
# so we have to set that as well for the test.
|
|
||||||
PATH_SEPARATOR=:
|
|
||||||
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
|
|
||||||
&& { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
|
|
||||||
|| PATH_SEPARATOR=';'
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
ac_prog=ld
|
|
||||||
if test "$GCC" = yes; then
|
|
||||||
# Check if gcc -print-prog-name=ld gives a path.
|
|
||||||
AC_MSG_CHECKING([for ld used by GCC])
|
|
||||||
case $host in
|
|
||||||
*-*-mingw*)
|
|
||||||
# gcc leaves a trailing carriage return which upsets mingw
|
|
||||||
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
|
|
||||||
*)
|
|
||||||
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
|
|
||||||
esac
|
|
||||||
case $ac_prog in
|
|
||||||
# Accept absolute paths.
|
|
||||||
[[\\/]* | [A-Za-z]:[\\/]*)]
|
|
||||||
[re_direlt='/[^/][^/]*/\.\./']
|
|
||||||
# Canonicalize the path of ld
|
|
||||||
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
|
|
||||||
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
|
||||||
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
|
||||||
done
|
|
||||||
test -z "$LD" && LD="$ac_prog"
|
|
||||||
;;
|
|
||||||
"")
|
|
||||||
# If it fails, then pretend we aren't using GCC.
|
|
||||||
ac_prog=ld
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
# If it is relative, then search for the first ld in PATH.
|
|
||||||
with_gnu_ld=unknown
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
elif test "$with_gnu_ld" = yes; then
|
|
||||||
AC_MSG_CHECKING([for GNU ld])
|
|
||||||
else
|
|
||||||
AC_MSG_CHECKING([for non-GNU ld])
|
|
||||||
fi
|
|
||||||
AC_CACHE_VAL([acl_cv_path_LD],
|
|
||||||
[if test -z "$LD"; then
|
|
||||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
|
|
||||||
for ac_dir in $PATH; do
|
|
||||||
test -z "$ac_dir" && ac_dir=.
|
|
||||||
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
|
||||||
acl_cv_path_LD="$ac_dir/$ac_prog"
|
|
||||||
# Check to see if the program is GNU ld. I'd rather use --version,
|
|
||||||
# but apparently some GNU ld's only accept -v.
|
|
||||||
# Break only if it was the GNU/non-GNU ld that we prefer.
|
|
||||||
case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
|
|
||||||
*GNU* | *'with BFD'*)
|
|
||||||
test "$with_gnu_ld" != no && break ;;
|
|
||||||
*)
|
|
||||||
test "$with_gnu_ld" != yes && break ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
IFS="$ac_save_ifs"
|
|
||||||
else
|
|
||||||
acl_cv_path_LD="$LD" # Let the user override the test with a path.
|
|
||||||
fi])
|
|
||||||
LD="$acl_cv_path_LD"
|
|
||||||
if test -n "$LD"; then
|
|
||||||
AC_MSG_RESULT([$LD])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
fi
|
|
||||||
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
|
||||||
AC_LIB_PROG_LD_GNU
|
|
||||||
])
|
|
|
@ -1,777 +0,0 @@
|
||||||
# lib-link.m4 serial 26 (gettext-0.18.2)
|
|
||||||
dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.
|
|
||||||
dnl This file is free software; the Free Software Foundation
|
|
||||||
dnl gives unlimited permission to copy and/or distribute it,
|
|
||||||
dnl with or without modifications, as long as this notice is preserved.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
|
||||||
|
|
||||||
AC_PREREQ([2.54])
|
|
||||||
|
|
||||||
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
|
|
||||||
dnl the libraries corresponding to explicit and implicit dependencies.
|
|
||||||
dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
|
|
||||||
dnl augments the CPPFLAGS variable.
|
|
||||||
dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
|
|
||||||
dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
|
|
||||||
AC_DEFUN([AC_LIB_LINKFLAGS],
|
|
||||||
[
|
|
||||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
||||||
AC_REQUIRE([AC_LIB_RPATH])
|
|
||||||
pushdef([Name],[m4_translit([$1],[./+-], [____])])
|
|
||||||
pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
|
|
||||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
|
|
||||||
AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
|
|
||||||
AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
|
||||||
ac_cv_lib[]Name[]_libs="$LIB[]NAME"
|
|
||||||
ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
|
|
||||||
ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
|
|
||||||
ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
|
|
||||||
])
|
|
||||||
LIB[]NAME="$ac_cv_lib[]Name[]_libs"
|
|
||||||
LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
|
|
||||||
INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
|
|
||||||
LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
|
|
||||||
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
|
|
||||||
AC_SUBST([LIB]NAME)
|
|
||||||
AC_SUBST([LTLIB]NAME)
|
|
||||||
AC_SUBST([LIB]NAME[_PREFIX])
|
|
||||||
dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
|
|
||||||
dnl results of this search when this library appears as a dependency.
|
|
||||||
HAVE_LIB[]NAME=yes
|
|
||||||
popdef([NAME])
|
|
||||||
popdef([Name])
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
|
|
||||||
dnl searches for libname and the libraries corresponding to explicit and
|
|
||||||
dnl implicit dependencies, together with the specified include files and
|
|
||||||
dnl the ability to compile and link the specified testcode. The missing-message
|
|
||||||
dnl defaults to 'no' and may contain additional hints for the user.
|
|
||||||
dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
|
|
||||||
dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
|
|
||||||
dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
|
|
||||||
dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
|
|
||||||
dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
|
|
||||||
dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
|
|
||||||
AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
|
|
||||||
[
|
|
||||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
||||||
AC_REQUIRE([AC_LIB_RPATH])
|
|
||||||
pushdef([Name],[m4_translit([$1],[./+-], [____])])
|
|
||||||
pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
|
|
||||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
|
|
||||||
|
|
||||||
dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
|
|
||||||
dnl accordingly.
|
|
||||||
AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
|
||||||
|
|
||||||
dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
|
|
||||||
dnl because if the user has installed lib[]Name and not disabled its use
|
|
||||||
dnl via --without-lib[]Name-prefix, he wants to use it.
|
|
||||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
|
||||||
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
|
|
||||||
|
|
||||||
AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
|
|
||||||
ac_save_LIBS="$LIBS"
|
|
||||||
dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
|
|
||||||
dnl because these -l options might require -L options that are present in
|
|
||||||
dnl LIBS. -l options benefit only from the -L options listed before it.
|
|
||||||
dnl Otherwise, add it to the front of LIBS, because it may be a static
|
|
||||||
dnl library that depends on another static library that is present in LIBS.
|
|
||||||
dnl Static libraries benefit only from the static libraries listed after
|
|
||||||
dnl it.
|
|
||||||
case " $LIB[]NAME" in
|
|
||||||
*" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
|
|
||||||
*) LIBS="$LIB[]NAME $LIBS" ;;
|
|
||||||
esac
|
|
||||||
AC_LINK_IFELSE(
|
|
||||||
[AC_LANG_PROGRAM([[$3]], [[$4]])],
|
|
||||||
[ac_cv_lib[]Name=yes],
|
|
||||||
[ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
|
|
||||||
LIBS="$ac_save_LIBS"
|
|
||||||
])
|
|
||||||
if test "$ac_cv_lib[]Name" = yes; then
|
|
||||||
HAVE_LIB[]NAME=yes
|
|
||||||
AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
|
|
||||||
AC_MSG_CHECKING([how to link with lib[]$1])
|
|
||||||
AC_MSG_RESULT([$LIB[]NAME])
|
|
||||||
else
|
|
||||||
HAVE_LIB[]NAME=no
|
|
||||||
dnl If $LIB[]NAME didn't lead to a usable library, we don't need
|
|
||||||
dnl $INC[]NAME either.
|
|
||||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
|
||||||
LIB[]NAME=
|
|
||||||
LTLIB[]NAME=
|
|
||||||
LIB[]NAME[]_PREFIX=
|
|
||||||
fi
|
|
||||||
AC_SUBST([HAVE_LIB]NAME)
|
|
||||||
AC_SUBST([LIB]NAME)
|
|
||||||
AC_SUBST([LTLIB]NAME)
|
|
||||||
AC_SUBST([LIB]NAME[_PREFIX])
|
|
||||||
popdef([NAME])
|
|
||||||
popdef([Name])
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl Determine the platform dependent parameters needed to use rpath:
|
|
||||||
dnl acl_libext,
|
|
||||||
dnl acl_shlibext,
|
|
||||||
dnl acl_libname_spec,
|
|
||||||
dnl acl_library_names_spec,
|
|
||||||
dnl acl_hardcode_libdir_flag_spec,
|
|
||||||
dnl acl_hardcode_libdir_separator,
|
|
||||||
dnl acl_hardcode_direct,
|
|
||||||
dnl acl_hardcode_minus_L.
|
|
||||||
AC_DEFUN([AC_LIB_RPATH],
|
|
||||||
[
|
|
||||||
dnl Tell automake >= 1.10 to complain if config.rpath is missing.
|
|
||||||
m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
|
|
||||||
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
|
|
||||||
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
|
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
|
|
||||||
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
|
|
||||||
AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
|
|
||||||
CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
|
|
||||||
${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
|
|
||||||
. ./conftest.sh
|
|
||||||
rm -f ./conftest.sh
|
|
||||||
acl_cv_rpath=done
|
|
||||||
])
|
|
||||||
wl="$acl_cv_wl"
|
|
||||||
acl_libext="$acl_cv_libext"
|
|
||||||
acl_shlibext="$acl_cv_shlibext"
|
|
||||||
acl_libname_spec="$acl_cv_libname_spec"
|
|
||||||
acl_library_names_spec="$acl_cv_library_names_spec"
|
|
||||||
acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
|
|
||||||
acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
|
|
||||||
acl_hardcode_direct="$acl_cv_hardcode_direct"
|
|
||||||
acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
|
|
||||||
dnl Determine whether the user wants rpath handling at all.
|
|
||||||
AC_ARG_ENABLE([rpath],
|
|
||||||
[ --disable-rpath do not hardcode runtime library paths],
|
|
||||||
:, enable_rpath=yes)
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl AC_LIB_FROMPACKAGE(name, package)
|
|
||||||
dnl declares that libname comes from the given package. The configure file
|
|
||||||
dnl will then not have a --with-libname-prefix option but a
|
|
||||||
dnl --with-package-prefix option. Several libraries can come from the same
|
|
||||||
dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
|
|
||||||
dnl macro call that searches for libname.
|
|
||||||
AC_DEFUN([AC_LIB_FROMPACKAGE],
|
|
||||||
[
|
|
||||||
pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
|
|
||||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
|
|
||||||
define([acl_frompackage_]NAME, [$2])
|
|
||||||
popdef([NAME])
|
|
||||||
pushdef([PACK],[$2])
|
|
||||||
pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
|
|
||||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
|
|
||||||
define([acl_libsinpackage_]PACKUP,
|
|
||||||
m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
|
|
||||||
popdef([PACKUP])
|
|
||||||
popdef([PACK])
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
|
|
||||||
dnl the libraries corresponding to explicit and implicit dependencies.
|
|
||||||
dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
|
|
||||||
dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
|
|
||||||
dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
|
|
||||||
AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
|
||||||
[
|
|
||||||
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
|
|
||||||
pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
|
|
||||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
|
|
||||||
pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
|
|
||||||
pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
|
|
||||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
|
|
||||||
pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
|
|
||||||
dnl Autoconf >= 2.61 supports dots in --with options.
|
|
||||||
pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
|
|
||||||
dnl By default, look in $includedir and $libdir.
|
|
||||||
use_additional=yes
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([
|
|
||||||
eval additional_includedir=\"$includedir\"
|
|
||||||
eval additional_libdir=\"$libdir\"
|
|
||||||
])
|
|
||||||
AC_ARG_WITH(P_A_C_K[-prefix],
|
|
||||||
[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
|
|
||||||
--without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
|
|
||||||
[
|
|
||||||
if test "X$withval" = "Xno"; then
|
|
||||||
use_additional=no
|
|
||||||
else
|
|
||||||
if test "X$withval" = "X"; then
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([
|
|
||||||
eval additional_includedir=\"$includedir\"
|
|
||||||
eval additional_libdir=\"$libdir\"
|
|
||||||
])
|
|
||||||
else
|
|
||||||
additional_includedir="$withval/include"
|
|
||||||
additional_libdir="$withval/$acl_libdirstem"
|
|
||||||
if test "$acl_libdirstem2" != "$acl_libdirstem" \
|
|
||||||
&& ! test -d "$withval/$acl_libdirstem"; then
|
|
||||||
additional_libdir="$withval/$acl_libdirstem2"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
dnl Search the library and its dependencies in $additional_libdir and
|
|
||||||
dnl $LDFLAGS. Using breadth-first-seach.
|
|
||||||
LIB[]NAME=
|
|
||||||
LTLIB[]NAME=
|
|
||||||
INC[]NAME=
|
|
||||||
LIB[]NAME[]_PREFIX=
|
|
||||||
dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
|
|
||||||
dnl computed. So it has to be reset here.
|
|
||||||
HAVE_LIB[]NAME=
|
|
||||||
rpathdirs=
|
|
||||||
ltrpathdirs=
|
|
||||||
names_already_handled=
|
|
||||||
names_next_round='$1 $2'
|
|
||||||
while test -n "$names_next_round"; do
|
|
||||||
names_this_round="$names_next_round"
|
|
||||||
names_next_round=
|
|
||||||
for name in $names_this_round; do
|
|
||||||
already_handled=
|
|
||||||
for n in $names_already_handled; do
|
|
||||||
if test "$n" = "$name"; then
|
|
||||||
already_handled=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$already_handled"; then
|
|
||||||
names_already_handled="$names_already_handled $name"
|
|
||||||
dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
|
|
||||||
dnl or AC_LIB_HAVE_LINKFLAGS call.
|
|
||||||
uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
|
|
||||||
eval value=\"\$HAVE_LIB$uppername\"
|
|
||||||
if test -n "$value"; then
|
|
||||||
if test "$value" = yes; then
|
|
||||||
eval value=\"\$LIB$uppername\"
|
|
||||||
test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
|
|
||||||
eval value=\"\$LTLIB$uppername\"
|
|
||||||
test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
|
|
||||||
else
|
|
||||||
dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
|
|
||||||
dnl that this library doesn't exist. So just drop it.
|
|
||||||
:
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
dnl Search the library lib$name in $additional_libdir and $LDFLAGS
|
|
||||||
dnl and the already constructed $LIBNAME/$LTLIBNAME.
|
|
||||||
found_dir=
|
|
||||||
found_la=
|
|
||||||
found_so=
|
|
||||||
found_a=
|
|
||||||
eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
|
|
||||||
if test -n "$acl_shlibext"; then
|
|
||||||
shrext=".$acl_shlibext" # typically: shrext=.so
|
|
||||||
else
|
|
||||||
shrext=
|
|
||||||
fi
|
|
||||||
if test $use_additional = yes; then
|
|
||||||
dir="$additional_libdir"
|
|
||||||
dnl The same code as in the loop below:
|
|
||||||
dnl First look for a shared library.
|
|
||||||
if test -n "$acl_shlibext"; then
|
|
||||||
if test -f "$dir/$libname$shrext"; then
|
|
||||||
found_dir="$dir"
|
|
||||||
found_so="$dir/$libname$shrext"
|
|
||||||
else
|
|
||||||
if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
|
|
||||||
ver=`(cd "$dir" && \
|
|
||||||
for f in "$libname$shrext".*; do echo "$f"; done \
|
|
||||||
| sed -e "s,^$libname$shrext\\\\.,," \
|
|
||||||
| sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
|
|
||||||
| sed 1q ) 2>/dev/null`
|
|
||||||
if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
|
|
||||||
found_dir="$dir"
|
|
||||||
found_so="$dir/$libname$shrext.$ver"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
eval library_names=\"$acl_library_names_spec\"
|
|
||||||
for f in $library_names; do
|
|
||||||
if test -f "$dir/$f"; then
|
|
||||||
found_dir="$dir"
|
|
||||||
found_so="$dir/$f"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
dnl Then look for a static library.
|
|
||||||
if test "X$found_dir" = "X"; then
|
|
||||||
if test -f "$dir/$libname.$acl_libext"; then
|
|
||||||
found_dir="$dir"
|
|
||||||
found_a="$dir/$libname.$acl_libext"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "X$found_dir" != "X"; then
|
|
||||||
if test -f "$dir/$libname.la"; then
|
|
||||||
found_la="$dir/$libname.la"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "X$found_dir" = "X"; then
|
|
||||||
for x in $LDFLAGS $LTLIB[]NAME; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
case "$x" in
|
|
||||||
-L*)
|
|
||||||
dir=`echo "X$x" | sed -e 's/^X-L//'`
|
|
||||||
dnl First look for a shared library.
|
|
||||||
if test -n "$acl_shlibext"; then
|
|
||||||
if test -f "$dir/$libname$shrext"; then
|
|
||||||
found_dir="$dir"
|
|
||||||
found_so="$dir/$libname$shrext"
|
|
||||||
else
|
|
||||||
if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
|
|
||||||
ver=`(cd "$dir" && \
|
|
||||||
for f in "$libname$shrext".*; do echo "$f"; done \
|
|
||||||
| sed -e "s,^$libname$shrext\\\\.,," \
|
|
||||||
| sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
|
|
||||||
| sed 1q ) 2>/dev/null`
|
|
||||||
if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
|
|
||||||
found_dir="$dir"
|
|
||||||
found_so="$dir/$libname$shrext.$ver"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
eval library_names=\"$acl_library_names_spec\"
|
|
||||||
for f in $library_names; do
|
|
||||||
if test -f "$dir/$f"; then
|
|
||||||
found_dir="$dir"
|
|
||||||
found_so="$dir/$f"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
dnl Then look for a static library.
|
|
||||||
if test "X$found_dir" = "X"; then
|
|
||||||
if test -f "$dir/$libname.$acl_libext"; then
|
|
||||||
found_dir="$dir"
|
|
||||||
found_a="$dir/$libname.$acl_libext"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "X$found_dir" != "X"; then
|
|
||||||
if test -f "$dir/$libname.la"; then
|
|
||||||
found_la="$dir/$libname.la"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
if test "X$found_dir" != "X"; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
if test "X$found_dir" != "X"; then
|
|
||||||
dnl Found the library.
|
|
||||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
|
|
||||||
if test "X$found_so" != "X"; then
|
|
||||||
dnl Linking with a shared library. We attempt to hardcode its
|
|
||||||
dnl directory into the executable's runpath, unless it's the
|
|
||||||
dnl standard /usr/lib.
|
|
||||||
if test "$enable_rpath" = no \
|
|
||||||
|| test "X$found_dir" = "X/usr/$acl_libdirstem" \
|
|
||||||
|| test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
|
|
||||||
dnl No hardcoding is needed.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
||||||
else
|
|
||||||
dnl Use an explicit option to hardcode DIR into the resulting
|
|
||||||
dnl binary.
|
|
||||||
dnl Potentially add DIR to ltrpathdirs.
|
|
||||||
dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
|
|
||||||
haveit=
|
|
||||||
for x in $ltrpathdirs; do
|
|
||||||
if test "X$x" = "X$found_dir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
ltrpathdirs="$ltrpathdirs $found_dir"
|
|
||||||
fi
|
|
||||||
dnl The hardcoding into $LIBNAME is system dependent.
|
|
||||||
if test "$acl_hardcode_direct" = yes; then
|
|
||||||
dnl Using DIR/libNAME.so during linking hardcodes DIR into the
|
|
||||||
dnl resulting binary.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
||||||
else
|
|
||||||
if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
|
|
||||||
dnl Use an explicit option to hardcode DIR into the resulting
|
|
||||||
dnl binary.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
||||||
dnl Potentially add DIR to rpathdirs.
|
|
||||||
dnl The rpathdirs will be appended to $LIBNAME at the end.
|
|
||||||
haveit=
|
|
||||||
for x in $rpathdirs; do
|
|
||||||
if test "X$x" = "X$found_dir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
rpathdirs="$rpathdirs $found_dir"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
dnl Rely on "-L$found_dir".
|
|
||||||
dnl But don't add it if it's already contained in the LDFLAGS
|
|
||||||
dnl or the already constructed $LIBNAME
|
|
||||||
haveit=
|
|
||||||
for x in $LDFLAGS $LIB[]NAME; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X-L$found_dir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
|
|
||||||
fi
|
|
||||||
if test "$acl_hardcode_minus_L" != no; then
|
|
||||||
dnl FIXME: Not sure whether we should use
|
|
||||||
dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
|
|
||||||
dnl here.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
|
||||||
else
|
|
||||||
dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
|
|
||||||
dnl here, because this doesn't fit in flags passed to the
|
|
||||||
dnl compiler. So give up. No hardcoding. This affects only
|
|
||||||
dnl very old systems.
|
|
||||||
dnl FIXME: Not sure whether we should use
|
|
||||||
dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
|
|
||||||
dnl here.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if test "X$found_a" != "X"; then
|
|
||||||
dnl Linking with a static library.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
|
|
||||||
else
|
|
||||||
dnl We shouldn't come here, but anyway it's good to have a
|
|
||||||
dnl fallback.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
dnl Assume the include files are nearby.
|
|
||||||
additional_includedir=
|
|
||||||
case "$found_dir" in
|
|
||||||
*/$acl_libdirstem | */$acl_libdirstem/)
|
|
||||||
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
|
|
||||||
if test "$name" = '$1'; then
|
|
||||||
LIB[]NAME[]_PREFIX="$basedir"
|
|
||||||
fi
|
|
||||||
additional_includedir="$basedir/include"
|
|
||||||
;;
|
|
||||||
*/$acl_libdirstem2 | */$acl_libdirstem2/)
|
|
||||||
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
|
|
||||||
if test "$name" = '$1'; then
|
|
||||||
LIB[]NAME[]_PREFIX="$basedir"
|
|
||||||
fi
|
|
||||||
additional_includedir="$basedir/include"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
if test "X$additional_includedir" != "X"; then
|
|
||||||
dnl Potentially add $additional_includedir to $INCNAME.
|
|
||||||
dnl But don't add it
|
|
||||||
dnl 1. if it's the standard /usr/include,
|
|
||||||
dnl 2. if it's /usr/local/include and we are using GCC on Linux,
|
|
||||||
dnl 3. if it's already present in $CPPFLAGS or the already
|
|
||||||
dnl constructed $INCNAME,
|
|
||||||
dnl 4. if it doesn't exist as a directory.
|
|
||||||
if test "X$additional_includedir" != "X/usr/include"; then
|
|
||||||
haveit=
|
|
||||||
if test "X$additional_includedir" = "X/usr/local/include"; then
|
|
||||||
if test -n "$GCC"; then
|
|
||||||
case $host_os in
|
|
||||||
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
for x in $CPPFLAGS $INC[]NAME; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X-I$additional_includedir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test -d "$additional_includedir"; then
|
|
||||||
dnl Really add $additional_includedir to $INCNAME.
|
|
||||||
INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
dnl Look for dependencies.
|
|
||||||
if test -n "$found_la"; then
|
|
||||||
dnl Read the .la file. It defines the variables
|
|
||||||
dnl dlname, library_names, old_library, dependency_libs, current,
|
|
||||||
dnl age, revision, installed, dlopen, dlpreopen, libdir.
|
|
||||||
save_libdir="$libdir"
|
|
||||||
case "$found_la" in
|
|
||||||
*/* | *\\*) . "$found_la" ;;
|
|
||||||
*) . "./$found_la" ;;
|
|
||||||
esac
|
|
||||||
libdir="$save_libdir"
|
|
||||||
dnl We use only dependency_libs.
|
|
||||||
for dep in $dependency_libs; do
|
|
||||||
case "$dep" in
|
|
||||||
-L*)
|
|
||||||
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
|
|
||||||
dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
|
|
||||||
dnl But don't add it
|
|
||||||
dnl 1. if it's the standard /usr/lib,
|
|
||||||
dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
|
|
||||||
dnl 3. if it's already present in $LDFLAGS or the already
|
|
||||||
dnl constructed $LIBNAME,
|
|
||||||
dnl 4. if it doesn't exist as a directory.
|
|
||||||
if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
|
|
||||||
&& test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
|
|
||||||
haveit=
|
|
||||||
if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
|
|
||||||
|| test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
|
|
||||||
if test -n "$GCC"; then
|
|
||||||
case $host_os in
|
|
||||||
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
haveit=
|
|
||||||
for x in $LDFLAGS $LIB[]NAME; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X-L$additional_libdir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test -d "$additional_libdir"; then
|
|
||||||
dnl Really add $additional_libdir to $LIBNAME.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
haveit=
|
|
||||||
for x in $LDFLAGS $LTLIB[]NAME; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X-L$additional_libdir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test -d "$additional_libdir"; then
|
|
||||||
dnl Really add $additional_libdir to $LTLIBNAME.
|
|
||||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
-R*)
|
|
||||||
dir=`echo "X$dep" | sed -e 's/^X-R//'`
|
|
||||||
if test "$enable_rpath" != no; then
|
|
||||||
dnl Potentially add DIR to rpathdirs.
|
|
||||||
dnl The rpathdirs will be appended to $LIBNAME at the end.
|
|
||||||
haveit=
|
|
||||||
for x in $rpathdirs; do
|
|
||||||
if test "X$x" = "X$dir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
rpathdirs="$rpathdirs $dir"
|
|
||||||
fi
|
|
||||||
dnl Potentially add DIR to ltrpathdirs.
|
|
||||||
dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
|
|
||||||
haveit=
|
|
||||||
for x in $ltrpathdirs; do
|
|
||||||
if test "X$x" = "X$dir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
ltrpathdirs="$ltrpathdirs $dir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
-l*)
|
|
||||||
dnl Handle this in the next round.
|
|
||||||
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
|
|
||||||
;;
|
|
||||||
*.la)
|
|
||||||
dnl Handle this in the next round. Throw away the .la's
|
|
||||||
dnl directory; it is already contained in a preceding -L
|
|
||||||
dnl option.
|
|
||||||
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
dnl Most likely an immediate library name.
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
|
|
||||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
dnl Didn't find the library; assume it is in the system directories
|
|
||||||
dnl known to the linker and runtime loader. (All the system
|
|
||||||
dnl directories known to the linker should also be known to the
|
|
||||||
dnl runtime loader, otherwise the system is severely misconfigured.)
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
|
|
||||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
if test "X$rpathdirs" != "X"; then
|
|
||||||
if test -n "$acl_hardcode_libdir_separator"; then
|
|
||||||
dnl Weird platform: only the last -rpath option counts, the user must
|
|
||||||
dnl pass all path elements in one option. We can arrange that for a
|
|
||||||
dnl single library, but not when more than one $LIBNAMEs are used.
|
|
||||||
alldirs=
|
|
||||||
for found_dir in $rpathdirs; do
|
|
||||||
alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
|
|
||||||
done
|
|
||||||
dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
|
|
||||||
acl_save_libdir="$libdir"
|
|
||||||
libdir="$alldirs"
|
|
||||||
eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
|
||||||
libdir="$acl_save_libdir"
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
|
|
||||||
else
|
|
||||||
dnl The -rpath options are cumulative.
|
|
||||||
for found_dir in $rpathdirs; do
|
|
||||||
acl_save_libdir="$libdir"
|
|
||||||
libdir="$found_dir"
|
|
||||||
eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
|
||||||
libdir="$acl_save_libdir"
|
|
||||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "X$ltrpathdirs" != "X"; then
|
|
||||||
dnl When using libtool, the option that works for both libraries and
|
|
||||||
dnl executables is -R. The -R options are cumulative.
|
|
||||||
for found_dir in $ltrpathdirs; do
|
|
||||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
popdef([P_A_C_K])
|
|
||||||
popdef([PACKLIBS])
|
|
||||||
popdef([PACKUP])
|
|
||||||
popdef([PACK])
|
|
||||||
popdef([NAME])
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
|
|
||||||
dnl unless already present in VAR.
|
|
||||||
dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
|
|
||||||
dnl contains two or three consecutive elements that belong together.
|
|
||||||
AC_DEFUN([AC_LIB_APPENDTOVAR],
|
|
||||||
[
|
|
||||||
for element in [$2]; do
|
|
||||||
haveit=
|
|
||||||
for x in $[$1]; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X$element"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
[$1]="${[$1]}${[$1]:+ }$element"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl For those cases where a variable contains several -L and -l options
|
|
||||||
dnl referring to unknown libraries and directories, this macro determines the
|
|
||||||
dnl necessary additional linker options for the runtime path.
|
|
||||||
dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
|
|
||||||
dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
|
|
||||||
dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
|
|
||||||
dnl otherwise linking without libtool is assumed.
|
|
||||||
AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
|
|
||||||
[
|
|
||||||
AC_REQUIRE([AC_LIB_RPATH])
|
|
||||||
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
|
|
||||||
$1=
|
|
||||||
if test "$enable_rpath" != no; then
|
|
||||||
if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
|
|
||||||
dnl Use an explicit option to hardcode directories into the resulting
|
|
||||||
dnl binary.
|
|
||||||
rpathdirs=
|
|
||||||
next=
|
|
||||||
for opt in $2; do
|
|
||||||
if test -n "$next"; then
|
|
||||||
dir="$next"
|
|
||||||
dnl No need to hardcode the standard /usr/lib.
|
|
||||||
if test "X$dir" != "X/usr/$acl_libdirstem" \
|
|
||||||
&& test "X$dir" != "X/usr/$acl_libdirstem2"; then
|
|
||||||
rpathdirs="$rpathdirs $dir"
|
|
||||||
fi
|
|
||||||
next=
|
|
||||||
else
|
|
||||||
case $opt in
|
|
||||||
-L) next=yes ;;
|
|
||||||
-L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
|
|
||||||
dnl No need to hardcode the standard /usr/lib.
|
|
||||||
if test "X$dir" != "X/usr/$acl_libdirstem" \
|
|
||||||
&& test "X$dir" != "X/usr/$acl_libdirstem2"; then
|
|
||||||
rpathdirs="$rpathdirs $dir"
|
|
||||||
fi
|
|
||||||
next= ;;
|
|
||||||
*) next= ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test "X$rpathdirs" != "X"; then
|
|
||||||
if test -n ""$3""; then
|
|
||||||
dnl libtool is used for linking. Use -R options.
|
|
||||||
for dir in $rpathdirs; do
|
|
||||||
$1="${$1}${$1:+ }-R$dir"
|
|
||||||
done
|
|
||||||
else
|
|
||||||
dnl The linker is used for linking directly.
|
|
||||||
if test -n "$acl_hardcode_libdir_separator"; then
|
|
||||||
dnl Weird platform: only the last -rpath option counts, the user
|
|
||||||
dnl must pass all path elements in one option.
|
|
||||||
alldirs=
|
|
||||||
for dir in $rpathdirs; do
|
|
||||||
alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
|
|
||||||
done
|
|
||||||
acl_save_libdir="$libdir"
|
|
||||||
libdir="$alldirs"
|
|
||||||
eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
|
||||||
libdir="$acl_save_libdir"
|
|
||||||
$1="$flag"
|
|
||||||
else
|
|
||||||
dnl The -rpath options are cumulative.
|
|
||||||
for dir in $rpathdirs; do
|
|
||||||
acl_save_libdir="$libdir"
|
|
||||||
libdir="$dir"
|
|
||||||
eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
|
||||||
libdir="$acl_save_libdir"
|
|
||||||
$1="${$1}${$1:+ }$flag"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
AC_SUBST([$1])
|
|
||||||
])
|
|
|
@ -1,224 +0,0 @@
|
||||||
# lib-prefix.m4 serial 7 (gettext-0.18)
|
|
||||||
dnl Copyright (C) 2001-2005, 2008-2011 Free Software Foundation, Inc.
|
|
||||||
dnl This file is free software; the Free Software Foundation
|
|
||||||
dnl gives unlimited permission to copy and/or distribute it,
|
|
||||||
dnl with or without modifications, as long as this notice is preserved.
|
|
||||||
|
|
||||||
dnl From Bruno Haible.
|
|
||||||
|
|
||||||
dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
|
|
||||||
dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
|
|
||||||
dnl require excessive bracketing.
|
|
||||||
ifdef([AC_HELP_STRING],
|
|
||||||
[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
|
|
||||||
[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
|
|
||||||
|
|
||||||
dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
|
|
||||||
dnl to access previously installed libraries. The basic assumption is that
|
|
||||||
dnl a user will want packages to use other packages he previously installed
|
|
||||||
dnl with the same --prefix option.
|
|
||||||
dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
|
|
||||||
dnl libraries, but is otherwise very convenient.
|
|
||||||
AC_DEFUN([AC_LIB_PREFIX],
|
|
||||||
[
|
|
||||||
AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
|
|
||||||
AC_REQUIRE([AC_PROG_CC])
|
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
|
||||||
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
|
|
||||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
|
||||||
dnl By default, look in $includedir and $libdir.
|
|
||||||
use_additional=yes
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([
|
|
||||||
eval additional_includedir=\"$includedir\"
|
|
||||||
eval additional_libdir=\"$libdir\"
|
|
||||||
])
|
|
||||||
AC_LIB_ARG_WITH([lib-prefix],
|
|
||||||
[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
|
|
||||||
--without-lib-prefix don't search for libraries in includedir and libdir],
|
|
||||||
[
|
|
||||||
if test "X$withval" = "Xno"; then
|
|
||||||
use_additional=no
|
|
||||||
else
|
|
||||||
if test "X$withval" = "X"; then
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([
|
|
||||||
eval additional_includedir=\"$includedir\"
|
|
||||||
eval additional_libdir=\"$libdir\"
|
|
||||||
])
|
|
||||||
else
|
|
||||||
additional_includedir="$withval/include"
|
|
||||||
additional_libdir="$withval/$acl_libdirstem"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
if test $use_additional = yes; then
|
|
||||||
dnl Potentially add $additional_includedir to $CPPFLAGS.
|
|
||||||
dnl But don't add it
|
|
||||||
dnl 1. if it's the standard /usr/include,
|
|
||||||
dnl 2. if it's already present in $CPPFLAGS,
|
|
||||||
dnl 3. if it's /usr/local/include and we are using GCC on Linux,
|
|
||||||
dnl 4. if it doesn't exist as a directory.
|
|
||||||
if test "X$additional_includedir" != "X/usr/include"; then
|
|
||||||
haveit=
|
|
||||||
for x in $CPPFLAGS; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X-I$additional_includedir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test "X$additional_includedir" = "X/usr/local/include"; then
|
|
||||||
if test -n "$GCC"; then
|
|
||||||
case $host_os in
|
|
||||||
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test -d "$additional_includedir"; then
|
|
||||||
dnl Really add $additional_includedir to $CPPFLAGS.
|
|
||||||
CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
dnl Potentially add $additional_libdir to $LDFLAGS.
|
|
||||||
dnl But don't add it
|
|
||||||
dnl 1. if it's the standard /usr/lib,
|
|
||||||
dnl 2. if it's already present in $LDFLAGS,
|
|
||||||
dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
|
|
||||||
dnl 4. if it doesn't exist as a directory.
|
|
||||||
if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
|
|
||||||
haveit=
|
|
||||||
for x in $LDFLAGS; do
|
|
||||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
|
||||||
if test "X$x" = "X-L$additional_libdir"; then
|
|
||||||
haveit=yes
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
|
|
||||||
if test -n "$GCC"; then
|
|
||||||
case $host_os in
|
|
||||||
linux*) haveit=yes;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -z "$haveit"; then
|
|
||||||
if test -d "$additional_libdir"; then
|
|
||||||
dnl Really add $additional_libdir to $LDFLAGS.
|
|
||||||
LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
|
|
||||||
dnl acl_final_exec_prefix, containing the values to which $prefix and
|
|
||||||
dnl $exec_prefix will expand at the end of the configure script.
|
|
||||||
AC_DEFUN([AC_LIB_PREPARE_PREFIX],
|
|
||||||
[
|
|
||||||
dnl Unfortunately, prefix and exec_prefix get only finally determined
|
|
||||||
dnl at the end of configure.
|
|
||||||
if test "X$prefix" = "XNONE"; then
|
|
||||||
acl_final_prefix="$ac_default_prefix"
|
|
||||||
else
|
|
||||||
acl_final_prefix="$prefix"
|
|
||||||
fi
|
|
||||||
if test "X$exec_prefix" = "XNONE"; then
|
|
||||||
acl_final_exec_prefix='${prefix}'
|
|
||||||
else
|
|
||||||
acl_final_exec_prefix="$exec_prefix"
|
|
||||||
fi
|
|
||||||
acl_save_prefix="$prefix"
|
|
||||||
prefix="$acl_final_prefix"
|
|
||||||
eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
|
|
||||||
prefix="$acl_save_prefix"
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
|
|
||||||
dnl variables prefix and exec_prefix bound to the values they will have
|
|
||||||
dnl at the end of the configure script.
|
|
||||||
AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
|
|
||||||
[
|
|
||||||
acl_save_prefix="$prefix"
|
|
||||||
prefix="$acl_final_prefix"
|
|
||||||
acl_save_exec_prefix="$exec_prefix"
|
|
||||||
exec_prefix="$acl_final_exec_prefix"
|
|
||||||
$1
|
|
||||||
exec_prefix="$acl_save_exec_prefix"
|
|
||||||
prefix="$acl_save_prefix"
|
|
||||||
])
|
|
||||||
|
|
||||||
dnl AC_LIB_PREPARE_MULTILIB creates
|
|
||||||
dnl - a variable acl_libdirstem, containing the basename of the libdir, either
|
|
||||||
dnl "lib" or "lib64" or "lib/64",
|
|
||||||
dnl - a variable acl_libdirstem2, as a secondary possible value for
|
|
||||||
dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
|
|
||||||
dnl "lib/amd64".
|
|
||||||
AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
|
|
||||||
[
|
|
||||||
dnl There is no formal standard regarding lib and lib64.
|
|
||||||
dnl On glibc systems, the current practice is that on a system supporting
|
|
||||||
dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
|
|
||||||
dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
|
|
||||||
dnl the compiler's default mode by looking at the compiler's library search
|
|
||||||
dnl path. If at least one of its elements ends in /lib64 or points to a
|
|
||||||
dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
|
|
||||||
dnl Otherwise we use the default, namely "lib".
|
|
||||||
dnl On Solaris systems, the current practice is that on a system supporting
|
|
||||||
dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
|
|
||||||
dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
|
|
||||||
dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
|
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
|
||||||
acl_libdirstem=lib
|
|
||||||
acl_libdirstem2=
|
|
||||||
case "$host_os" in
|
|
||||||
solaris*)
|
|
||||||
dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
|
|
||||||
dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
|
|
||||||
dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
|
|
||||||
dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
|
|
||||||
dnl symlink is missing, so we set acl_libdirstem2 too.
|
|
||||||
AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
|
|
||||||
[AC_EGREP_CPP([sixtyfour bits], [
|
|
||||||
#ifdef _LP64
|
|
||||||
sixtyfour bits
|
|
||||||
#endif
|
|
||||||
], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
|
|
||||||
])
|
|
||||||
if test $gl_cv_solaris_64bit = yes; then
|
|
||||||
acl_libdirstem=lib/64
|
|
||||||
case "$host_cpu" in
|
|
||||||
sparc*) acl_libdirstem2=lib/sparcv9 ;;
|
|
||||||
i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
|
|
||||||
if test -n "$searchpath"; then
|
|
||||||
acl_save_IFS="${IFS= }"; IFS=":"
|
|
||||||
for searchdir in $searchpath; do
|
|
||||||
if test -d "$searchdir"; then
|
|
||||||
case "$searchdir" in
|
|
||||||
*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
|
|
||||||
*/../ | */.. )
|
|
||||||
# Better ignore directories of this form. They are misleading.
|
|
||||||
;;
|
|
||||||
*) searchdir=`cd "$searchdir" && pwd`
|
|
||||||
case "$searchdir" in
|
|
||||||
*/lib64 ) acl_libdirstem=lib64 ;;
|
|
||||||
esac ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
IFS="$acl_save_IFS"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
|
|
||||||
])
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,331 +0,0 @@
|
||||||
#! /bin/sh
|
|
||||||
# Common stub for a few missing GNU programs while installing.
|
|
||||||
|
|
||||||
scriptversion=2012-01-06.13; # UTC
|
|
||||||
|
|
||||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
|
|
||||||
# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
|
|
||||||
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
|
||||||
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; either version 2, 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/>.
|
|
||||||
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
|
||||||
# distribute this file as part of a program that contains a
|
|
||||||
# configuration script generated by Autoconf, you may include it under
|
|
||||||
# the same distribution terms that you use for the rest of that program.
|
|
||||||
|
|
||||||
if test $# -eq 0; then
|
|
||||||
echo 1>&2 "Try \`$0 --help' for more information"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
run=:
|
|
||||||
sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
|
|
||||||
sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
|
|
||||||
|
|
||||||
# In the cases where this matters, `missing' is being run in the
|
|
||||||
# srcdir already.
|
|
||||||
if test -f configure.ac; then
|
|
||||||
configure_ac=configure.ac
|
|
||||||
else
|
|
||||||
configure_ac=configure.in
|
|
||||||
fi
|
|
||||||
|
|
||||||
msg="missing on your system"
|
|
||||||
|
|
||||||
case $1 in
|
|
||||||
--run)
|
|
||||||
# Try to run requested program, and just exit if it succeeds.
|
|
||||||
run=
|
|
||||||
shift
|
|
||||||
"$@" && exit 0
|
|
||||||
# Exit code 63 means version mismatch. This often happens
|
|
||||||
# when the user try to use an ancient version of a tool on
|
|
||||||
# a file that requires a minimum version. In this case we
|
|
||||||
# we should proceed has if the program had been absent, or
|
|
||||||
# if --run hadn't been passed.
|
|
||||||
if test $? = 63; then
|
|
||||||
run=:
|
|
||||||
msg="probably too old"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
-h|--h|--he|--hel|--help)
|
|
||||||
echo "\
|
|
||||||
$0 [OPTION]... PROGRAM [ARGUMENT]...
|
|
||||||
|
|
||||||
Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
|
|
||||||
error status if there is no known handling for PROGRAM.
|
|
||||||
|
|
||||||
Options:
|
|
||||||
-h, --help display this help and exit
|
|
||||||
-v, --version output version information and exit
|
|
||||||
--run try to run the given command, and emulate it if it fails
|
|
||||||
|
|
||||||
Supported PROGRAM values:
|
|
||||||
aclocal touch file \`aclocal.m4'
|
|
||||||
autoconf touch file \`configure'
|
|
||||||
autoheader touch file \`config.h.in'
|
|
||||||
autom4te touch the output file, or create a stub one
|
|
||||||
automake touch all \`Makefile.in' files
|
|
||||||
bison create \`y.tab.[ch]', if possible, from existing .[ch]
|
|
||||||
flex create \`lex.yy.c', if possible, from existing .c
|
|
||||||
help2man touch the output file
|
|
||||||
lex create \`lex.yy.c', if possible, from existing .c
|
|
||||||
makeinfo touch the output file
|
|
||||||
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
|
|
||||||
|
|
||||||
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
|
|
||||||
\`g' are ignored when checking the name.
|
|
||||||
|
|
||||||
Send bug reports to <bug-automake@gnu.org>."
|
|
||||||
exit $?
|
|
||||||
;;
|
|
||||||
|
|
||||||
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
|
|
||||||
echo "missing $scriptversion (GNU Automake)"
|
|
||||||
exit $?
|
|
||||||
;;
|
|
||||||
|
|
||||||
-*)
|
|
||||||
echo 1>&2 "$0: Unknown \`$1' option"
|
|
||||||
echo 1>&2 "Try \`$0 --help' for more information"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
|
|
||||||
esac
|
|
||||||
|
|
||||||
# normalize program name to check for.
|
|
||||||
program=`echo "$1" | sed '
|
|
||||||
s/^gnu-//; t
|
|
||||||
s/^gnu//; t
|
|
||||||
s/^g//; t'`
|
|
||||||
|
|
||||||
# Now exit if we have it, but it failed. Also exit now if we
|
|
||||||
# don't have it and --version was passed (most likely to detect
|
|
||||||
# the program). This is about non-GNU programs, so use $1 not
|
|
||||||
# $program.
|
|
||||||
case $1 in
|
|
||||||
lex*|yacc*)
|
|
||||||
# Not GNU programs, they don't have --version.
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
||||||
# We have it, but it failed.
|
|
||||||
exit 1
|
|
||||||
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
|
|
||||||
# Could not run --version or --help. This is probably someone
|
|
||||||
# running `$TOOL --version' or `$TOOL --help' to check whether
|
|
||||||
# $TOOL exists and not knowing $TOOL uses missing.
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# If it does not exist, or fails to run (possibly an outdated version),
|
|
||||||
# try to emulate it.
|
|
||||||
case $program in
|
|
||||||
aclocal*)
|
|
||||||
echo 1>&2 "\
|
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
|
||||||
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
|
|
||||||
to install the \`Automake' and \`Perl' packages. Grab them from
|
|
||||||
any GNU archive site."
|
|
||||||
touch aclocal.m4
|
|
||||||
;;
|
|
||||||
|
|
||||||
autoconf*)
|
|
||||||
echo 1>&2 "\
|
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
|
||||||
you modified \`${configure_ac}'. You might want to install the
|
|
||||||
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
|
|
||||||
archive site."
|
|
||||||
touch configure
|
|
||||||
;;
|
|
||||||
|
|
||||||
autoheader*)
|
|
||||||
echo 1>&2 "\
|
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
|
||||||
you modified \`acconfig.h' or \`${configure_ac}'. You might want
|
|
||||||
to install the \`Autoconf' and \`GNU m4' packages. Grab them
|
|
||||||
from any GNU archive site."
|
|
||||||
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
|
|
||||||
test -z "$files" && files="config.h"
|
|
||||||
touch_files=
|
|
||||||
for f in $files; do
|
|
||||||
case $f in
|
|
||||||
*:*) touch_files="$touch_files "`echo "$f" |
|
|
||||||
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
|
|
||||||
*) touch_files="$touch_files $f.in";;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
touch $touch_files
|
|
||||||
;;
|
|
||||||
|
|
||||||
automake*)
|
|
||||||
echo 1>&2 "\
|
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
|
||||||
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
|
|
||||||
You might want to install the \`Automake' and \`Perl' packages.
|
|
||||||
Grab them from any GNU archive site."
|
|
||||||
find . -type f -name Makefile.am -print |
|
|
||||||
sed 's/\.am$/.in/' |
|
|
||||||
while read f; do touch "$f"; done
|
|
||||||
;;
|
|
||||||
|
|
||||||
autom4te*)
|
|
||||||
echo 1>&2 "\
|
|
||||||
WARNING: \`$1' is needed, but is $msg.
|
|
||||||
You might have modified some files without having the
|
|
||||||
proper tools for further handling them.
|
|
||||||
You can get \`$1' as part of \`Autoconf' from any GNU
|
|
||||||
archive site."
|
|
||||||
|
|
||||||
file=`echo "$*" | sed -n "$sed_output"`
|
|
||||||
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
|
|
||||||
if test -f "$file"; then
|
|
||||||
touch $file
|
|
||||||
else
|
|
||||||
test -z "$file" || exec >$file
|
|
||||||
echo "#! /bin/sh"
|
|
||||||
echo "# Created by GNU Automake missing as a replacement of"
|
|
||||||
echo "# $ $@"
|
|
||||||
echo "exit 0"
|
|
||||||
chmod +x $file
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
bison*|yacc*)
|
|
||||||
echo 1>&2 "\
|
|
||||||
WARNING: \`$1' $msg. You should only need it if
|
|
||||||
you modified a \`.y' file. You may need the \`Bison' package
|
|
||||||
in order for those modifications to take effect. You can get
|
|
||||||
\`Bison' from any GNU archive site."
|
|
||||||
rm -f y.tab.c y.tab.h
|
|
||||||
if test $# -ne 1; then
|
|
||||||
eval LASTARG=\${$#}
|
|
||||||
case $LASTARG in
|
|
||||||
*.y)
|
|
||||||
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
|
|
||||||
if test -f "$SRCFILE"; then
|
|
||||||
cp "$SRCFILE" y.tab.c
|
|
||||||
fi
|
|
||||||
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
|
|
||||||
if test -f "$SRCFILE"; then
|
|
||||||
cp "$SRCFILE" y.tab.h
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
if test ! -f y.tab.h; then
|
|
||||||
echo >y.tab.h
|
|
||||||
fi
|
|
||||||
if test ! -f y.tab.c; then
|
|
||||||
echo 'main() { return 0; }' >y.tab.c
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
lex*|flex*)
|
|
||||||
echo 1>&2 "\
|
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
|
||||||
you modified a \`.l' file. You may need the \`Flex' package
|
|
||||||
in order for those modifications to take effect. You can get
|
|
||||||
\`Flex' from any GNU archive site."
|
|
||||||
rm -f lex.yy.c
|
|
||||||
if test $# -ne 1; then
|
|
||||||
eval LASTARG=\${$#}
|
|
||||||
case $LASTARG in
|
|
||||||
*.l)
|
|
||||||
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
|
|
||||||
if test -f "$SRCFILE"; then
|
|
||||||
cp "$SRCFILE" lex.yy.c
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
if test ! -f lex.yy.c; then
|
|
||||||
echo 'main() { return 0; }' >lex.yy.c
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
help2man*)
|
|
||||||
echo 1>&2 "\
|
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
|
||||||
you modified a dependency of a manual page. You may need the
|
|
||||||
\`Help2man' package in order for those modifications to take
|
|
||||||
effect. You can get \`Help2man' from any GNU archive site."
|
|
||||||
|
|
||||||
file=`echo "$*" | sed -n "$sed_output"`
|
|
||||||
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
|
|
||||||
if test -f "$file"; then
|
|
||||||
touch $file
|
|
||||||
else
|
|
||||||
test -z "$file" || exec >$file
|
|
||||||
echo ".ab help2man is required to generate this page"
|
|
||||||
exit $?
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
makeinfo*)
|
|
||||||
echo 1>&2 "\
|
|
||||||
WARNING: \`$1' is $msg. You should only need it if
|
|
||||||
you modified a \`.texi' or \`.texinfo' file, or any other file
|
|
||||||
indirectly affecting the aspect of the manual. The spurious
|
|
||||||
call might also be the consequence of using a buggy \`make' (AIX,
|
|
||||||
DU, IRIX). You might want to install the \`Texinfo' package or
|
|
||||||
the \`GNU make' package. Grab either from any GNU archive site."
|
|
||||||
# The file to touch is that specified with -o ...
|
|
||||||
file=`echo "$*" | sed -n "$sed_output"`
|
|
||||||
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
|
|
||||||
if test -z "$file"; then
|
|
||||||
# ... or it is the one specified with @setfilename ...
|
|
||||||
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
|
|
||||||
file=`sed -n '
|
|
||||||
/^@setfilename/{
|
|
||||||
s/.* \([^ ]*\) *$/\1/
|
|
||||||
p
|
|
||||||
q
|
|
||||||
}' $infile`
|
|
||||||
# ... or it is derived from the source name (dir/f.texi becomes f.info)
|
|
||||||
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
|
|
||||||
fi
|
|
||||||
# If the file does not exist, the user really needs makeinfo;
|
|
||||||
# let's fail without touching anything.
|
|
||||||
test -f $file || exit 1
|
|
||||||
touch $file
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
echo 1>&2 "\
|
|
||||||
WARNING: \`$1' is needed, and is $msg.
|
|
||||||
You might have modified some files without having the
|
|
||||||
proper tools for further handling them. Check the \`README' file,
|
|
||||||
it often tells you about the needed prerequisites for installing
|
|
||||||
this package. You may also peek at any GNU archive site, in case
|
|
||||||
some other package would contain this missing \`$1' program."
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
# Local variables:
|
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
||||||
# time-stamp-start: "scriptversion="
|
|
||||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
||||||
# time-stamp-time-zone: "UTC"
|
|
||||||
# time-stamp-end: "; # UTC"
|
|
||||||
# End:
|
|
|
@ -1,67 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
PATH=/usr/local/gnu-autotools/bin/:$PATH
|
|
||||||
export PATH
|
|
||||||
|
|
||||||
# Start from one level above the build directory
|
|
||||||
if [ -f version ]; then
|
|
||||||
cd ..
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ \! -f build/version ]; then
|
|
||||||
echo "Can't find source directory"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# BSD make's "OBJDIR" support freaks out the automake-generated
|
|
||||||
# Makefile. Effectively disable it.
|
|
||||||
export MAKEOBJDIRPREFIX=/junk
|
|
||||||
|
|
||||||
# Start from the build directory, where the version file is located
|
|
||||||
if [ -f build/version ]; then
|
|
||||||
cd build
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ \! -f version ]; then
|
|
||||||
echo "Can't find version file"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Update the build number in the 'version' file.
|
|
||||||
# Separate number from additional alpha/beta/etc marker
|
|
||||||
MARKER=`cat version | sed 's/[0-9.]//g'`
|
|
||||||
# Bump the number
|
|
||||||
VN=`cat version | sed 's/[^0-9.]//g'`
|
|
||||||
# Build out the string.
|
|
||||||
VS="$(($VN/1000000)).$(( ($VN/1000)%1000 )).$(( $VN%1000 ))$MARKER"
|
|
||||||
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
# Clean up the source dir as much as we can.
|
|
||||||
/bin/sh build/clean.sh
|
|
||||||
|
|
||||||
# Substitute the versions into Libarchive's archive.h and archive_entry.h
|
|
||||||
perl -p -i -e "s/^(#define\tARCHIVE_VERSION_NUMBER).*/\$1 $VN/" libarchive/archive.h
|
|
||||||
perl -p -i -e "s/^(#define\tARCHIVE_VERSION_NUMBER).*/\$1 $VN/" libarchive/archive_entry.h
|
|
||||||
perl -p -i -e "s/^(#define\tARCHIVE_VERSION_STRING).*/\$1 \"libarchive $VS\"/" libarchive/archive.h
|
|
||||||
# Substitute versions into configure.ac as well
|
|
||||||
perl -p -i -e 's/(m4_define\(\[LIBARCHIVE_VERSION_S\]),.*\)/$1,['"$VS"'])/' configure.ac
|
|
||||||
perl -p -i -e 's/(m4_define\(\[LIBARCHIVE_VERSION_N\]),.*\)/$1,['"$VN"'])/' configure.ac
|
|
||||||
|
|
||||||
# Remove developer CFLAGS if a release build is being made
|
|
||||||
if [ -n "${MAKE_LIBARCHIVE_RELEASE}" ]; then
|
|
||||||
perl -p -i -e "s/^(DEV_CFLAGS.*)/# \$1/" Makefile.am
|
|
||||||
fi
|
|
||||||
|
|
||||||
set -xe
|
|
||||||
aclocal -I build/autoconf
|
|
||||||
|
|
||||||
# Note: --automake flag needed only for libtoolize from
|
|
||||||
# libtool 1.5.x; in libtool 2.2.x it is a synonym for --quiet
|
|
||||||
case `uname` in
|
|
||||||
Darwin) glibtoolize --automake -c;;
|
|
||||||
*) libtoolize --automake -c;;
|
|
||||||
esac
|
|
||||||
autoconf
|
|
||||||
autoheader
|
|
||||||
automake -a -c
|
|
|
@ -1,36 +0,0 @@
|
||||||
#!/bin/sh +v
|
|
||||||
|
|
||||||
# Start from the build directory, where the version file is located
|
|
||||||
if [ -f build/version ]; then
|
|
||||||
cd build
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ \! -f version ]; then
|
|
||||||
echo "Can't find version file"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Update the build number in the 'version' file.
|
|
||||||
# Separate number from additional alpha/beta/etc marker
|
|
||||||
MARKER=`cat version | sed 's/[0-9.]//g'`
|
|
||||||
# Bump the number
|
|
||||||
VN=`cat version | sed 's/[^0-9.]//g'`
|
|
||||||
# Reassemble and write back out
|
|
||||||
VN=$(($VN + 1))
|
|
||||||
rm -f version.old
|
|
||||||
mv version version.old
|
|
||||||
chmod +w version.old
|
|
||||||
echo $VN$MARKER > version
|
|
||||||
VS="$(($VN/1000000)).$(( ($VN/1000)%1000 )).$(( $VN%1000 ))$MARKER"
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
ANNOUNCE=`date +"%b %d, %Y:"`" libarchive $VS released"
|
|
||||||
|
|
||||||
echo $ANNOUNCE
|
|
||||||
|
|
||||||
# Add a version notice to NEWS
|
|
||||||
mv NEWS NEWS.bak
|
|
||||||
chmod +w NEWS.bak
|
|
||||||
echo $ANNOUNCE >> NEWS
|
|
||||||
echo >> NEWS
|
|
||||||
cat NEWS.bak >> NEWS
|
|
|
@ -1,97 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Attempt to remove as many generated files as we can.
|
|
||||||
# Ideally, a well-used development sandbox would look like
|
|
||||||
# a pristine checkout after running this script.
|
|
||||||
#
|
|
||||||
|
|
||||||
if [ \! -f build/version ]; then
|
|
||||||
echo 'Must run the clean script from the top-level dir of the libarchive distribution' 1>&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If we're on BSD, blow away the build dir under /usr/obj
|
|
||||||
rm -rf /usr/obj`pwd`
|
|
||||||
|
|
||||||
#
|
|
||||||
# Try to clean up a bit more...
|
|
||||||
#
|
|
||||||
|
|
||||||
find . -name '*.So' | xargs rm -f
|
|
||||||
find . -name '*.a' | xargs rm -f
|
|
||||||
find . -name '*.la' | xargs rm -f
|
|
||||||
find . -name '*.lo' | xargs rm -f
|
|
||||||
find . -name '*.o' | xargs rm -f
|
|
||||||
find . -name '*.orig' | xargs rm -f
|
|
||||||
find . -name '*.po' | xargs rm -f
|
|
||||||
find . -name '*.rej' | xargs rm -f
|
|
||||||
find . -name '*~' | xargs rm -f
|
|
||||||
find . -name '.depend' | xargs rm -f
|
|
||||||
find . -name '.deps' | xargs rm -rf
|
|
||||||
find . -name '.dirstamp' | xargs rm -f
|
|
||||||
find . -name '.libs' | xargs rm -rf
|
|
||||||
find . -name 'CMakeFiles' | xargs rm -rf
|
|
||||||
find . -name 'cmake_install.cmake' | xargs rm -f
|
|
||||||
find . -name 'CTestTestfile.cmake' | xargs rm -f
|
|
||||||
|
|
||||||
rm -rf Testing
|
|
||||||
rm -rf autom4te.cache
|
|
||||||
rm -rf bin
|
|
||||||
rm -rf cmake.tmp
|
|
||||||
rm -rf libarchive/Testing
|
|
||||||
|
|
||||||
rm -f CMakeCache.txt
|
|
||||||
rm -f DartConfiguration.tcl
|
|
||||||
rm -f Makefile
|
|
||||||
rm -f Makefile.in
|
|
||||||
rm -f aclocal.m4
|
|
||||||
rm -f bsdcpio
|
|
||||||
rm -f bsdcpio_test
|
|
||||||
rm -f bsdtar
|
|
||||||
rm -f bsdtar_test
|
|
||||||
rm -f build/autoconf/compile
|
|
||||||
rm -f build/autoconf/config.guess
|
|
||||||
rm -f build/autoconf/config.sub
|
|
||||||
rm -f build/autoconf/depcomp
|
|
||||||
rm -f build/autoconf/install-sh
|
|
||||||
rm -f build/autoconf/libtool.m4
|
|
||||||
rm -f build/autoconf/ltmain.sh
|
|
||||||
rm -f build/autoconf/ltoptions.m4
|
|
||||||
rm -f build/autoconf/ltsugar.m4
|
|
||||||
rm -f build/autoconf/ltversion.m4
|
|
||||||
rm -f build/autoconf/lt~obsolete.m4
|
|
||||||
rm -f build/autoconf/missing
|
|
||||||
rm -f build/pkgconfig/libarchive.pc
|
|
||||||
rm -f build/version.old
|
|
||||||
rm -f config.h
|
|
||||||
rm -f config.h.in
|
|
||||||
rm -f config.log
|
|
||||||
rm -f config.status
|
|
||||||
rm -f configure
|
|
||||||
rm -f cpio/*.1.gz
|
|
||||||
rm -f cpio/Makefile
|
|
||||||
rm -f cpio/bsdcpio
|
|
||||||
rm -f cpio/test/Makefile
|
|
||||||
rm -f cpio/test/bsdcpio_test
|
|
||||||
rm -f cpio/test/list.h
|
|
||||||
rm -f doc/html/*
|
|
||||||
rm -f doc/man/*
|
|
||||||
rm -f doc/pdf/*
|
|
||||||
rm -f doc/text/*
|
|
||||||
rm -f doc/wiki/*
|
|
||||||
rm -f libarchive/*.[35].gz
|
|
||||||
rm -f libarchive/Makefile
|
|
||||||
rm -f libarchive/libarchive.so*
|
|
||||||
rm -f libarchive/test/Makefile
|
|
||||||
rm -f libarchive/test/libarchive_test
|
|
||||||
rm -f libarchive/test/list.h
|
|
||||||
rm -f libarchive_test
|
|
||||||
rm -f libtool
|
|
||||||
rm -f stamp-h1
|
|
||||||
rm -f tar/*.1.gz
|
|
||||||
rm -f tar/Makefile
|
|
||||||
rm -f tar/bsdtar
|
|
||||||
rm -f tar/test/Makefile
|
|
||||||
rm -f tar/test/bsdtar_test
|
|
||||||
rm -f tar/test/list.h
|
|
|
@ -1,14 +0,0 @@
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
#define KB ((off_t)1024)
|
|
||||||
#define MB ((off_t)1024 * KB)
|
|
||||||
#define GB ((off_t)1024 * MB)
|
|
||||||
#define TB ((off_t)1024 * GB)
|
|
||||||
int t2[(((64 * GB -1) % 671088649) == 268434537)
|
|
||||||
&& (((TB - (64 * GB -1) + 255) % 1792151290) == 305159546)? 1: -1];
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
|
@ -1,44 +0,0 @@
|
||||||
# - Check if _FILE_OFFSET_BITS macro needed for large files
|
|
||||||
# CHECK_FILE_OFFSET_BITS ()
|
|
||||||
#
|
|
||||||
# The following variables may be set before calling this macro to
|
|
||||||
# modify the way the check is run:
|
|
||||||
#
|
|
||||||
# CMAKE_REQUIRED_FLAGS = string of compile command line flags
|
|
||||||
# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
|
|
||||||
# CMAKE_REQUIRED_INCLUDES = list of include directories
|
|
||||||
# Copyright (c) 2009, Michihiro NAKAJIMA
|
|
||||||
#
|
|
||||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
|
||||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
|
||||||
|
|
||||||
#INCLUDE(CheckCXXSourceCompiles)
|
|
||||||
|
|
||||||
GET_FILENAME_COMPONENT(_selfdir_CheckFileOffsetBits
|
|
||||||
"${CMAKE_CURRENT_LIST_FILE}" PATH)
|
|
||||||
|
|
||||||
MACRO (CHECK_FILE_OFFSET_BITS)
|
|
||||||
IF(NOT DEFINED _FILE_OFFSET_BITS)
|
|
||||||
MESSAGE(STATUS "Checking _FILE_OFFSET_BITS for large files")
|
|
||||||
TRY_COMPILE(__WITHOUT_FILE_OFFSET_BITS_64
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
|
||||||
${_selfdir_CheckFileOffsetBits}/CheckFileOffsetBits.c
|
|
||||||
COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
|
|
||||||
IF(NOT __WITHOUT_FILE_OFFSET_BITS_64)
|
|
||||||
TRY_COMPILE(__WITH_FILE_OFFSET_BITS_64
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
|
||||||
${_selfdir_CheckFileOffsetBits}/CheckFileOffsetBits.c
|
|
||||||
COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_FILE_OFFSET_BITS=64)
|
|
||||||
ENDIF(NOT __WITHOUT_FILE_OFFSET_BITS_64)
|
|
||||||
|
|
||||||
IF(NOT __WITHOUT_FILE_OFFSET_BITS_64 AND __WITH_FILE_OFFSET_BITS_64)
|
|
||||||
SET(_FILE_OFFSET_BITS 64 CACHE INTERNAL "_FILE_OFFSET_BITS macro needed for large files")
|
|
||||||
MESSAGE(STATUS "Checking _FILE_OFFSET_BITS for large files - needed")
|
|
||||||
ELSE(NOT __WITHOUT_FILE_OFFSET_BITS_64 AND __WITH_FILE_OFFSET_BITS_64)
|
|
||||||
SET(_FILE_OFFSET_BITS "" CACHE INTERNAL "_FILE_OFFSET_BITS macro needed for large files")
|
|
||||||
MESSAGE(STATUS "Checking _FILE_OFFSET_BITS for large files - not needed")
|
|
||||||
ENDIF(NOT __WITHOUT_FILE_OFFSET_BITS_64 AND __WITH_FILE_OFFSET_BITS_64)
|
|
||||||
ENDIF(NOT DEFINED _FILE_OFFSET_BITS)
|
|
||||||
|
|
||||||
ENDMACRO (CHECK_FILE_OFFSET_BITS)
|
|
||||||
|
|
|
@ -1,49 +0,0 @@
|
||||||
# Check if the system has the specified function; treat glibc "stub"
|
|
||||||
# functions as nonexistent:
|
|
||||||
# CHECK_FUNCTION_EXISTS_GLIBC (FUNCTION FUNCVAR)
|
|
||||||
#
|
|
||||||
# FUNCTION - the function(s) where the prototype should be declared
|
|
||||||
# FUNCVAR - variable to define if the function does exist
|
|
||||||
#
|
|
||||||
# In particular, this understands the glibc convention of
|
|
||||||
# defining macros __stub_XXXX or __stub___XXXX if the function
|
|
||||||
# does appear in the library but is merely a stub that does nothing.
|
|
||||||
# By detecting this case, we can select alternate behavior on
|
|
||||||
# platforms that don't support this functionality.
|
|
||||||
#
|
|
||||||
# The following variables may be set before calling this macro to
|
|
||||||
# modify the way the check is run:
|
|
||||||
#
|
|
||||||
# CMAKE_REQUIRED_FLAGS = string of compile command line flags
|
|
||||||
# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
|
|
||||||
# CMAKE_REQUIRED_INCLUDES = list of include directories
|
|
||||||
# Copyright (c) 2009, Michihiro NAKAJIMA
|
|
||||||
#
|
|
||||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
|
||||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
|
||||||
|
|
||||||
INCLUDE(CheckFunctionExists)
|
|
||||||
GET_FILENAME_COMPONENT(_selfdir_CheckFunctionExistsGlibc
|
|
||||||
"${CMAKE_CURRENT_LIST_FILE}" PATH)
|
|
||||||
|
|
||||||
MACRO (CHECK_FUNCTION_EXISTS_GLIBC _FUNC _FUNCVAR)
|
|
||||||
IF(NOT DEFINED ${_FUNCVAR})
|
|
||||||
SET(CHECK_STUB_FUNC_1 "__stub_${_FUNC}")
|
|
||||||
SET(CHECK_STUB_FUNC_2 "__stub___${_FUNC}")
|
|
||||||
CONFIGURE_FILE( ${_selfdir_CheckFunctionExistsGlibc}/CheckFuncs_stub.c.in
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/cmake.tmp/CheckFuncs_stub.c IMMEDIATE)
|
|
||||||
TRY_COMPILE(__stub
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/cmake.tmp/CheckFuncs_stub.c
|
|
||||||
COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
|
|
||||||
CMAKE_FLAGS
|
|
||||||
-DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_INCLUDE_FILE_FLAGS}
|
|
||||||
"${CHECK_INCLUDE_FILE_C_INCLUDE_DIRS}")
|
|
||||||
IF (__stub)
|
|
||||||
SET("${_FUNCVAR}" "" CACHE INTERNAL "Have function ${_FUNC}")
|
|
||||||
ELSE (__stub)
|
|
||||||
CHECK_FUNCTION_EXISTS("${_FUNC}" "${_FUNCVAR}")
|
|
||||||
ENDIF (__stub)
|
|
||||||
ENDIF(NOT DEFINED ${_FUNCVAR})
|
|
||||||
ENDMACRO (CHECK_FUNCTION_EXISTS_GLIBC)
|
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
#ifdef __STDC__
|
|
||||||
#include <limits.h>
|
|
||||||
#else
|
|
||||||
#include <assert.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int
|
|
||||||
main()
|
|
||||||
{
|
|
||||||
#if defined ${CHECK_STUB_FUNC_1} || defined ${CHECK_STUB_FUNC_2}
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
this system have stub
|
|
||||||
return 0;
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,32 +0,0 @@
|
||||||
# - Check if the system has the specified type
|
|
||||||
# CHECK_HEADER_DIRENT (HEADER1 HEARDER2 ...)
|
|
||||||
#
|
|
||||||
# HEADER - the header(s) where the prototype should be declared
|
|
||||||
#
|
|
||||||
# The following variables may be set before calling this macro to
|
|
||||||
# modify the way the check is run:
|
|
||||||
#
|
|
||||||
# CMAKE_REQUIRED_FLAGS = string of compile command line flags
|
|
||||||
# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
|
|
||||||
# CMAKE_REQUIRED_INCLUDES = list of include directories
|
|
||||||
# Copyright (c) 2009, Michihiro NAKAJIMA
|
|
||||||
#
|
|
||||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
|
||||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
|
||||||
|
|
||||||
|
|
||||||
INCLUDE(CheckTypeExists)
|
|
||||||
|
|
||||||
MACRO (CHECK_HEADER_DIRENT)
|
|
||||||
CHECK_TYPE_EXISTS("DIR *" dirent.h HAVE_DIRENT_H)
|
|
||||||
IF(NOT HAVE_DIRENT_H)
|
|
||||||
CHECK_TYPE_EXISTS("DIR *" sys/ndir.h HAVE_SYS_NDIR_H)
|
|
||||||
IF(NOT HAVE_SYS_NDIR_H)
|
|
||||||
CHECK_TYPE_EXISTS("DIR *" ndir.h HAVE_NDIR_H)
|
|
||||||
IF(NOT HAVE_NDIR_H)
|
|
||||||
CHECK_TYPE_EXISTS("DIR *" sys/dir.h HAVE_SYS_DIR_H)
|
|
||||||
ENDIF(NOT HAVE_NDIR_H)
|
|
||||||
ENDIF(NOT HAVE_SYS_NDIR_H)
|
|
||||||
ENDIF(NOT HAVE_DIRENT_H)
|
|
||||||
ENDMACRO (CHECK_HEADER_DIRENT)
|
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
# - Check if the given struct or class has the specified member variable
|
|
||||||
# CHECK_STRUCT_MEMBER (STRUCT MEMBER HEADER VARIABLE)
|
|
||||||
#
|
|
||||||
# STRUCT - the name of the struct or class you are interested in
|
|
||||||
# MEMBER - the member which existence you want to check
|
|
||||||
# HEADER - the header(s) where the prototype should be declared
|
|
||||||
# VARIABLE - variable to store the result
|
|
||||||
#
|
|
||||||
# The following variables may be set before calling this macro to
|
|
||||||
# modify the way the check is run:
|
|
||||||
#
|
|
||||||
# CMAKE_REQUIRED_FLAGS = string of compile command line flags
|
|
||||||
# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
|
|
||||||
# CMAKE_REQUIRED_INCLUDES = list of include directories
|
|
||||||
|
|
||||||
# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
|
|
||||||
#
|
|
||||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
|
||||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
|
||||||
|
|
||||||
|
|
||||||
INCLUDE(CheckCSourceCompiles)
|
|
||||||
|
|
||||||
MACRO (CHECK_STRUCT_MEMBER _STRUCT _MEMBER _HEADER _RESULT)
|
|
||||||
SET(_INCLUDE_FILES)
|
|
||||||
FOREACH (it ${_HEADER})
|
|
||||||
SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
|
|
||||||
ENDFOREACH (it)
|
|
||||||
|
|
||||||
SET(_CHECK_STRUCT_MEMBER_SOURCE_CODE "
|
|
||||||
${_INCLUDE_FILES}
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
static ${_STRUCT} tmp;
|
|
||||||
if (sizeof(tmp.${_MEMBER}))
|
|
||||||
return 0;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
")
|
|
||||||
CHECK_C_SOURCE_COMPILES("${_CHECK_STRUCT_MEMBER_SOURCE_CODE}" ${_RESULT})
|
|
||||||
|
|
||||||
ENDMACRO (CHECK_STRUCT_MEMBER)
|
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
# - Check if the system has the specified type
|
|
||||||
# CHECK_TYPE_EXISTS (TYPE HEADER VARIABLE)
|
|
||||||
#
|
|
||||||
# TYPE - the name of the type or struct or class you are interested in
|
|
||||||
# HEADER - the header(s) where the prototype should be declared
|
|
||||||
# VARIABLE - variable to store the result
|
|
||||||
#
|
|
||||||
# The following variables may be set before calling this macro to
|
|
||||||
# modify the way the check is run:
|
|
||||||
#
|
|
||||||
# CMAKE_REQUIRED_FLAGS = string of compile command line flags
|
|
||||||
# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
|
|
||||||
# CMAKE_REQUIRED_INCLUDES = list of include directories
|
|
||||||
# Copyright (c) 2009, Michihiro NAKAJIMA
|
|
||||||
# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
|
|
||||||
#
|
|
||||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
|
||||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
|
||||||
|
|
||||||
|
|
||||||
INCLUDE(CheckCSourceCompiles)
|
|
||||||
|
|
||||||
MACRO (CHECK_TYPE_EXISTS _TYPE _HEADER _RESULT)
|
|
||||||
SET(_INCLUDE_FILES)
|
|
||||||
FOREACH (it ${_HEADER})
|
|
||||||
SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
|
|
||||||
ENDFOREACH (it)
|
|
||||||
|
|
||||||
SET(_CHECK_TYPE_EXISTS_SOURCE_CODE "
|
|
||||||
${_INCLUDE_FILES}
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
static ${_TYPE} tmp;
|
|
||||||
if (sizeof(tmp))
|
|
||||||
return 0;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
")
|
|
||||||
CHECK_C_SOURCE_COMPILES("${_CHECK_TYPE_EXISTS_SOURCE_CODE}" ${_RESULT})
|
|
||||||
|
|
||||||
ENDMACRO (CHECK_TYPE_EXISTS)
|
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
# - Find lzma and lzmadec
|
|
||||||
# Find the native LZMA includes and library
|
|
||||||
#
|
|
||||||
# LZMA_INCLUDE_DIR - where to find lzma.h, etc.
|
|
||||||
# LZMA_LIBRARIES - List of libraries when using liblzma.
|
|
||||||
# LZMA_FOUND - True if liblzma found.
|
|
||||||
# LZMADEC_INCLUDE_DIR - where to find lzmadec.h, etc.
|
|
||||||
# LZMADEC_LIBRARIES - List of libraries when using liblzmadec.
|
|
||||||
# LZMADEC_FOUND - True if liblzmadec found.
|
|
||||||
|
|
||||||
IF (LZMA_INCLUDE_DIR)
|
|
||||||
# Already in cache, be silent
|
|
||||||
SET(LZMA_FIND_QUIETLY TRUE)
|
|
||||||
ENDIF (LZMA_INCLUDE_DIR)
|
|
||||||
|
|
||||||
FIND_PATH(LZMA_INCLUDE_DIR lzma.h)
|
|
||||||
FIND_LIBRARY(LZMA_LIBRARY NAMES lzma liblzma)
|
|
||||||
|
|
||||||
# handle the QUIETLY and REQUIRED arguments and set LZMA_FOUND to TRUE if
|
|
||||||
# all listed variables are TRUE
|
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZMA DEFAULT_MSG LZMA_LIBRARY LZMA_INCLUDE_DIR)
|
|
||||||
|
|
||||||
IF(LZMA_FOUND)
|
|
||||||
SET( LZMA_LIBRARIES ${LZMA_LIBRARY} )
|
|
||||||
ELSE(LZMA_FOUND)
|
|
||||||
SET( LZMA_LIBRARIES )
|
|
||||||
|
|
||||||
IF (LZMADEC_INCLUDE_DIR)
|
|
||||||
# Already in cache, be silent
|
|
||||||
SET(LZMADEC_FIND_QUIETLY TRUE)
|
|
||||||
ENDIF (LZMADEC_INCLUDE_DIR)
|
|
||||||
|
|
||||||
FIND_PATH(LZMADEC_INCLUDE_DIR lzmadec.h)
|
|
||||||
FIND_LIBRARY(LZMADEC_LIBRARY NAMES lzmadec )
|
|
||||||
|
|
||||||
# handle the QUIETLY and REQUIRED arguments and set LZMADEC_FOUND to TRUE if
|
|
||||||
# all listed variables are TRUE
|
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZMADEC DEFAULT_MSG LZMADEC_LIBRARY
|
|
||||||
LZMADEC_INCLUDE_DIR)
|
|
||||||
|
|
||||||
IF(LZMADEC_FOUND)
|
|
||||||
SET( LZMADEC_LIBRARIES ${LZMADEC_LIBRARY} )
|
|
||||||
ELSE(LZMADEC_FOUND)
|
|
||||||
SET( LZMADEC_LIBRARIES )
|
|
||||||
ENDIF(LZMADEC_FOUND)
|
|
||||||
ENDIF(LZMA_FOUND)
|
|
|
@ -1,22 +0,0 @@
|
||||||
# - Find libgcc
|
|
||||||
# Find the libgcc library.
|
|
||||||
#
|
|
||||||
# LIBGCC_LIBRARIES - List of libraries when using libgcc
|
|
||||||
# LIBGCC_FOUND - True if libgcc found.
|
|
||||||
|
|
||||||
IF (LIBGCC_LIBRARY)
|
|
||||||
# Already in cache, be silent
|
|
||||||
SET(LIBGCC_FIND_QUIETLY TRUE)
|
|
||||||
ENDIF (LIBGCC_LIBRARY)
|
|
||||||
|
|
||||||
FIND_LIBRARY(LIBGCC_LIBRARY NAMES gcc libgcc)
|
|
||||||
|
|
||||||
# handle the QUIETLY and REQUIRED arguments and set LIBGCC_FOUND to TRUE if
|
|
||||||
# all listed variables are TRUE
|
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGCC DEFAULT_MSG LIBGCC_LIBRARY)
|
|
||||||
|
|
||||||
IF(LIBGCC_FOUND)
|
|
||||||
SET(LIBGCC_LIBRARIES ${LIBGCC_LIBRARY})
|
|
||||||
SET(HAVE_LIBGCC 1)
|
|
||||||
ENDIF(LIBGCC_FOUND)
|
|
|
@ -1,23 +0,0 @@
|
||||||
# - Find Nettle
|
|
||||||
# Find the Nettle include directory and library
|
|
||||||
#
|
|
||||||
# NETTLE_INCLUDE_DIR - where to find <nettle/sha.h>, etc.
|
|
||||||
# NETTLE_LIBRARIES - List of libraries when using libnettle.
|
|
||||||
# NETTLE_FOUND - True if libnettle found.
|
|
||||||
|
|
||||||
IF (NETTLE_INCLUDE_DIR)
|
|
||||||
# Already in cache, be silent
|
|
||||||
SET(NETTLE_FIND_QUIETLY TRUE)
|
|
||||||
ENDIF (NETTLE_INCLUDE_DIR)
|
|
||||||
|
|
||||||
FIND_PATH(NETTLE_INCLUDE_DIR nettle/md5.h nettle/ripemd160.h nettle/sha.h)
|
|
||||||
FIND_LIBRARY(NETTLE_LIBRARY NAMES nettle libnettle)
|
|
||||||
|
|
||||||
# handle the QUIETLY and REQUIRED arguments and set NETTLE_FOUND to TRUE if
|
|
||||||
# all listed variables are TRUE
|
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETTLE DEFAULT_MSG NETTLE_LIBRARY NETTLE_INCLUDE_DIR)
|
|
||||||
|
|
||||||
IF(NETTLE_FOUND)
|
|
||||||
SET(NETTLE_LIBRARIES ${NETTLE_LIBRARY})
|
|
||||||
ENDIF(NETTLE_FOUND)
|
|
|
@ -1,34 +0,0 @@
|
||||||
# - Find pcreposix
|
|
||||||
# Find the native PCRE and PCREPOSIX include and libraries
|
|
||||||
#
|
|
||||||
# PCRE_INCLUDE_DIR - where to find pcreposix.h, etc.
|
|
||||||
# PCREPOSIX_LIBRARIES - List of libraries when using libpcreposix.
|
|
||||||
# PCRE_LIBRARIES - List of libraries when using libpcre.
|
|
||||||
# PCREPOSIX_FOUND - True if libpcreposix found.
|
|
||||||
# PCRE_FOUND - True if libpcre found.
|
|
||||||
|
|
||||||
IF (PCRE_INCLUDE_DIR)
|
|
||||||
# Already in cache, be silent
|
|
||||||
SET(PCRE_FIND_QUIETLY TRUE)
|
|
||||||
ENDIF (PCRE_INCLUDE_DIR)
|
|
||||||
|
|
||||||
FIND_PATH(PCRE_INCLUDE_DIR pcreposix.h)
|
|
||||||
FIND_LIBRARY(PCREPOSIX_LIBRARY NAMES pcreposix libpcreposix)
|
|
||||||
FIND_LIBRARY(PCRE_LIBRARY NAMES pcre libpcre)
|
|
||||||
|
|
||||||
# handle the QUIETLY and REQUIRED arguments and set PCREPOSIX_FOUND to TRUE if
|
|
||||||
# all listed variables are TRUE
|
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCREPOSIX DEFAULT_MSG PCREPOSIX_LIBRARY PCRE_INCLUDE_DIR)
|
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_LIBRARY)
|
|
||||||
|
|
||||||
IF(PCREPOSIX_FOUND)
|
|
||||||
SET(PCREPOSIX_LIBRARIES ${PCREPOSIX_LIBRARY})
|
|
||||||
SET(HAVE_LIBPCREPOSIX 1)
|
|
||||||
SET(HAVE_PCREPOSIX_H 1)
|
|
||||||
ENDIF(PCREPOSIX_FOUND)
|
|
||||||
|
|
||||||
IF(PCRE_FOUND)
|
|
||||||
SET(PCRE_LIBRARIES ${PCRE_LIBRARY})
|
|
||||||
SET(HAVE_LIBPCRE 1)
|
|
||||||
ENDIF(PCRE_FOUND)
|
|
|
@ -1,106 +0,0 @@
|
||||||
# - Check if given C source compiles and links into an executable
|
|
||||||
# CHECK_C_SOURCE_COMPILES(<code> <var> [FAIL_REGEX <fail-regex>])
|
|
||||||
# <code> - source code to try to compile, must define 'main'
|
|
||||||
# <var> - variable to store whether the source code compiled
|
|
||||||
# <fail-regex> - fail if test output matches this regex
|
|
||||||
# The following variables may be set before calling this macro to
|
|
||||||
# modify the way the check is run:
|
|
||||||
#
|
|
||||||
# CMAKE_REQUIRED_FLAGS = string of compile command line flags
|
|
||||||
# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
|
|
||||||
# CMAKE_REQUIRED_INCLUDES = list of include directories
|
|
||||||
# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
|
|
||||||
|
|
||||||
#=============================================================================
|
|
||||||
# Copyright 2005-2009 Kitware, Inc.
|
|
||||||
#
|
|
||||||
# Distributed under the OSI-approved BSD License (the "License");
|
|
||||||
# see accompanying file Copyright.txt for details.
|
|
||||||
#
|
|
||||||
# This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
||||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
# See the License for more information.
|
|
||||||
#=============================================================================
|
|
||||||
# (To distribute this file outside of CMake, substitute the full
|
|
||||||
# License text for the above reference.)
|
|
||||||
|
|
||||||
#
|
|
||||||
# Extra arguments added by libarchive
|
|
||||||
# CMAKE_REQUIRED_LINKER_FLAGS = string of linker command line flags
|
|
||||||
#
|
|
||||||
|
|
||||||
include(CMakeExpandImportedTargets)
|
|
||||||
|
|
||||||
|
|
||||||
macro(LIBARCHIVE_CHECK_C_SOURCE_COMPILES SOURCE VAR)
|
|
||||||
if("${VAR}" MATCHES "^${VAR}$")
|
|
||||||
set(_FAIL_REGEX)
|
|
||||||
set(_key)
|
|
||||||
foreach(arg ${ARGN})
|
|
||||||
if("${arg}" MATCHES "^(FAIL_REGEX)$")
|
|
||||||
set(_key "${arg}")
|
|
||||||
elseif(_key)
|
|
||||||
list(APPEND _${_key} "${arg}")
|
|
||||||
else()
|
|
||||||
message(FATAL_ERROR "Unknown argument:\n ${arg}\n")
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
set(MACRO_CHECK_FUNCTION_DEFINITIONS
|
|
||||||
"-D${VAR} ${CMAKE_REQUIRED_FLAGS}")
|
|
||||||
if(CMAKE_REQUIRED_LIBRARIES)
|
|
||||||
# this one translates potentially used imported library targets to their files on disk
|
|
||||||
CMAKE_EXPAND_IMPORTED_TARGETS(_ADJUSTED_CMAKE_REQUIRED_LIBRARIES LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CONFIGURATION "${CMAKE_TRY_COMPILE_CONFIGURATION}")
|
|
||||||
set(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES
|
|
||||||
"-DLINK_LIBRARIES:STRING=${_ADJUSTED_CMAKE_REQUIRED_LIBRARIES}")
|
|
||||||
else()
|
|
||||||
set(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES)
|
|
||||||
endif()
|
|
||||||
if(CMAKE_REQUIRED_INCLUDES)
|
|
||||||
set(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES
|
|
||||||
"-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
|
|
||||||
else()
|
|
||||||
set(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES)
|
|
||||||
endif()
|
|
||||||
if(CMAKE_REQUIRED_LINKER_FLAGS)
|
|
||||||
set(CHECK_C_SOURCE_COMPILES_ADD_LINKER_FLAGS
|
|
||||||
"-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS} -DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS} -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS}")
|
|
||||||
else()
|
|
||||||
set(CHECK_C_SOURCE_COMPILES_ADD_LINKER_FLAGS)
|
|
||||||
endif()
|
|
||||||
file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c"
|
|
||||||
"${SOURCE}\n")
|
|
||||||
|
|
||||||
message(STATUS "Performing Test ${VAR}")
|
|
||||||
try_compile(${VAR}
|
|
||||||
${CMAKE_BINARY_DIR}
|
|
||||||
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c
|
|
||||||
COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
|
|
||||||
CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS} ${CHECK_C_SOURCE_COMPILES_ADD_LINKER_FLAGS}
|
|
||||||
"${CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES}"
|
|
||||||
"${CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}"
|
|
||||||
OUTPUT_VARIABLE OUTPUT)
|
|
||||||
|
|
||||||
foreach(_regex ${_FAIL_REGEX})
|
|
||||||
if("${OUTPUT}" MATCHES "${_regex}")
|
|
||||||
set(${VAR} 0)
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
if(${VAR})
|
|
||||||
set(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
|
|
||||||
message(STATUS "Performing Test ${VAR} - Success")
|
|
||||||
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
|
|
||||||
"Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n"
|
|
||||||
"${OUTPUT}\n"
|
|
||||||
"Source file was:\n${SOURCE}\n")
|
|
||||||
else()
|
|
||||||
message(STATUS "Performing Test ${VAR} - Failed")
|
|
||||||
set(${VAR} "" CACHE INTERNAL "Test ${VAR}")
|
|
||||||
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
|
|
||||||
"Performing C SOURCE FILE Test ${VAR} failed with the following output:\n"
|
|
||||||
"${OUTPUT}\n"
|
|
||||||
"Source file was:\n${SOURCE}\n")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endmacro()
|
|
||||||
|
|
|
@ -1,102 +0,0 @@
|
||||||
# - Check if the given C source code compiles and runs.
|
|
||||||
# CHECK_C_SOURCE_RUNS(<code> <var>)
|
|
||||||
# <code> - source code to try to compile
|
|
||||||
# <var> - variable to store the result
|
|
||||||
# (1 for success, empty for failure)
|
|
||||||
# The following variables may be set before calling this macro to
|
|
||||||
# modify the way the check is run:
|
|
||||||
#
|
|
||||||
# CMAKE_REQUIRED_FLAGS = string of compile command line flags
|
|
||||||
# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
|
|
||||||
# CMAKE_REQUIRED_INCLUDES = list of include directories
|
|
||||||
# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
|
|
||||||
|
|
||||||
#=============================================================================
|
|
||||||
# Copyright 2006-2009 Kitware, Inc.
|
|
||||||
#
|
|
||||||
# Distributed under the OSI-approved BSD License (the "License");
|
|
||||||
# see accompanying file Copyright.txt for details.
|
|
||||||
#
|
|
||||||
# This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
||||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
# See the License for more information.
|
|
||||||
#=============================================================================
|
|
||||||
# (To distribute this file outside of CMake, substitute the full
|
|
||||||
# License text for the above reference.)
|
|
||||||
|
|
||||||
#
|
|
||||||
# Extra arguments added by libarchive
|
|
||||||
# CMAKE_REQUIRED_LINKER_FLAGS = string of linker command line flags
|
|
||||||
#
|
|
||||||
|
|
||||||
include(CMakeExpandImportedTargets)
|
|
||||||
|
|
||||||
|
|
||||||
macro(LIBARCHIVE_CHECK_C_SOURCE_RUNS SOURCE VAR)
|
|
||||||
if("${VAR}" MATCHES "^${VAR}$")
|
|
||||||
set(MACRO_CHECK_FUNCTION_DEFINITIONS
|
|
||||||
"-D${VAR} ${CMAKE_REQUIRED_FLAGS}")
|
|
||||||
if(CMAKE_REQUIRED_LIBRARIES)
|
|
||||||
# this one translates potentially used imported library targets to their files on disk
|
|
||||||
CMAKE_EXPAND_IMPORTED_TARGETS(_ADJUSTED_CMAKE_REQUIRED_LIBRARIES LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CONFIGURATION "${CMAKE_TRY_COMPILE_CONFIGURATION}")
|
|
||||||
set(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES
|
|
||||||
"-DLINK_LIBRARIES:STRING=${_ADJUSTED_CMAKE_REQUIRED_LIBRARIES}")
|
|
||||||
else()
|
|
||||||
set(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES)
|
|
||||||
endif()
|
|
||||||
if(CMAKE_REQUIRED_INCLUDES)
|
|
||||||
set(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES
|
|
||||||
"-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
|
|
||||||
else()
|
|
||||||
set(CHECK_C_SOURCE_COMPILES_ADD_INCLUDES)
|
|
||||||
endif()
|
|
||||||
if(CMAKE_REQUIRED_LINKER_FLAGS)
|
|
||||||
set(CHECK_C_SOURCE_COMPILES_ADD_LINKER_FLAGS
|
|
||||||
"-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS} -DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS} -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS}")
|
|
||||||
else()
|
|
||||||
set(CHECK_C_SOURCE_COMPILES_ADD_LINKER_FLAGS)
|
|
||||||
endif()
|
|
||||||
file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c"
|
|
||||||
"${SOURCE}\n")
|
|
||||||
|
|
||||||
message(STATUS "Performing Test ${VAR}")
|
|
||||||
try_run(${VAR}_EXITCODE ${VAR}_COMPILED
|
|
||||||
${CMAKE_BINARY_DIR}
|
|
||||||
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c
|
|
||||||
COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
|
|
||||||
CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS} ${CHECK_C_SOURCE_COMPILES_ADD_LINKER_FLAGS}
|
|
||||||
-DCMAKE_SKIP_RPATH:BOOL=${CMAKE_SKIP_RPATH}
|
|
||||||
"${CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES}"
|
|
||||||
"${CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}"
|
|
||||||
COMPILE_OUTPUT_VARIABLE OUTPUT)
|
|
||||||
# if it did not compile make the return value fail code of 1
|
|
||||||
if(NOT ${VAR}_COMPILED)
|
|
||||||
set(${VAR}_EXITCODE 1)
|
|
||||||
endif()
|
|
||||||
# if the return value was 0 then it worked
|
|
||||||
if("${${VAR}_EXITCODE}" EQUAL 0)
|
|
||||||
set(${VAR} 1 CACHE INTERNAL "Test ${VAR}")
|
|
||||||
message(STATUS "Performing Test ${VAR} - Success")
|
|
||||||
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
|
|
||||||
"Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n"
|
|
||||||
"${OUTPUT}\n"
|
|
||||||
"Return value: ${${VAR}}\n"
|
|
||||||
"Source file was:\n${SOURCE}\n")
|
|
||||||
else()
|
|
||||||
if(CMAKE_CROSSCOMPILING AND "${${VAR}_EXITCODE}" MATCHES "FAILED_TO_RUN")
|
|
||||||
set(${VAR} "${${VAR}_EXITCODE}")
|
|
||||||
else()
|
|
||||||
set(${VAR} "" CACHE INTERNAL "Test ${VAR}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
message(STATUS "Performing Test ${VAR} - Failed")
|
|
||||||
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
|
|
||||||
"Performing C SOURCE FILE Test ${VAR} failed with the following output:\n"
|
|
||||||
"${OUTPUT}\n"
|
|
||||||
"Return value: ${${VAR}_EXITCODE}\n"
|
|
||||||
"Source file was:\n${SOURCE}\n")
|
|
||||||
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endmacro()
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,11 +0,0 @@
|
||||||
prefix=@prefix@
|
|
||||||
exec_prefix=@exec_prefix@
|
|
||||||
libdir=@libdir@
|
|
||||||
includedir=@includedir@
|
|
||||||
|
|
||||||
Name: libarchive
|
|
||||||
Description: library that can create and read several streaming archive formats
|
|
||||||
Version: @VERSION@
|
|
||||||
Cflags: -I${includedir}
|
|
||||||
Libs: -L${libdir} -larchive
|
|
||||||
Libs.private: @LIBS@
|
|
|
@ -1 +0,0 @@
|
||||||
3001002
|
|
File diff suppressed because it is too large
Load diff
21646
archive/libarchive/configure
vendored
21646
archive/libarchive/configure
vendored
File diff suppressed because it is too large
Load diff
|
@ -1,788 +0,0 @@
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
|
||||||
|
|
||||||
dnl First, define all of the version numbers up front.
|
|
||||||
dnl In particular, this allows the version macro to be used in AC_INIT
|
|
||||||
|
|
||||||
dnl These first two version numbers are updated automatically on each release.
|
|
||||||
m4_define([LIBARCHIVE_VERSION_S],[3.1.2])
|
|
||||||
m4_define([LIBARCHIVE_VERSION_N],[3001002])
|
|
||||||
|
|
||||||
dnl bsdtar and bsdcpio versioning tracks libarchive
|
|
||||||
m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
|
|
||||||
m4_define([BSDCPIO_VERSION_S],LIBARCHIVE_VERSION_S())
|
|
||||||
|
|
||||||
AC_PREREQ(2.65)
|
|
||||||
|
|
||||||
#
|
|
||||||
# Now starts the "real" configure script.
|
|
||||||
#
|
|
||||||
|
|
||||||
AC_INIT([libarchive],LIBARCHIVE_VERSION_S(),[libarchive-discuss@googlegroups.com])
|
|
||||||
# Make sure the srcdir contains "libarchive" directory
|
|
||||||
AC_CONFIG_SRCDIR([libarchive])
|
|
||||||
# Use auxiliary subscripts from this subdirectory (cleans up root)
|
|
||||||
AC_CONFIG_AUX_DIR([build/autoconf])
|
|
||||||
# M4 scripts
|
|
||||||
AC_CONFIG_MACRO_DIR([build/autoconf])
|
|
||||||
# Must follow AC_CONFIG macros above...
|
|
||||||
AM_INIT_AUTOMAKE()
|
|
||||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
|
||||||
|
|
||||||
# Libtool's "interface version" can be computed from the libarchive version.
|
|
||||||
|
|
||||||
# Libtool interface version bumps on any API change, so increments
|
|
||||||
# whenever libarchive minor version does.
|
|
||||||
ARCHIVE_MINOR=$(( (LIBARCHIVE_VERSION_N() / 1000) % 1000 ))
|
|
||||||
# Libarchive 2.7 == libtool interface 9 = 2 + 7
|
|
||||||
# Libarchive 2.8 == libtool interface 10 = 2 + 8
|
|
||||||
# Libarchive 2.9 == libtool interface 11 = 2 + 8
|
|
||||||
# Libarchive 3.0 == libtool interface 12
|
|
||||||
# Libarchive 3.1 == libtool interface 13
|
|
||||||
ARCHIVE_INTERFACE=`echo $((13 + ${ARCHIVE_MINOR}))`
|
|
||||||
# Libarchive revision is bumped on any source change === libtool revision
|
|
||||||
ARCHIVE_REVISION=$(( LIBARCHIVE_VERSION_N() % 1000 ))
|
|
||||||
# Libarchive minor is bumped on any interface addition === libtool age
|
|
||||||
ARCHIVE_LIBTOOL_VERSION=$ARCHIVE_INTERFACE:$ARCHIVE_REVISION:$ARCHIVE_MINOR
|
|
||||||
|
|
||||||
# Stick the version numbers into config.h
|
|
||||||
AC_DEFINE([LIBARCHIVE_VERSION_STRING],"LIBARCHIVE_VERSION_S()",
|
|
||||||
[Version number of libarchive])
|
|
||||||
AC_DEFINE_UNQUOTED([LIBARCHIVE_VERSION_NUMBER],"LIBARCHIVE_VERSION_N()",
|
|
||||||
[Version number of libarchive as a single integer])
|
|
||||||
AC_DEFINE([BSDCPIO_VERSION_STRING],"BSDCPIO_VERSION_S()",
|
|
||||||
[Version number of bsdcpio])
|
|
||||||
AC_DEFINE([BSDTAR_VERSION_STRING],"BSDTAR_VERSION_S()",
|
|
||||||
[Version number of bsdtar])
|
|
||||||
|
|
||||||
# The shell variables here must be the same as the AC_SUBST() variables
|
|
||||||
# below, but the shell variable names apparently cannot be the same as
|
|
||||||
# the m4 macro names above. Why? Ask autoconf.
|
|
||||||
BSDCPIO_VERSION_STRING=BSDCPIO_VERSION_S()
|
|
||||||
BSDTAR_VERSION_STRING=BSDTAR_VERSION_S()
|
|
||||||
LIBARCHIVE_VERSION_STRING=LIBARCHIVE_VERSION_S()
|
|
||||||
LIBARCHIVE_VERSION_NUMBER=LIBARCHIVE_VERSION_N()
|
|
||||||
|
|
||||||
# Substitute the above version numbers into the various files below.
|
|
||||||
# Yes, I believe this is the fourth time we define what are essentially
|
|
||||||
# the same symbols. Why? Ask autoconf.
|
|
||||||
AC_SUBST(ARCHIVE_LIBTOOL_VERSION)
|
|
||||||
AC_SUBST(BSDCPIO_VERSION_STRING)
|
|
||||||
AC_SUBST(BSDTAR_VERSION_STRING)
|
|
||||||
AC_SUBST(LIBARCHIVE_VERSION_STRING)
|
|
||||||
AC_SUBST(LIBARCHIVE_VERSION_NUMBER)
|
|
||||||
|
|
||||||
AC_CONFIG_HEADERS([config.h])
|
|
||||||
AC_CONFIG_FILES([Makefile])
|
|
||||||
AC_CONFIG_FILES([build/pkgconfig/libarchive.pc])
|
|
||||||
|
|
||||||
# Check for host type
|
|
||||||
AC_CANONICAL_HOST
|
|
||||||
|
|
||||||
dnl Compilation on mingw and Cygwin needs special Makefile rules
|
|
||||||
inc_windows_files=no
|
|
||||||
inc_cygwin_files=no
|
|
||||||
case "$host_os" in
|
|
||||||
*mingw* ) inc_windows_files=yes ;;
|
|
||||||
*cygwin*) inc_cygwin_files=yes ;;
|
|
||||||
esac
|
|
||||||
AM_CONDITIONAL([INC_WINDOWS_FILES], [test $inc_windows_files = yes])
|
|
||||||
AM_CONDITIONAL([INC_CYGWIN_FILES], [test $inc_cygwin_files = yes])
|
|
||||||
|
|
||||||
dnl Defines that are required for specific platforms (e.g. -D_POSIX_SOURCE, etc)
|
|
||||||
PLATFORMCPPFLAGS=
|
|
||||||
case "$host_os" in
|
|
||||||
*mingw* ) PLATFORMCPPFLAGS=-D__USE_MINGW_ANSI_STDIO ;;
|
|
||||||
esac
|
|
||||||
AC_SUBST(PLATFORMCPPFLAGS)
|
|
||||||
|
|
||||||
# Checks for programs.
|
|
||||||
AC_PROG_CC
|
|
||||||
AM_PROG_CC_C_O
|
|
||||||
AC_USE_SYSTEM_EXTENSIONS
|
|
||||||
AC_LIBTOOL_WIN32_DLL
|
|
||||||
AC_PROG_LIBTOOL
|
|
||||||
AC_CHECK_TOOL([STRIP],[strip])
|
|
||||||
|
|
||||||
#
|
|
||||||
# Options for building bsdtar.
|
|
||||||
#
|
|
||||||
# Default is to build bsdtar, but allow people to override that.
|
|
||||||
#
|
|
||||||
AC_ARG_ENABLE([bsdtar],
|
|
||||||
[AS_HELP_STRING([--enable-bsdtar], [enable build of bsdtar (default)])
|
|
||||||
AS_HELP_STRING([--enable-bsdtar=static], [force static build of bsdtar])
|
|
||||||
AS_HELP_STRING([--enable-bsdtar=shared], [force dynamic build of bsdtar])
|
|
||||||
AS_HELP_STRING([--disable-bsdtar], [disable build of bsdtar])],
|
|
||||||
[], [enable_bsdtar=yes])
|
|
||||||
|
|
||||||
case "$enable_bsdtar" in
|
|
||||||
yes)
|
|
||||||
if test "$enable_static" = "no"; then
|
|
||||||
static_bsdtar=no
|
|
||||||
else
|
|
||||||
static_bsdtar=yes
|
|
||||||
fi
|
|
||||||
build_bsdtar=yes
|
|
||||||
;;
|
|
||||||
dynamic|shared)
|
|
||||||
if test "$enable_shared" = "no"; then
|
|
||||||
AC_MSG_FAILURE([Shared linking of bsdtar requires shared libarchive])
|
|
||||||
fi
|
|
||||||
build_bsdtar=yes
|
|
||||||
static_bsdtar=no
|
|
||||||
;;
|
|
||||||
static)
|
|
||||||
build_bsdtar=yes
|
|
||||||
static_bsdtar=yes
|
|
||||||
;;
|
|
||||||
no)
|
|
||||||
build_bsdtar=no
|
|
||||||
static_bsdtar=no
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
AC_MSG_FAILURE([Unsupported value for --enable-bsdtar])
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AM_CONDITIONAL([BUILD_BSDTAR], [ test "$build_bsdtar" = yes ])
|
|
||||||
AM_CONDITIONAL([STATIC_BSDTAR], [ test "$static_bsdtar" = yes ])
|
|
||||||
|
|
||||||
#
|
|
||||||
# Options for building bsdcpio.
|
|
||||||
#
|
|
||||||
# Default is not to build bsdcpio, but that can be overridden.
|
|
||||||
#
|
|
||||||
AC_ARG_ENABLE([bsdcpio],
|
|
||||||
[AS_HELP_STRING([--enable-bsdcpio], [enable build of bsdcpio (default)])
|
|
||||||
AS_HELP_STRING([--enable-bsdcpio=static], [static build of bsdcpio])
|
|
||||||
AS_HELP_STRING([--enable-bsdcpio=shared], [dynamic build of bsdcpio])
|
|
||||||
AS_HELP_STRING([--disable-bsdcpio], [disable build of bsdcpio])],
|
|
||||||
[], [enable_bsdcpio=yes])
|
|
||||||
|
|
||||||
case "$enable_bsdcpio" in
|
|
||||||
yes)
|
|
||||||
if test "$enable_static" = "no"; then
|
|
||||||
static_bsdcpio=no
|
|
||||||
else
|
|
||||||
static_bsdcpio=yes
|
|
||||||
fi
|
|
||||||
build_bsdcpio=yes
|
|
||||||
;;
|
|
||||||
dynamic|shared)
|
|
||||||
if test "$enabled_shared" = "no"; then
|
|
||||||
AC_MSG_FAILURE([Shared linking of bsdcpio requires shared libarchive])
|
|
||||||
fi
|
|
||||||
build_bsdcpio=yes
|
|
||||||
;;
|
|
||||||
static)
|
|
||||||
build_bsdcpio=yes
|
|
||||||
static_bsdcpio=yes
|
|
||||||
;;
|
|
||||||
no)
|
|
||||||
build_bsdcpio=no
|
|
||||||
static_bsdcpio=no
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
AC_MSG_FAILURE([Unsupported value for --enable-bsdcpio])
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AM_CONDITIONAL([BUILD_BSDCPIO], [ test "$build_bsdcpio" = yes ])
|
|
||||||
AM_CONDITIONAL([STATIC_BSDCPIO], [ test "$static_bsdcpio" = yes ])
|
|
||||||
|
|
||||||
# Set up defines needed before including any headers
|
|
||||||
case $host in
|
|
||||||
*mingw* | *cygwin* )
|
|
||||||
AC_DEFINE([_WIN32_WINNT], 0x0500, [Define to '0x0500' for Windows 2000 APIs.])
|
|
||||||
AC_DEFINE([WINVER], 0x0500, [Define to '0x0500' for Windows 2000 APIs.])
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Checks for header files.
|
|
||||||
AC_HEADER_DIRENT
|
|
||||||
AC_HEADER_SYS_WAIT
|
|
||||||
AC_CHECK_HEADERS([acl/libacl.h attr/xattr.h copyfile.h ctype.h])
|
|
||||||
AC_CHECK_HEADERS([errno.h ext2fs/ext2_fs.h fcntl.h grp.h])
|
|
||||||
|
|
||||||
AC_CACHE_CHECK([whether EXT2_IOC_GETFLAGS is usable],
|
|
||||||
[ac_cv_have_decl_EXT2_IOC_GETFLAGS],
|
|
||||||
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <sys/ioctl.h>
|
|
||||||
@%:@include <ext2fs/ext2_fs.h>],
|
|
||||||
[int x = EXT2_IOC_GETFLAGS])],
|
|
||||||
[AS_VAR_SET([ac_cv_have_decl_EXT2_IOC_GETFLAGS], [yes])],
|
|
||||||
[AS_VAR_SET([ac_cv_have_decl_EXT2_IOC_GETFLAGS], [no])])])
|
|
||||||
|
|
||||||
AS_VAR_IF([ac_cv_have_decl_EXT2_IOC_GETFLAGS], [yes],
|
|
||||||
[AC_DEFINE_UNQUOTED([HAVE_WORKING_EXT2_IOC_GETFLAGS], [1],
|
|
||||||
[Define to 1 if you have a working EXT2_IOC_GETFLAGS])])
|
|
||||||
|
|
||||||
AC_CHECK_HEADERS([inttypes.h io.h langinfo.h limits.h])
|
|
||||||
AC_CHECK_HEADERS([linux/fiemap.h linux/fs.h linux/magic.h linux/types.h])
|
|
||||||
AC_CHECK_HEADERS([locale.h paths.h poll.h pwd.h signal.h spawn.h])
|
|
||||||
AC_CHECK_HEADERS([stdarg.h stdint.h stdlib.h string.h])
|
|
||||||
AC_CHECK_HEADERS([sys/acl.h sys/cdefs.h sys/extattr.h])
|
|
||||||
AC_CHECK_HEADERS([sys/ioctl.h sys/mkdev.h sys/mount.h])
|
|
||||||
AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/select.h sys/statfs.h sys/statvfs.h])
|
|
||||||
AC_CHECK_HEADERS([sys/time.h sys/utime.h sys/utsname.h sys/vfs.h])
|
|
||||||
AC_CHECK_HEADERS([time.h unistd.h utime.h wchar.h wctype.h])
|
|
||||||
AC_CHECK_HEADERS([windows.h])
|
|
||||||
# check windows.h first; the other headers require it.
|
|
||||||
AC_CHECK_HEADERS([wincrypt.h winioctl.h],[],[],
|
|
||||||
[[#ifdef HAVE_WINDOWS_H
|
|
||||||
# include <windows.h>
|
|
||||||
#endif
|
|
||||||
]])
|
|
||||||
|
|
||||||
# Checks for libraries.
|
|
||||||
AC_ARG_WITH([zlib],
|
|
||||||
AS_HELP_STRING([--without-zlib], [Don't build support for gzip through zlib]))
|
|
||||||
|
|
||||||
if test "x$with_zlib" != "xno"; then
|
|
||||||
AC_CHECK_HEADERS([zlib.h])
|
|
||||||
AC_CHECK_LIB(z,inflate)
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_ARG_WITH([bz2lib],
|
|
||||||
AS_HELP_STRING([--without-bz2lib], [Don't build support for bzip2 through bz2lib]))
|
|
||||||
|
|
||||||
if test "x$with_bz2lib" != "xno"; then
|
|
||||||
AC_CHECK_HEADERS([bzlib.h])
|
|
||||||
case "$host_os" in
|
|
||||||
*mingw* | *cygwin*)
|
|
||||||
dnl AC_CHECK_LIB cannot be used on the Windows port of libbz2, therefore
|
|
||||||
dnl use AC_LINK_IFELSE.
|
|
||||||
AC_MSG_CHECKING([for BZ2_bzDecompressInit in -lbz2])
|
|
||||||
old_LIBS="$LIBS"
|
|
||||||
LIBS="-lbz2 $LIBS"
|
|
||||||
AC_LINK_IFELSE(
|
|
||||||
[AC_LANG_SOURCE(#include <bzlib.h>
|
|
||||||
int main() { return BZ2_bzDecompressInit(NULL, 0, 0); })],
|
|
||||||
[ac_cv_lib_bz2_BZ2_bzDecompressInit=yes],
|
|
||||||
[ac_cv_lib_bz2_BZ2_bzDecompressInit=no])
|
|
||||||
LIBS="$old_LIBS"
|
|
||||||
AC_MSG_RESULT($ac_cv_lib_bz2_BZ2_bzDecompressInit)
|
|
||||||
if test "x$ac_cv_lib_bz2_BZ2_bzDecompressInit" = xyes; then
|
|
||||||
AC_DEFINE([HAVE_LIBBZ2], [1], [Define to 1 if you have the `bz2' library (-lbz2).])
|
|
||||||
LIBS="-lbz2 $LIBS"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
AC_CHECK_LIB(bz2,BZ2_bzDecompressInit)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_ARG_WITH([lzmadec],
|
|
||||||
AS_HELP_STRING([--without-lzmadec], [Don't build support for lzma through lzmadec]))
|
|
||||||
|
|
||||||
if test "x$with_lzmadec" != "xno"; then
|
|
||||||
AC_CHECK_HEADERS([lzmadec.h])
|
|
||||||
AC_CHECK_LIB(lzmadec,lzmadec_decode)
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_ARG_WITH([iconv],
|
|
||||||
AS_HELP_STRING([--without-iconv], [Don't try to link against iconv]))
|
|
||||||
|
|
||||||
if test "x$with_iconv" != "xno"; then
|
|
||||||
AM_ICONV
|
|
||||||
AC_CHECK_HEADERS([iconv.h],[],[],[#include <stdlib.h>])
|
|
||||||
if test "x$am_cv_func_iconv" = "xyes"; then
|
|
||||||
AC_CHECK_HEADERS([localcharset.h])
|
|
||||||
am_save_LIBS="$LIBS"
|
|
||||||
LIBS="${LIBS} ${LIBICONV}"
|
|
||||||
AC_CHECK_FUNCS([locale_charset])
|
|
||||||
LIBS="${am_save_LIBS}"
|
|
||||||
if test "x$ac_cv_func_locale_charset" != "xyes"; then
|
|
||||||
# If locale_charset() is not in libiconv, we have to find libcharset.
|
|
||||||
AC_CHECK_LIB(charset,locale_charset)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_ARG_WITH([lzma],
|
|
||||||
AS_HELP_STRING([--without-lzma], [Don't build support for xz through lzma]))
|
|
||||||
|
|
||||||
if test "x$with_lzma" != "xno"; then
|
|
||||||
AC_CHECK_HEADERS([lzma.h])
|
|
||||||
AC_CHECK_LIB(lzma,lzma_stream_decoder)
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_ARG_WITH([lzo2],
|
|
||||||
AS_HELP_STRING([--without-lzo2], [Don't build support for lzop through liblzo2]))
|
|
||||||
|
|
||||||
if test "x$with_lzo2" != "xno"; then
|
|
||||||
AC_CHECK_HEADERS([lzo/lzoconf.h lzo/lzo1x.h])
|
|
||||||
AC_CHECK_LIB(lzo2,lzo1x_decompress_safe)
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_ARG_WITH([nettle],
|
|
||||||
AS_HELP_STRING([--without-nettle], [Don't build with crypto support from Nettle]))
|
|
||||||
AC_ARG_WITH([openssl],
|
|
||||||
AS_HELP_STRING([--without-openssl], [Don't build support for mtree and xar hashes through openssl]))
|
|
||||||
case "$host_os" in
|
|
||||||
*darwin* ) with_openssl=no ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AC_ARG_WITH([xml2],
|
|
||||||
AS_HELP_STRING([--without-xml2], [Don't build support for xar through libxml2]))
|
|
||||||
AC_ARG_WITH([expat],
|
|
||||||
AS_HELP_STRING([--without-expat], [Don't build support for xar through expat]))
|
|
||||||
|
|
||||||
if test "x$with_xml2" != "xno"; then
|
|
||||||
AC_PATH_PROG([XML2_CONFIG], [xml2-config],, [${PATH}])
|
|
||||||
if test "x$XML2_CONFIG" != "x"; then
|
|
||||||
CPPFLAGS="${CPPFLAGS} `${XML2_CONFIG} --cflags`"
|
|
||||||
LIBS="${LIBS} `${XML2_CONFIG} --libs`"
|
|
||||||
AC_CHECK_LIB(xml2,xmlInitParser,[true],AC_MSG_FAILURE(Missing xml2 library))
|
|
||||||
else
|
|
||||||
AC_CHECK_LIB(xml2,xmlInitParser)
|
|
||||||
fi
|
|
||||||
AC_CHECK_HEADERS([libxml/xmlreader.h libxml/xmlwriter.h])
|
|
||||||
fi
|
|
||||||
if test "x$ac_cv_header_libxml_xmlreader_h" != "xyes"; then
|
|
||||||
if test "x$with_expat" != "xno"; then
|
|
||||||
AC_CHECK_HEADERS([expat.h])
|
|
||||||
AC_CHECK_LIB(expat,XML_ParserCreate)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_ARG_ENABLE([posix-regex-lib],
|
|
||||||
[AS_HELP_STRING([--enable-posix-regex-lib],
|
|
||||||
[choose what library to use for POSIX regular expression support (default: auto)])
|
|
||||||
AS_HELP_STRING([--enable-posix-regex-lib=libc], [use libc POSIX regular expression support])
|
|
||||||
AS_HELP_STRING([--enable-posix-regex-lib=libregex], [use libregex POSIX regular expression support])
|
|
||||||
AS_HELP_STRING([--enable-posix-regex-lib=libpcreposix], [use libpcreposix POSIX regular expression support])
|
|
||||||
AS_HELP_STRING([--disable-posix-regex-lib], [don't enable POSIX regular expression support])],
|
|
||||||
[], [enable_posix_regex_lib=auto])
|
|
||||||
|
|
||||||
posix_regex_lib_found=
|
|
||||||
if test "$enable_posix_regex_lib" = "auto" || test "$enable_posix_regex_lib" = "libc" || test "$enable_posix_regex_lib" = "libregex"; then
|
|
||||||
AC_CHECK_HEADERS([regex.h])
|
|
||||||
if test "x$ac_cv_header_regex_h" != "xno"; then
|
|
||||||
AC_CHECK_FUNC(regcomp)
|
|
||||||
if test "x$ac_cv_func_regcomp" = xyes; then
|
|
||||||
posix_regex_lib_found=1
|
|
||||||
else
|
|
||||||
AC_CHECK_LIB(regex,regcomp)
|
|
||||||
if test "x$ac_cv_lib_regex_regcomp" = xyes; then
|
|
||||||
posix_regex_lib_found=1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test -z $posix_regex_lib_found && (test "$enable_posix_regex_lib" = "auto" || test "$enable_posix_regex_lib" = "libpcreposix"); then
|
|
||||||
AC_CHECK_HEADERS([pcreposix.h])
|
|
||||||
AC_CHECK_LIB(pcreposix,regcomp)
|
|
||||||
if test "x$ac_cv_lib_pcreposix_regcomp" != xyes; then
|
|
||||||
AC_MSG_NOTICE(trying libpcreposix check again with libpcre)
|
|
||||||
unset ac_cv_lib_pcreposix_regcomp
|
|
||||||
AC_CHECK_LIB(pcre,pcre_exec)
|
|
||||||
AC_CHECK_LIB(pcreposix,regcomp)
|
|
||||||
if test "x$ac_cv_lib_pcre_pcre_exec" = xyes && test "x$ac_cv_lib_pcreposix_regcomp" = xyes; then
|
|
||||||
AC_MSG_CHECKING(if PCRE_STATIC needs to be defined)
|
|
||||||
AC_LINK_IFELSE(
|
|
||||||
[AC_LANG_SOURCE(#include <pcreposix.h>
|
|
||||||
int main() { return regcomp(NULL, NULL, 0); })],
|
|
||||||
[without_pcre_static=yes],
|
|
||||||
[without_pcre_static=no])
|
|
||||||
AC_LINK_IFELSE(
|
|
||||||
[AC_LANG_SOURCE(#define PCRE_STATIC
|
|
||||||
#include <pcreposix.h>
|
|
||||||
int main() { return regcomp(NULL, NULL, 0); })],
|
|
||||||
[with_pcre_static=yes],
|
|
||||||
[with_pcre_static=no])
|
|
||||||
if test "x$without_pcre_static" != xyes && test "x$with_pcre_static" = xyes; then
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
AC_DEFINE([PCRE_STATIC], [1], [Define to 1 if PCRE_STATIC needs to be defined.])
|
|
||||||
elif test "x$without_pcre_static" = xyes || test "x$with_pcre_static" = xyes; then
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
fi
|
|
||||||
posix_regex_lib_found=1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
posix_regex_lib_found=1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# TODO: Give the user the option of using a pre-existing system
|
|
||||||
# libarchive. This will define HAVE_LIBARCHIVE which will cause
|
|
||||||
# bsdtar_platform.h to use #include <...> for the libarchive headers.
|
|
||||||
# Need to include Makefile.am magic to link against system
|
|
||||||
# -larchive in that case.
|
|
||||||
#AC_CHECK_LIB(archive,archive_version)
|
|
||||||
|
|
||||||
# Checks for typedefs, structures, and compiler characteristics.
|
|
||||||
AC_C_CONST
|
|
||||||
# AC_TYPE_UID_T defaults to "int", which is incorrect for MinGW
|
|
||||||
# and MSVC. Use a customized version.
|
|
||||||
la_TYPE_UID_T
|
|
||||||
AC_TYPE_MODE_T
|
|
||||||
# AC_TYPE_OFF_T defaults to "long", which limits us to 4GB files on
|
|
||||||
# most systems... default to "long long" instead.
|
|
||||||
AC_CHECK_TYPE(off_t, [long long])
|
|
||||||
AC_TYPE_SIZE_T
|
|
||||||
AC_CHECK_TYPE(id_t, [unsigned long])
|
|
||||||
AC_CHECK_TYPE(uintptr_t, [unsigned int])
|
|
||||||
|
|
||||||
# Check for tm_gmtoff in struct tm
|
|
||||||
AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,
|
|
||||||
[
|
|
||||||
#include <time.h>
|
|
||||||
])
|
|
||||||
|
|
||||||
# Check for f_namemax in struct statfs
|
|
||||||
AC_CHECK_MEMBERS([struct statfs.f_namemax],,,
|
|
||||||
[
|
|
||||||
#include <sys/param.h>
|
|
||||||
#include <sys/mount.h>
|
|
||||||
])
|
|
||||||
|
|
||||||
# Check for f_iosize in struct statvfs
|
|
||||||
AC_CHECK_MEMBERS([struct statvfs.f_iosize],,,
|
|
||||||
[
|
|
||||||
#include <sys/statvfs.h>
|
|
||||||
])
|
|
||||||
|
|
||||||
# Check for birthtime in struct stat
|
|
||||||
AC_CHECK_MEMBERS([struct stat.st_birthtime])
|
|
||||||
|
|
||||||
# Check for high-resolution timestamps in struct stat
|
|
||||||
AC_CHECK_MEMBERS([struct stat.st_birthtimespec.tv_nsec])
|
|
||||||
AC_CHECK_MEMBERS([struct stat.st_mtimespec.tv_nsec])
|
|
||||||
AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec])
|
|
||||||
AC_CHECK_MEMBERS([struct stat.st_mtime_n]) # AIX
|
|
||||||
AC_CHECK_MEMBERS([struct stat.st_umtime]) # Tru64
|
|
||||||
AC_CHECK_MEMBERS([struct stat.st_mtime_usec]) # Hurd
|
|
||||||
# Check for block size support in struct stat
|
|
||||||
AC_CHECK_MEMBERS([struct stat.st_blksize])
|
|
||||||
# Check for st_flags in struct stat (BSD fflags)
|
|
||||||
AC_CHECK_MEMBERS([struct stat.st_flags])
|
|
||||||
|
|
||||||
# If you have uintmax_t, we assume printf supports %ju
|
|
||||||
# If you have unsigned long long, we assume printf supports %llu
|
|
||||||
# TODO: Check for %ju and %llu support directly.
|
|
||||||
AC_CHECK_TYPES([uintmax_t, unsigned long long])
|
|
||||||
|
|
||||||
# We use C99-style integer types
|
|
||||||
# Declare them if the local platform doesn't already do so.
|
|
||||||
AC_TYPE_INTMAX_T
|
|
||||||
AC_TYPE_UINTMAX_T
|
|
||||||
AC_TYPE_INT64_T
|
|
||||||
AC_TYPE_UINT64_T
|
|
||||||
AC_TYPE_INT32_T
|
|
||||||
AC_TYPE_UINT32_T
|
|
||||||
AC_TYPE_INT16_T
|
|
||||||
AC_TYPE_UINT16_T
|
|
||||||
AC_TYPE_UINT8_T
|
|
||||||
|
|
||||||
AC_CHECK_DECLS([SIZE_MAX, INT64_MAX, INT64_MIN, UINT64_MAX, UINT32_MAX])
|
|
||||||
|
|
||||||
AC_CHECK_DECL([SSIZE_MAX],
|
|
||||||
[AC_DEFINE(HAVE_DECL_SSIZE_MAX, 1, [Define to 1 if you have the declaration of `SSIZE_MAX', and to 0 if you don't.])],
|
|
||||||
[],
|
|
||||||
[#include <limits.h>])
|
|
||||||
|
|
||||||
AC_CHECK_DECL([EFTYPE],
|
|
||||||
[AC_DEFINE(HAVE_EFTYPE, 1, [A possible errno value for invalid file format errors])],
|
|
||||||
[],
|
|
||||||
[#include <errno.h>])
|
|
||||||
AC_CHECK_DECL([EILSEQ],
|
|
||||||
[AC_DEFINE(HAVE_EILSEQ, 1, [A possible errno value for invalid file format errors])],
|
|
||||||
[],
|
|
||||||
[#include <errno.h>])
|
|
||||||
AC_CHECK_TYPE([wchar_t],
|
|
||||||
[AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]wchar_t), 1, [Define to 1 if the system has the type `wchar_t'.])dnl
|
|
||||||
AC_CHECK_SIZEOF([wchar_t])],
|
|
||||||
[])
|
|
||||||
|
|
||||||
AC_HEADER_TIME
|
|
||||||
|
|
||||||
# Checks for library functions.
|
|
||||||
AC_PROG_GCC_TRADITIONAL
|
|
||||||
AC_HEADER_MAJOR
|
|
||||||
AC_FUNC_FSEEKO
|
|
||||||
AC_FUNC_MEMCMP
|
|
||||||
AC_FUNC_LSTAT
|
|
||||||
AC_FUNC_STAT
|
|
||||||
AC_FUNC_STRERROR_R
|
|
||||||
AC_FUNC_STRFTIME
|
|
||||||
AC_FUNC_VPRINTF
|
|
||||||
# check for:
|
|
||||||
# CreateHardLinkA(LPCSTR, LPCSTR, LPSECURITY_ATTRIBUTES)
|
|
||||||
# To avoid necessity for including windows.h or special forward declaration
|
|
||||||
# workarounds, we use 'void *' for 'struct SECURITY_ATTRIBUTES *'
|
|
||||||
AC_CHECK_STDCALL_FUNC([CreateHardLinkA],[const char *, const char *, void *])
|
|
||||||
AC_CHECK_FUNCS([chflags chown chroot ctime_r dirfd])
|
|
||||||
AC_CHECK_FUNCS([fchdir fchflags fchmod fchown fcntl fdopendir fork])
|
|
||||||
AC_CHECK_FUNCS([fstat fstatat fstatfs fstatvfs ftruncate])
|
|
||||||
AC_CHECK_FUNCS([futimens futimes futimesat])
|
|
||||||
AC_CHECK_FUNCS([geteuid getpid getgrgid_r getgrnam_r])
|
|
||||||
AC_CHECK_FUNCS([getpwnam_r getpwuid_r getvfsbyname gmtime_r])
|
|
||||||
AC_CHECK_FUNCS([lchflags lchmod lchown link localtime_r lstat lutimes])
|
|
||||||
AC_CHECK_FUNCS([mbrtowc memmove memset])
|
|
||||||
AC_CHECK_FUNCS([mkdir mkfifo mknod mkstemp])
|
|
||||||
AC_CHECK_FUNCS([nl_langinfo openat pipe poll posix_spawnp readlink readlinkat])
|
|
||||||
AC_CHECK_FUNCS([select setenv setlocale sigaction statfs statvfs])
|
|
||||||
AC_CHECK_FUNCS([strchr strdup strerror strncpy_s strrchr symlink timegm])
|
|
||||||
AC_CHECK_FUNCS([tzset unsetenv utime utimensat utimes vfork])
|
|
||||||
AC_CHECK_FUNCS([wcrtomb wcscmp wcscpy wcslen wctomb wmemcmp wmemcpy])
|
|
||||||
AC_CHECK_FUNCS([_ctime64_s _fseeki64])
|
|
||||||
AC_CHECK_FUNCS([_get_timezone _localtime64_s _mkgmtime64])
|
|
||||||
# detects cygwin-1.7, as opposed to older versions
|
|
||||||
AC_CHECK_FUNCS([cygwin_conv_path])
|
|
||||||
|
|
||||||
# There are several variants of readdir_r around; we only
|
|
||||||
# accept the POSIX-compliant version.
|
|
||||||
AC_COMPILE_IFELSE(
|
|
||||||
[AC_LANG_PROGRAM([[#include <dirent.h>]],
|
|
||||||
[[DIR *dir; struct dirent e, *r;
|
|
||||||
return(readdir_r(dir, &e, &r));]])],
|
|
||||||
[AC_DEFINE(HAVE_READDIR_R,1,[Define to 1 if you have a POSIX compatible readdir_r])]
|
|
||||||
)
|
|
||||||
|
|
||||||
# FreeBSD's nl_langinfo supports an option to specify whether the
|
|
||||||
# current locale uses month/day or day/month ordering. It makes the
|
|
||||||
# output a little prettier...
|
|
||||||
AC_CHECK_DECL([D_MD_ORDER],
|
|
||||||
[AC_DEFINE(HAVE_D_MD_ORDER, 1, [Define to 1 if nl_langinfo supports D_MD_ORDER])],
|
|
||||||
[],
|
|
||||||
[#if HAVE_LANGINFO_H
|
|
||||||
#include <langinfo.h>
|
|
||||||
#endif
|
|
||||||
])
|
|
||||||
|
|
||||||
# Check for dirent.d_namlen field explicitly
|
|
||||||
# (This is a bit more straightforward than, if not quite as portable as,
|
|
||||||
# the recipe given by the autoconf maintainers.)
|
|
||||||
AC_CHECK_MEMBER(struct dirent.d_namlen,,,
|
|
||||||
[#if HAVE_DIRENT_H
|
|
||||||
#include <dirent.h>
|
|
||||||
#endif
|
|
||||||
])
|
|
||||||
|
|
||||||
# Check for Extended Attributes support
|
|
||||||
AC_ARG_ENABLE([xattr],
|
|
||||||
AS_HELP_STRING([--disable-xattr],
|
|
||||||
[Enable Extended Attributes support (default: check)]))
|
|
||||||
|
|
||||||
if test "x$enable_xattr" != "xno"; then
|
|
||||||
AC_CHECK_HEADERS([attr/xattr.h])
|
|
||||||
AC_CHECK_HEADERS([sys/xattr.h sys/ea.h])
|
|
||||||
AC_CHECK_LIB(attr,setxattr)
|
|
||||||
AC_CHECK_FUNCS([extattr_get_file extattr_list_file])
|
|
||||||
AC_CHECK_FUNCS([extattr_set_fd extattr_set_file])
|
|
||||||
AC_CHECK_FUNCS([fgetxattr flistxattr fsetxattr getxattr])
|
|
||||||
AC_CHECK_FUNCS([lgetxattr listxattr llistxattr lsetxattr])
|
|
||||||
AC_CHECK_FUNCS([fgetea flistea fsetea getea])
|
|
||||||
AC_CHECK_FUNCS([lgetea listea llistea lsetea])
|
|
||||||
AC_CHECK_DECLS([EXTATTR_NAMESPACE_USER], [], [], [#include <sys/types.h>
|
|
||||||
#include <sys/extattr.h>
|
|
||||||
])
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for ACL support
|
|
||||||
#
|
|
||||||
# The ACL support in libarchive is written against the POSIX1e draft,
|
|
||||||
# which was never officially approved and varies quite a bit across
|
|
||||||
# platforms. Worse, some systems have completely non-POSIX acl functions,
|
|
||||||
# which makes the following checks rather more complex than I would like.
|
|
||||||
#
|
|
||||||
AC_ARG_ENABLE([acl],
|
|
||||||
AS_HELP_STRING([--disable-acl],
|
|
||||||
[Enable ACL support (default: check)]))
|
|
||||||
|
|
||||||
if test "x$enable_acl" != "xno"; then
|
|
||||||
AC_CHECK_HEADERS([sys/acl.h])
|
|
||||||
AC_CHECK_LIB([acl],[acl_get_file])
|
|
||||||
AC_CHECK_FUNCS([acl_create_entry acl_init acl_set_fd acl_set_fd_np acl_set_file])
|
|
||||||
|
|
||||||
AC_CHECK_TYPES(acl_permset_t,,,
|
|
||||||
[#if HAVE_SYS_TYPES_H
|
|
||||||
#include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
#if HAVE_SYS_ACL_H
|
|
||||||
#include <sys/acl.h>
|
|
||||||
#endif
|
|
||||||
])
|
|
||||||
|
|
||||||
# The "acl_get_perm()" function was omitted from the POSIX draft.
|
|
||||||
# (It's a pretty obvious oversight; otherwise, there's no way to
|
|
||||||
# test for specific permissions in a permset.) Linux uses the obvious
|
|
||||||
# name, FreeBSD adds _np to mark it as "non-Posix extension."
|
|
||||||
# Test for both as a double-check that we really have POSIX-style ACL support.
|
|
||||||
AC_CHECK_FUNCS(acl_get_perm_np acl_get_perm acl_get_link acl_get_link_np,,,
|
|
||||||
[#if HAVE_SYS_TYPES_H
|
|
||||||
#include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
#if HAVE_SYS_ACL_H
|
|
||||||
#include <sys/acl.h>
|
|
||||||
#endif
|
|
||||||
])
|
|
||||||
|
|
||||||
# MacOS has an acl.h that isn't POSIX. It can be detected by
|
|
||||||
# checking for ACL_USER
|
|
||||||
AC_CHECK_DECL([ACL_USER],
|
|
||||||
[AC_DEFINE(HAVE_ACL_USER, 1, [True for systems with POSIX ACL support])],
|
|
||||||
[],
|
|
||||||
[#include <sys/acl.h>])
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Additional requirements
|
|
||||||
AC_SYS_LARGEFILE
|
|
||||||
|
|
||||||
dnl NOTE: Crypto checks must run last.
|
|
||||||
AC_DEFUN([CRYPTO_CHECK], [
|
|
||||||
if test "$found_$1" != yes; then
|
|
||||||
saved_CPPFLAGS="$CPPFLAGS"
|
|
||||||
CPPFLAGS="$CPPFLAGS -I. -I$srcdir -I$srcdir/libarchive"
|
|
||||||
touch "check_crypto_md.h"
|
|
||||||
AC_MSG_CHECKING([support for ARCHIVE_CRYPTO_$1_$2])
|
|
||||||
AC_LINK_IFELSE([AC_LANG_SOURCE([
|
|
||||||
#define ARCHIVE_$1_COMPILE_TEST
|
|
||||||
#define ARCHIVE_CRYPTO_$1_$2
|
|
||||||
#define PLATFORM_CONFIG_H "check_crypto_md.h"
|
|
||||||
|
|
||||||
$(cat "$srcdir/libarchive/archive_crypto.c")
|
|
||||||
|
|
||||||
int
|
|
||||||
main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
archive_$3_ctx ctx;
|
|
||||||
archive_$3_init(&ctx);
|
|
||||||
archive_$3_update(&ctx, *argv, argc);
|
|
||||||
archive_$3_final(&ctx, NULL);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
])],
|
|
||||||
[ AC_MSG_RESULT([yes])
|
|
||||||
found_$1=yes
|
|
||||||
found_$2=yes
|
|
||||||
AC_DEFINE(ARCHIVE_CRYPTO_$1_$2, 1, [ $1 via ARCHIVE_CRYPTO_$1_$2 supported.])
|
|
||||||
],
|
|
||||||
[ AC_MSG_RESULT([no])])
|
|
||||||
CPPFLAGS="$saved_CPPFLAGS"
|
|
||||||
rm "check_crypto_md.h"
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
AC_DEFUN([CRYPTO_CHECK_WIN], [
|
|
||||||
if test "$found_$1" != yes; then
|
|
||||||
AC_MSG_CHECKING([support for ARCHIVE_CRYPTO_$1_WIN])
|
|
||||||
AC_LINK_IFELSE([AC_LANG_SOURCE([
|
|
||||||
#define ARCHIVE_$1_COMPILE_TEST
|
|
||||||
#include <windows.h>
|
|
||||||
#include <wincrypt.h>
|
|
||||||
|
|
||||||
int
|
|
||||||
main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
(void)argc;
|
|
||||||
(void)argv;
|
|
||||||
|
|
||||||
return ($2);
|
|
||||||
}
|
|
||||||
])],
|
|
||||||
[ AC_MSG_RESULT([yes])
|
|
||||||
found_$1=yes
|
|
||||||
found_WIN=yes
|
|
||||||
AC_DEFINE(ARCHIVE_CRYPTO_$1_WIN, 1, [ $1 via ARCHIVE_CRYPTO_$1_WIN supported.])
|
|
||||||
],
|
|
||||||
[ AC_MSG_RESULT([no])])
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
case "$host_os" in
|
|
||||||
*mingw* | *cygwin*)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
CRYPTO_CHECK(MD5, LIBC, md5)
|
|
||||||
CRYPTO_CHECK(MD5, LIBSYSTEM, md5)
|
|
||||||
CRYPTO_CHECK(RMD160, LIBC, rmd160)
|
|
||||||
CRYPTO_CHECK(SHA1, LIBC, sha1)
|
|
||||||
CRYPTO_CHECK(SHA1, LIBSYSTEM, sha1)
|
|
||||||
CRYPTO_CHECK(SHA256, LIBC, sha256)
|
|
||||||
CRYPTO_CHECK(SHA256, LIBC2, sha256)
|
|
||||||
CRYPTO_CHECK(SHA256, LIBC3, sha256)
|
|
||||||
CRYPTO_CHECK(SHA256, LIBSYSTEM, sha256)
|
|
||||||
CRYPTO_CHECK(SHA384, LIBC, sha384)
|
|
||||||
CRYPTO_CHECK(SHA384, LIBC2, sha384)
|
|
||||||
CRYPTO_CHECK(SHA384, LIBC3, sha384)
|
|
||||||
CRYPTO_CHECK(SHA384, LIBSYSTEM, sha384)
|
|
||||||
CRYPTO_CHECK(SHA512, LIBC, sha512)
|
|
||||||
CRYPTO_CHECK(SHA512, LIBC2, sha512)
|
|
||||||
CRYPTO_CHECK(SHA512, LIBC3, sha512)
|
|
||||||
CRYPTO_CHECK(SHA512, LIBSYSTEM, sha512)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if test "x$with_nettle" != "xno"; then
|
|
||||||
AC_CHECK_HEADERS([nettle/md5.h nettle/ripemd160.h nettle/sha.h])
|
|
||||||
saved_LIBS=$LIBS
|
|
||||||
AC_CHECK_LIB(nettle,main)
|
|
||||||
CRYPTO_CHECK(MD5, NETTLE, md5)
|
|
||||||
CRYPTO_CHECK(RMD160, NETTLE, rmd160)
|
|
||||||
CRYPTO_CHECK(SHA1, NETTLE, sha1)
|
|
||||||
CRYPTO_CHECK(SHA256, NETTLE, sha256)
|
|
||||||
CRYPTO_CHECK(SHA384, NETTLE, sha384)
|
|
||||||
CRYPTO_CHECK(SHA512, NETTLE, sha512)
|
|
||||||
if test "x$found_NETTLE" != "xyes"; then
|
|
||||||
LIBS=$saved_LIBS
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if test "x$with_openssl" != "xno"; then
|
|
||||||
AC_CHECK_HEADERS([openssl/evp.h])
|
|
||||||
saved_LIBS=$LIBS
|
|
||||||
case "$host_os" in
|
|
||||||
*mingw* | *cygwin*)
|
|
||||||
case "$host_cpu" in
|
|
||||||
x86_64)
|
|
||||||
AC_CHECK_LIB(eay64,main)
|
|
||||||
if test "x$ac_cv_lib_eay64_main" != "xyes"; then
|
|
||||||
AC_CHECK_LIB(eay32,main)
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
AC_CHECK_LIB(eay32,main)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
AC_CHECK_LIB(crypto,main)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
CRYPTO_CHECK(MD5, OPENSSL, md5)
|
|
||||||
CRYPTO_CHECK(RMD160, OPENSSL, rmd160)
|
|
||||||
CRYPTO_CHECK(SHA1, OPENSSL, sha1)
|
|
||||||
CRYPTO_CHECK(SHA256, OPENSSL, sha256)
|
|
||||||
CRYPTO_CHECK(SHA384, OPENSSL, sha384)
|
|
||||||
CRYPTO_CHECK(SHA512, OPENSSL, sha512)
|
|
||||||
if test "x$found_OPENSSL" != "xyes"; then
|
|
||||||
LIBS=$saved_LIBS
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Probe libmd AFTER OpenSSL/libcrypto.
|
|
||||||
# The two are incompatible and OpenSSL is more complete.
|
|
||||||
AC_CHECK_HEADERS([md5.h ripemd.h sha.h sha256.h sha512.h])
|
|
||||||
saved_LIBS=$LIBS
|
|
||||||
AC_CHECK_LIB(md,main)
|
|
||||||
CRYPTO_CHECK(MD5, LIBMD, md5)
|
|
||||||
CRYPTO_CHECK(RMD160, LIBMD, rmd160)
|
|
||||||
CRYPTO_CHECK(SHA1, LIBMD, sha1)
|
|
||||||
CRYPTO_CHECK(SHA256, LIBMD, sha256)
|
|
||||||
CRYPTO_CHECK(SHA512, LIBMD, sha512)
|
|
||||||
if test "x$found_LIBMD" != "xyes"; then
|
|
||||||
LIBS=$saved_LIBS
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$host_os" in
|
|
||||||
*mingw* | *cygwin*)
|
|
||||||
CRYPTO_CHECK_WIN(MD5, CALG_MD5)
|
|
||||||
CRYPTO_CHECK_WIN(SHA1, CALG_SHA1)
|
|
||||||
CRYPTO_CHECK_WIN(SHA256, CALG_SHA_256)
|
|
||||||
CRYPTO_CHECK_WIN(SHA384, CALG_SHA_384)
|
|
||||||
CRYPTO_CHECK_WIN(SHA512, CALG_SHA_512)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AC_OUTPUT
|
|
|
@ -1,193 +0,0 @@
|
||||||
|
|
||||||
############################################
|
|
||||||
#
|
|
||||||
# How to build libarchive
|
|
||||||
#
|
|
||||||
############################################
|
|
||||||
|
|
||||||
# Public headers
|
|
||||||
SET(include_HEADERS
|
|
||||||
archive.h
|
|
||||||
archive_entry.h
|
|
||||||
)
|
|
||||||
|
|
||||||
# Sources and private headers
|
|
||||||
SET(libarchive_SOURCES
|
|
||||||
archive_acl.c
|
|
||||||
archive_check_magic.c
|
|
||||||
archive_cmdline.c
|
|
||||||
archive_cmdline_private.h
|
|
||||||
archive_crc32.h
|
|
||||||
archive_crypto.c
|
|
||||||
archive_crypto_private.h
|
|
||||||
archive_endian.h
|
|
||||||
archive_entry.c
|
|
||||||
archive_entry.h
|
|
||||||
archive_entry_copy_stat.c
|
|
||||||
archive_entry_link_resolver.c
|
|
||||||
archive_entry_locale.h
|
|
||||||
archive_entry_private.h
|
|
||||||
archive_entry_sparse.c
|
|
||||||
archive_entry_stat.c
|
|
||||||
archive_entry_strmode.c
|
|
||||||
archive_entry_xattr.c
|
|
||||||
archive_getdate.c
|
|
||||||
archive_match.c
|
|
||||||
archive_options.c
|
|
||||||
archive_options_private.h
|
|
||||||
archive_pathmatch.c
|
|
||||||
archive_pathmatch.h
|
|
||||||
archive_platform.h
|
|
||||||
archive_ppmd_private.h
|
|
||||||
archive_ppmd7.c
|
|
||||||
archive_ppmd7_private.h
|
|
||||||
archive_private.h
|
|
||||||
archive_rb.c
|
|
||||||
archive_rb.h
|
|
||||||
archive_read.c
|
|
||||||
archive_read_append_filter.c
|
|
||||||
archive_read_data_into_fd.c
|
|
||||||
archive_read_disk_entry_from_file.c
|
|
||||||
archive_read_disk_posix.c
|
|
||||||
archive_read_disk_private.h
|
|
||||||
archive_read_disk_set_standard_lookup.c
|
|
||||||
archive_read_extract.c
|
|
||||||
archive_read_open_fd.c
|
|
||||||
archive_read_open_file.c
|
|
||||||
archive_read_open_filename.c
|
|
||||||
archive_read_open_memory.c
|
|
||||||
archive_read_private.h
|
|
||||||
archive_read_set_format.c
|
|
||||||
archive_read_set_options.c
|
|
||||||
archive_read_support_filter_all.c
|
|
||||||
archive_read_support_filter_bzip2.c
|
|
||||||
archive_read_support_filter_compress.c
|
|
||||||
archive_read_support_filter_gzip.c
|
|
||||||
archive_read_support_filter_grzip.c
|
|
||||||
archive_read_support_filter_lrzip.c
|
|
||||||
archive_read_support_filter_lzop.c
|
|
||||||
archive_read_support_filter_none.c
|
|
||||||
archive_read_support_filter_program.c
|
|
||||||
archive_read_support_filter_rpm.c
|
|
||||||
archive_read_support_filter_uu.c
|
|
||||||
archive_read_support_filter_xz.c
|
|
||||||
archive_read_support_format_7zip.c
|
|
||||||
archive_read_support_format_all.c
|
|
||||||
archive_read_support_format_ar.c
|
|
||||||
archive_read_support_format_by_code.c
|
|
||||||
archive_read_support_format_cab.c
|
|
||||||
archive_read_support_format_cpio.c
|
|
||||||
archive_read_support_format_empty.c
|
|
||||||
archive_read_support_format_iso9660.c
|
|
||||||
archive_read_support_format_lha.c
|
|
||||||
archive_read_support_format_mtree.c
|
|
||||||
archive_read_support_format_rar.c
|
|
||||||
archive_read_support_format_raw.c
|
|
||||||
archive_read_support_format_tar.c
|
|
||||||
archive_read_support_format_xar.c
|
|
||||||
archive_read_support_format_zip.c
|
|
||||||
archive_string.c
|
|
||||||
archive_string.h
|
|
||||||
archive_string_composition.h
|
|
||||||
archive_string_sprintf.c
|
|
||||||
archive_util.c
|
|
||||||
archive_virtual.c
|
|
||||||
archive_write.c
|
|
||||||
archive_write_disk_acl.c
|
|
||||||
archive_write_disk_posix.c
|
|
||||||
archive_write_disk_private.h
|
|
||||||
archive_write_disk_set_standard_lookup.c
|
|
||||||
archive_write_private.h
|
|
||||||
archive_write_open_fd.c
|
|
||||||
archive_write_open_file.c
|
|
||||||
archive_write_open_filename.c
|
|
||||||
archive_write_open_memory.c
|
|
||||||
archive_write_add_filter.c
|
|
||||||
archive_write_add_filter_b64encode.c
|
|
||||||
archive_write_add_filter_by_name.c
|
|
||||||
archive_write_add_filter_bzip2.c
|
|
||||||
archive_write_add_filter_compress.c
|
|
||||||
archive_write_add_filter_grzip.c
|
|
||||||
archive_write_add_filter_gzip.c
|
|
||||||
archive_write_add_filter_lrzip.c
|
|
||||||
archive_write_add_filter_lzop.c
|
|
||||||
archive_write_add_filter_none.c
|
|
||||||
archive_write_add_filter_program.c
|
|
||||||
archive_write_add_filter_uuencode.c
|
|
||||||
archive_write_add_filter_xz.c
|
|
||||||
archive_write_set_format.c
|
|
||||||
archive_write_set_format_7zip.c
|
|
||||||
archive_write_set_format_ar.c
|
|
||||||
archive_write_set_format_by_name.c
|
|
||||||
archive_write_set_format_cpio.c
|
|
||||||
archive_write_set_format_cpio_newc.c
|
|
||||||
archive_write_set_format_gnutar.c
|
|
||||||
archive_write_set_format_iso9660.c
|
|
||||||
archive_write_set_format_mtree.c
|
|
||||||
archive_write_set_format_pax.c
|
|
||||||
archive_write_set_format_shar.c
|
|
||||||
archive_write_set_format_ustar.c
|
|
||||||
archive_write_set_format_v7tar.c
|
|
||||||
archive_write_set_format_xar.c
|
|
||||||
archive_write_set_format_zip.c
|
|
||||||
archive_write_set_options.c
|
|
||||||
filter_fork_posix.c
|
|
||||||
filter_fork.h
|
|
||||||
)
|
|
||||||
|
|
||||||
# Man pages
|
|
||||||
SET(libarchive_MANS
|
|
||||||
archive_entry.3
|
|
||||||
archive_entry_acl.3
|
|
||||||
archive_entry_linkify.3
|
|
||||||
archive_entry_paths.3
|
|
||||||
archive_entry_perms.3
|
|
||||||
archive_entry_stat.3
|
|
||||||
archive_entry_time.3
|
|
||||||
archive_read.3
|
|
||||||
archive_read_disk.3
|
|
||||||
archive_read_set_options.3
|
|
||||||
archive_util.3
|
|
||||||
archive_write.3
|
|
||||||
archive_write_disk.3
|
|
||||||
archive_write_set_options.3
|
|
||||||
cpio.5
|
|
||||||
libarchive.3
|
|
||||||
libarchive_internals.3
|
|
||||||
libarchive-formats.5
|
|
||||||
mtree.5
|
|
||||||
tar.5
|
|
||||||
)
|
|
||||||
|
|
||||||
IF(WIN32 AND NOT CYGWIN)
|
|
||||||
LIST(APPEND libarchive_SOURCES archive_entry_copy_bhfi.c)
|
|
||||||
LIST(APPEND libarchive_SOURCES archive_read_disk_windows.c)
|
|
||||||
LIST(APPEND libarchive_SOURCES archive_windows.c)
|
|
||||||
LIST(APPEND libarchive_SOURCES archive_windows.h)
|
|
||||||
LIST(APPEND libarchive_SOURCES archive_write_disk_windows.c)
|
|
||||||
LIST(APPEND libarchive_SOURCES filter_fork_windows.c)
|
|
||||||
ENDIF(WIN32 AND NOT CYGWIN)
|
|
||||||
|
|
||||||
# Libarchive is a shared library
|
|
||||||
ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
|
|
||||||
TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
|
|
||||||
SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
|
|
||||||
|
|
||||||
# archive_static is a static library
|
|
||||||
ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
|
|
||||||
SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
|
|
||||||
LIBARCHIVE_STATIC)
|
|
||||||
# On Posix systems, libarchive.so and libarchive.a can co-exist.
|
|
||||||
IF(NOT WIN32 OR CYGWIN)
|
|
||||||
SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
|
|
||||||
ENDIF(NOT WIN32 OR CYGWIN)
|
|
||||||
|
|
||||||
# How to install the libraries
|
|
||||||
INSTALL(TARGETS archive archive_static
|
|
||||||
RUNTIME DESTINATION bin
|
|
||||||
LIBRARY DESTINATION lib
|
|
||||||
ARCHIVE DESTINATION lib)
|
|
||||||
INSTALL_MAN(${libarchive_MANS})
|
|
||||||
INSTALL(FILES ${include_HEADERS} DESTINATION include)
|
|
||||||
|
|
||||||
add_subdirectory(test)
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,87 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2010 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* $FreeBSD$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __LIBARCHIVE_BUILD
|
|
||||||
#error This header is only to be used internally to libarchive.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_ACL_PRIVATE_H_INCLUDED
|
|
||||||
#define ARCHIVE_ACL_PRIVATE_H_INCLUDED
|
|
||||||
|
|
||||||
#include "archive_string.h"
|
|
||||||
|
|
||||||
struct archive_acl_entry {
|
|
||||||
struct archive_acl_entry *next;
|
|
||||||
int type; /* E.g., access or default */
|
|
||||||
int tag; /* E.g., user/group/other/mask */
|
|
||||||
int permset; /* r/w/x bits */
|
|
||||||
int id; /* uid/gid for user/group */
|
|
||||||
struct archive_mstring name; /* uname/gname */
|
|
||||||
};
|
|
||||||
|
|
||||||
struct archive_acl {
|
|
||||||
mode_t mode;
|
|
||||||
struct archive_acl_entry *acl_head;
|
|
||||||
struct archive_acl_entry *acl_p;
|
|
||||||
int acl_state; /* See acl_next for details. */
|
|
||||||
wchar_t *acl_text_w;
|
|
||||||
char *acl_text;
|
|
||||||
int acl_types;
|
|
||||||
};
|
|
||||||
|
|
||||||
void archive_acl_clear(struct archive_acl *);
|
|
||||||
void archive_acl_copy(struct archive_acl *, struct archive_acl *);
|
|
||||||
int archive_acl_count(struct archive_acl *, int);
|
|
||||||
int archive_acl_reset(struct archive_acl *, int);
|
|
||||||
int archive_acl_next(struct archive *, struct archive_acl *, int,
|
|
||||||
int *, int *, int *, int *, const char **);
|
|
||||||
|
|
||||||
int archive_acl_add_entry(struct archive_acl *, int, int, int, int, const char *);
|
|
||||||
int archive_acl_add_entry_w_len(struct archive_acl *,
|
|
||||||
int, int, int, int, const wchar_t *, size_t);
|
|
||||||
int archive_acl_add_entry_len(struct archive_acl *,
|
|
||||||
int, int, int, int, const char *, size_t);
|
|
||||||
|
|
||||||
const wchar_t *archive_acl_text_w(struct archive *, struct archive_acl *, int);
|
|
||||||
int archive_acl_text_l(struct archive_acl *, int, const char **, size_t *,
|
|
||||||
struct archive_string_conv *);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Private ACL parser. This is private because it handles some
|
|
||||||
* very weird formats that clients should not be messing with.
|
|
||||||
* Clients should only deal with their platform-native formats.
|
|
||||||
* Because of the need to support many formats cleanly, new arguments
|
|
||||||
* are likely to get added on a regular basis. Clients who try to use
|
|
||||||
* this interface are likely to be surprised when it changes.
|
|
||||||
*/
|
|
||||||
int archive_acl_parse_w(struct archive_acl *,
|
|
||||||
const wchar_t *, int /* type */);
|
|
||||||
int archive_acl_parse_l(struct archive_acl *,
|
|
||||||
const char *, int /* type */,
|
|
||||||
struct archive_string_conv *);
|
|
||||||
|
|
||||||
#endif /* ARCHIVE_ENTRY_PRIVATE_H_INCLUDED */
|
|
|
@ -1,175 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2010 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD: head/lib/libarchive/archive_check_magic.c 201089 2009-12-28 02:20:23Z kientzle $");
|
|
||||||
|
|
||||||
#ifdef HAVE_SYS_TYPES_H
|
|
||||||
#include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#ifdef HAVE_STDLIB_H
|
|
||||||
#include <stdlib.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_STRING_H
|
|
||||||
#include <string.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_UNISTD_H
|
|
||||||
#include <unistd.h>
|
|
||||||
#endif
|
|
||||||
#if defined(_WIN32) && !defined(__CYGWIN__)
|
|
||||||
#include <windows.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "archive_private.h"
|
|
||||||
|
|
||||||
static void
|
|
||||||
errmsg(const char *m)
|
|
||||||
{
|
|
||||||
size_t s = strlen(m);
|
|
||||||
ssize_t written;
|
|
||||||
|
|
||||||
while (s > 0) {
|
|
||||||
written = write(2, m, strlen(m));
|
|
||||||
if (written <= 0)
|
|
||||||
return;
|
|
||||||
m += written;
|
|
||||||
s -= written;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
diediedie(void)
|
|
||||||
{
|
|
||||||
#if defined(_WIN32) && !defined(__CYGWIN__) && defined(_DEBUG)
|
|
||||||
/* Cause a breakpoint exception */
|
|
||||||
DebugBreak();
|
|
||||||
#endif
|
|
||||||
abort(); /* Terminate the program abnormally. */
|
|
||||||
}
|
|
||||||
|
|
||||||
static const char *
|
|
||||||
state_name(unsigned s)
|
|
||||||
{
|
|
||||||
switch (s) {
|
|
||||||
case ARCHIVE_STATE_NEW: return ("new");
|
|
||||||
case ARCHIVE_STATE_HEADER: return ("header");
|
|
||||||
case ARCHIVE_STATE_DATA: return ("data");
|
|
||||||
case ARCHIVE_STATE_EOF: return ("eof");
|
|
||||||
case ARCHIVE_STATE_CLOSED: return ("closed");
|
|
||||||
case ARCHIVE_STATE_FATAL: return ("fatal");
|
|
||||||
default: return ("??");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static const char *
|
|
||||||
archive_handle_type_name(unsigned m)
|
|
||||||
{
|
|
||||||
switch (m) {
|
|
||||||
case ARCHIVE_WRITE_MAGIC: return ("archive_write");
|
|
||||||
case ARCHIVE_READ_MAGIC: return ("archive_read");
|
|
||||||
case ARCHIVE_WRITE_DISK_MAGIC: return ("archive_write_disk");
|
|
||||||
case ARCHIVE_READ_DISK_MAGIC: return ("archive_read_disk");
|
|
||||||
case ARCHIVE_MATCH_MAGIC: return ("archive_match");
|
|
||||||
default: return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static char *
|
|
||||||
write_all_states(char *buff, unsigned int states)
|
|
||||||
{
|
|
||||||
unsigned int lowbit;
|
|
||||||
|
|
||||||
buff[0] = '\0';
|
|
||||||
|
|
||||||
/* A trick for computing the lowest set bit. */
|
|
||||||
while ((lowbit = states & (1 + ~states)) != 0) {
|
|
||||||
states &= ~lowbit; /* Clear the low bit. */
|
|
||||||
strcat(buff, state_name(lowbit));
|
|
||||||
if (states != 0)
|
|
||||||
strcat(buff, "/");
|
|
||||||
}
|
|
||||||
return buff;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Check magic value and current state.
|
|
||||||
* Magic value mismatches are fatal and result in calls to abort().
|
|
||||||
* State mismatches return ARCHIVE_FATAL.
|
|
||||||
* Otherwise, returns ARCHIVE_OK.
|
|
||||||
*
|
|
||||||
* This is designed to catch serious programming errors that violate
|
|
||||||
* the libarchive API.
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
__archive_check_magic(struct archive *a, unsigned int magic,
|
|
||||||
unsigned int state, const char *function)
|
|
||||||
{
|
|
||||||
char states1[64];
|
|
||||||
char states2[64];
|
|
||||||
const char *handle_type;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If this isn't some form of archive handle,
|
|
||||||
* then the library user has screwed up so bad that
|
|
||||||
* we don't even have a reliable way to report an error.
|
|
||||||
*/
|
|
||||||
handle_type = archive_handle_type_name(a->magic);
|
|
||||||
|
|
||||||
if (!handle_type) {
|
|
||||||
errmsg("PROGRAMMER ERROR: Function ");
|
|
||||||
errmsg(function);
|
|
||||||
errmsg(" invoked with invalid archive handle.\n");
|
|
||||||
diediedie();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (a->magic != magic) {
|
|
||||||
archive_set_error(a, -1,
|
|
||||||
"PROGRAMMER ERROR: Function '%s' invoked"
|
|
||||||
" on '%s' archive object, which is not supported.",
|
|
||||||
function,
|
|
||||||
handle_type);
|
|
||||||
a->state = ARCHIVE_STATE_FATAL;
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((a->state & state) == 0) {
|
|
||||||
/* If we're already FATAL, don't overwrite the error. */
|
|
||||||
if (a->state != ARCHIVE_STATE_FATAL)
|
|
||||||
archive_set_error(a, -1,
|
|
||||||
"INTERNAL ERROR: Function '%s' invoked with"
|
|
||||||
" archive structure in state '%s',"
|
|
||||||
" should be in state '%s'",
|
|
||||||
function,
|
|
||||||
write_all_states(states1, a->state),
|
|
||||||
write_all_states(states2, state));
|
|
||||||
a->state = ARCHIVE_STATE_FATAL;
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
return ARCHIVE_OK;
|
|
||||||
}
|
|
|
@ -1,227 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2012 Michihiro NAKAJIMA
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifdef HAVE_STRING_H
|
|
||||||
# include <string.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_STDLIB_H
|
|
||||||
# include <stdlib.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "archive.h"
|
|
||||||
#include "archive_cmdline_private.h"
|
|
||||||
#include "archive_string.h"
|
|
||||||
|
|
||||||
static int cmdline_set_path(struct archive_cmdline *, const char *);
|
|
||||||
static int cmdline_add_arg(struct archive_cmdline *, const char *);
|
|
||||||
|
|
||||||
static ssize_t
|
|
||||||
extract_quotation(struct archive_string *as, const char *p)
|
|
||||||
{
|
|
||||||
const char *s;
|
|
||||||
|
|
||||||
for (s = p + 1; *s;) {
|
|
||||||
if (*s == '\\') {
|
|
||||||
if (s[1] != '\0') {
|
|
||||||
archive_strappend_char(as, s[1]);
|
|
||||||
s += 2;
|
|
||||||
} else
|
|
||||||
s++;
|
|
||||||
} else if (*s == '"')
|
|
||||||
break;
|
|
||||||
else {
|
|
||||||
archive_strappend_char(as, s[0]);
|
|
||||||
s++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (*s != '"')
|
|
||||||
return (ARCHIVE_FAILED);/* Invalid sequence. */
|
|
||||||
return ((ssize_t)(s + 1 - p));
|
|
||||||
}
|
|
||||||
|
|
||||||
static ssize_t
|
|
||||||
get_argument(struct archive_string *as, const char *p)
|
|
||||||
{
|
|
||||||
const char *s = p;
|
|
||||||
|
|
||||||
archive_string_empty(as);
|
|
||||||
|
|
||||||
/* Skip beginning space characters. */
|
|
||||||
while (*s != '\0' && *s == ' ')
|
|
||||||
s++;
|
|
||||||
/* Copy non-space characters. */
|
|
||||||
while (*s != '\0' && *s != ' ') {
|
|
||||||
if (*s == '\\') {
|
|
||||||
if (s[1] != '\0') {
|
|
||||||
archive_strappend_char(as, s[1]);
|
|
||||||
s += 2;
|
|
||||||
} else {
|
|
||||||
s++;/* Ignore this character.*/
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
} else if (*s == '"') {
|
|
||||||
ssize_t q = extract_quotation(as, s);
|
|
||||||
if (q < 0)
|
|
||||||
return (ARCHIVE_FAILED);/* Invalid sequence. */
|
|
||||||
s += q;
|
|
||||||
} else {
|
|
||||||
archive_strappend_char(as, s[0]);
|
|
||||||
s++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ((ssize_t)(s - p));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Set up command line arguments.
|
|
||||||
* Returns ARChIVE_OK if everything okey.
|
|
||||||
* Returns ARChIVE_FAILED if there is a lack of the `"' terminator or an
|
|
||||||
* empty command line.
|
|
||||||
* Returns ARChIVE_FATAL if no memory.
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
__archive_cmdline_parse(struct archive_cmdline *data, const char *cmd)
|
|
||||||
{
|
|
||||||
struct archive_string as;
|
|
||||||
const char *p;
|
|
||||||
ssize_t al;
|
|
||||||
int r;
|
|
||||||
|
|
||||||
archive_string_init(&as);
|
|
||||||
|
|
||||||
/* Get first argument as a command path. */
|
|
||||||
al = get_argument(&as, cmd);
|
|
||||||
if (al < 0) {
|
|
||||||
r = ARCHIVE_FAILED;/* Invalid sequence. */
|
|
||||||
goto exit_function;
|
|
||||||
}
|
|
||||||
if (archive_strlen(&as) == 0) {
|
|
||||||
r = ARCHIVE_FAILED;/* An empty command path. */
|
|
||||||
goto exit_function;
|
|
||||||
}
|
|
||||||
r = cmdline_set_path(data, as.s);
|
|
||||||
if (r != ARCHIVE_OK)
|
|
||||||
goto exit_function;
|
|
||||||
p = strrchr(as.s, '/');
|
|
||||||
if (p == NULL)
|
|
||||||
p = as.s;
|
|
||||||
else
|
|
||||||
p++;
|
|
||||||
r = cmdline_add_arg(data, p);
|
|
||||||
if (r != ARCHIVE_OK)
|
|
||||||
goto exit_function;
|
|
||||||
cmd += al;
|
|
||||||
|
|
||||||
for (;;) {
|
|
||||||
al = get_argument(&as, cmd);
|
|
||||||
if (al < 0) {
|
|
||||||
r = ARCHIVE_FAILED;/* Invalid sequence. */
|
|
||||||
goto exit_function;
|
|
||||||
}
|
|
||||||
if (al == 0)
|
|
||||||
break;
|
|
||||||
cmd += al;
|
|
||||||
if (archive_strlen(&as) == 0 && *cmd == '\0')
|
|
||||||
break;
|
|
||||||
r = cmdline_add_arg(data, as.s);
|
|
||||||
if (r != ARCHIVE_OK)
|
|
||||||
goto exit_function;
|
|
||||||
}
|
|
||||||
r = ARCHIVE_OK;
|
|
||||||
exit_function:
|
|
||||||
archive_string_free(&as);
|
|
||||||
return (r);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Set the program path.
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
cmdline_set_path(struct archive_cmdline *data, const char *path)
|
|
||||||
{
|
|
||||||
char *newptr;
|
|
||||||
|
|
||||||
newptr = realloc(data->path, strlen(path) + 1);
|
|
||||||
if (newptr == NULL)
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
data->path = newptr;
|
|
||||||
strcpy(data->path, path);
|
|
||||||
return (ARCHIVE_OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Add a argument for the program.
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
cmdline_add_arg(struct archive_cmdline *data, const char *arg)
|
|
||||||
{
|
|
||||||
char **newargv;
|
|
||||||
|
|
||||||
if (data->path == NULL)
|
|
||||||
return (ARCHIVE_FAILED);
|
|
||||||
|
|
||||||
newargv = realloc(data->argv, (data->argc + 2) * sizeof(char *));
|
|
||||||
if (newargv == NULL)
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
data->argv = newargv;
|
|
||||||
data->argv[data->argc] = strdup(arg);
|
|
||||||
if (data->argv[data->argc] == NULL)
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
/* Set the terminator of argv. */
|
|
||||||
data->argv[++data->argc] = NULL;
|
|
||||||
return (ARCHIVE_OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
struct archive_cmdline *
|
|
||||||
__archive_cmdline_allocate(void)
|
|
||||||
{
|
|
||||||
return (struct archive_cmdline *)
|
|
||||||
calloc(1, sizeof(struct archive_cmdline));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Release the resources.
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
__archive_cmdline_free(struct archive_cmdline *data)
|
|
||||||
{
|
|
||||||
|
|
||||||
if (data) {
|
|
||||||
free(data->path);
|
|
||||||
if (data->argv != NULL) {
|
|
||||||
int i;
|
|
||||||
for (i = 0; data->argv[i] != NULL; i++)
|
|
||||||
free(data->argv[i]);
|
|
||||||
free(data->argv);
|
|
||||||
}
|
|
||||||
free(data);
|
|
||||||
}
|
|
||||||
return (ARCHIVE_OK);
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,47 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2012 Michihiro NAKAJIMA
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* $FreeBSD$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __LIBARCHIVE_BUILD
|
|
||||||
#ifndef __LIBARCHIVE_TEST
|
|
||||||
#error This header is only to be used internally to libarchive.
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_CMDLINE_PRIVATE_H
|
|
||||||
#define ARCHIVE_CMDLINE_PRIVATE_H
|
|
||||||
|
|
||||||
struct archive_cmdline {
|
|
||||||
char *path;
|
|
||||||
char **argv;
|
|
||||||
int argc;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct archive_cmdline *__archive_cmdline_allocate(void);
|
|
||||||
int __archive_cmdline_parse(struct archive_cmdline *, const char *);
|
|
||||||
int __archive_cmdline_free(struct archive_cmdline *);
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,78 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2009 Joerg Sonnenberger
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* $FreeBSD: head/lib/libarchive/archive_crc32.h 201102 2009-12-28 03:11:36Z kientzle $
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __LIBARCHIVE_BUILD
|
|
||||||
#error This header is only to be used internally to libarchive.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* When zlib is unavailable, we should still be able to validate
|
|
||||||
* uncompressed zip archives. That requires us to be able to compute
|
|
||||||
* the CRC32 check value. This is a drop-in compatible replacement
|
|
||||||
* for crc32() from zlib. It's slower than the zlib implementation,
|
|
||||||
* but still pretty fast: This runs about 300MB/s on my 3GHz P4
|
|
||||||
* compared to about 800MB/s for the zlib implementation.
|
|
||||||
*/
|
|
||||||
static unsigned long
|
|
||||||
crc32(unsigned long crc, const void *_p, size_t len)
|
|
||||||
{
|
|
||||||
unsigned long crc2, b, i;
|
|
||||||
const unsigned char *p = _p;
|
|
||||||
static volatile int crc_tbl_inited = 0;
|
|
||||||
static unsigned long crc_tbl[256];
|
|
||||||
|
|
||||||
if (!crc_tbl_inited) {
|
|
||||||
for (b = 0; b < 256; ++b) {
|
|
||||||
crc2 = b;
|
|
||||||
for (i = 8; i > 0; --i) {
|
|
||||||
if (crc2 & 1)
|
|
||||||
crc2 = (crc2 >> 1) ^ 0xedb88320UL;
|
|
||||||
else
|
|
||||||
crc2 = (crc2 >> 1);
|
|
||||||
}
|
|
||||||
crc_tbl[b] = crc2;
|
|
||||||
}
|
|
||||||
crc_tbl_inited = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
crc = crc ^ 0xffffffffUL;
|
|
||||||
/* A use of this loop is about 20% - 30% faster than
|
|
||||||
* no use version in any optimization option of gcc. */
|
|
||||||
for (;len >= 8; len -= 8) {
|
|
||||||
crc = crc_tbl[(crc ^ *p++) & 0xff] ^ (crc >> 8);
|
|
||||||
crc = crc_tbl[(crc ^ *p++) & 0xff] ^ (crc >> 8);
|
|
||||||
crc = crc_tbl[(crc ^ *p++) & 0xff] ^ (crc >> 8);
|
|
||||||
crc = crc_tbl[(crc ^ *p++) & 0xff] ^ (crc >> 8);
|
|
||||||
crc = crc_tbl[(crc ^ *p++) & 0xff] ^ (crc >> 8);
|
|
||||||
crc = crc_tbl[(crc ^ *p++) & 0xff] ^ (crc >> 8);
|
|
||||||
crc = crc_tbl[(crc ^ *p++) & 0xff] ^ (crc >> 8);
|
|
||||||
crc = crc_tbl[(crc ^ *p++) & 0xff] ^ (crc >> 8);
|
|
||||||
}
|
|
||||||
while (len--)
|
|
||||||
crc = crc_tbl[(crc ^ *p++) & 0xff] ^ (crc >> 8);
|
|
||||||
return (crc ^ 0xffffffffUL);
|
|
||||||
}
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,376 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* Copyright (c) 2011 Andres Mejia
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __LIBARCHIVE_BUILD
|
|
||||||
#error This header is only to be used internally to libarchive.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_CRYPTO_PRIVATE_H_INCLUDED
|
|
||||||
#define ARCHIVE_CRYPTO_PRIVATE_H_INCLUDED
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Crypto support in various Operating Systems:
|
|
||||||
*
|
|
||||||
* NetBSD:
|
|
||||||
* - MD5 and SHA1 in libc: without _ after algorithm name
|
|
||||||
* - SHA2 in libc: with _ after algorithm name
|
|
||||||
*
|
|
||||||
* OpenBSD:
|
|
||||||
* - MD5, SHA1 and SHA2 in libc: without _ after algorithm name
|
|
||||||
* - OpenBSD 4.4 and earlier have SHA2 in libc with _ after algorithm name
|
|
||||||
*
|
|
||||||
* DragonFly and FreeBSD:
|
|
||||||
* - MD5 libmd: without _ after algorithm name
|
|
||||||
* - SHA1, SHA256 and SHA512 in libmd: with _ after algorithm name
|
|
||||||
*
|
|
||||||
* Mac OS X (10.4 and later):
|
|
||||||
* - MD5, SHA1 and SHA2 in libSystem: with CC_ prefix and _ after algorithm name
|
|
||||||
*
|
|
||||||
* OpenSSL:
|
|
||||||
* - MD5, SHA1 and SHA2 in libcrypto: with _ after algorithm name
|
|
||||||
*
|
|
||||||
* Windows:
|
|
||||||
* - MD5, SHA1 and SHA2 in archive_crypto.c using Windows crypto API
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* libc crypto headers */
|
|
||||||
#if defined(ARCHIVE_CRYPTO_MD5_LIBC)
|
|
||||||
#include <md5.h>
|
|
||||||
#endif
|
|
||||||
#if defined(ARCHIVE_CRYPTO_RMD160_LIBC)
|
|
||||||
#include <rmd160.h>
|
|
||||||
#endif
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA1_LIBC)
|
|
||||||
#include <sha1.h>
|
|
||||||
#endif
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA256_LIBC) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_LIBC2) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_LIBC3) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_LIBC) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_LIBC2) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_LIBC3) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_LIBC) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_LIBC2) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_LIBC3)
|
|
||||||
#include <sha2.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* libmd crypto headers */
|
|
||||||
#if defined(ARCHIVE_CRYPTO_MD5_LIBMD) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_RMD160_LIBMD) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA1_LIBMD) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_LIBMD) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_LIBMD)
|
|
||||||
#define ARCHIVE_CRYPTO_LIBMD 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(ARCHIVE_CRYPTO_MD5_LIBMD)
|
|
||||||
#include <md5.h>
|
|
||||||
#endif
|
|
||||||
#if defined(ARCHIVE_CRYPTO_RMD160_LIBMD)
|
|
||||||
#include <ripemd.h>
|
|
||||||
#endif
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA1_LIBMD)
|
|
||||||
#include <sha.h>
|
|
||||||
#endif
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA256_LIBMD)
|
|
||||||
#include <sha256.h>
|
|
||||||
#endif
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA512_LIBMD)
|
|
||||||
#include <sha512.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* libSystem crypto headers */
|
|
||||||
#if defined(ARCHIVE_CRYPTO_MD5_LIBSYSTEM) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA1_LIBSYSTEM) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_LIBSYSTEM) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_LIBSYSTEM) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_LIBSYSTEM)
|
|
||||||
#include <CommonCrypto/CommonDigest.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Nettle crypto headers */
|
|
||||||
#if defined(ARCHIVE_CRYPTO_MD5_NETTLE)
|
|
||||||
#include <nettle/md5.h>
|
|
||||||
#endif
|
|
||||||
#if defined(ARCHIVE_CRYPTO_RMD160_NETTLE)
|
|
||||||
#include <nettle/ripemd160.h>
|
|
||||||
#endif
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA1_NETTLE) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_NETTLE) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_NETTLE) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_NETTLE)
|
|
||||||
#include <nettle/sha.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* OpenSSL crypto headers */
|
|
||||||
#if defined(ARCHIVE_CRYPTO_MD5_OPENSSL) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_RMD160_OPENSSL) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA1_OPENSSL) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_OPENSSL) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_OPENSSL) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_OPENSSL)
|
|
||||||
#define ARCHIVE_CRYPTO_OPENSSL 1
|
|
||||||
#include <openssl/evp.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Windows crypto headers */
|
|
||||||
#if defined(ARCHIVE_CRYPTO_MD5_WIN) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA1_WIN) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_WIN) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_WIN) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_WIN)
|
|
||||||
#include <wincrypt.h>
|
|
||||||
typedef struct {
|
|
||||||
int valid;
|
|
||||||
HCRYPTPROV cryptProv;
|
|
||||||
HCRYPTHASH hash;
|
|
||||||
} Digest_CTX;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* typedefs */
|
|
||||||
#if defined(ARCHIVE_CRYPTO_MD5_LIBC)
|
|
||||||
typedef MD5_CTX archive_md5_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_MD5_LIBMD)
|
|
||||||
typedef MD5_CTX archive_md5_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_MD5_LIBSYSTEM)
|
|
||||||
typedef CC_MD5_CTX archive_md5_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_MD5_NETTLE)
|
|
||||||
typedef struct md5_ctx archive_md5_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_MD5_OPENSSL)
|
|
||||||
typedef EVP_MD_CTX archive_md5_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_MD5_WIN)
|
|
||||||
typedef Digest_CTX archive_md5_ctx;
|
|
||||||
#else
|
|
||||||
typedef unsigned char archive_md5_ctx;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(ARCHIVE_CRYPTO_RMD160_LIBC)
|
|
||||||
typedef RMD160_CTX archive_rmd160_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_RMD160_LIBMD)
|
|
||||||
typedef RIPEMD160_CTX archive_rmd160_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_RMD160_NETTLE)
|
|
||||||
typedef struct ripemd160_ctx archive_rmd160_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_RMD160_OPENSSL)
|
|
||||||
typedef EVP_MD_CTX archive_rmd160_ctx;
|
|
||||||
#else
|
|
||||||
typedef unsigned char archive_rmd160_ctx;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA1_LIBC)
|
|
||||||
typedef SHA1_CTX archive_sha1_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA1_LIBMD)
|
|
||||||
typedef SHA1_CTX archive_sha1_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA1_LIBSYSTEM)
|
|
||||||
typedef CC_SHA1_CTX archive_sha1_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA1_NETTLE)
|
|
||||||
typedef struct sha1_ctx archive_sha1_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA1_OPENSSL)
|
|
||||||
typedef EVP_MD_CTX archive_sha1_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA1_WIN)
|
|
||||||
typedef Digest_CTX archive_sha1_ctx;
|
|
||||||
#else
|
|
||||||
typedef unsigned char archive_sha1_ctx;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA256_LIBC)
|
|
||||||
typedef SHA256_CTX archive_sha256_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA256_LIBC2)
|
|
||||||
typedef SHA256_CTX archive_sha256_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA256_LIBC3)
|
|
||||||
typedef SHA2_CTX archive_sha256_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA256_LIBMD)
|
|
||||||
typedef SHA256_CTX archive_sha256_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA256_LIBSYSTEM)
|
|
||||||
typedef CC_SHA256_CTX archive_sha256_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA256_NETTLE)
|
|
||||||
typedef struct sha256_ctx archive_sha256_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA256_OPENSSL)
|
|
||||||
typedef EVP_MD_CTX archive_sha256_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA256_WIN)
|
|
||||||
typedef Digest_CTX archive_sha256_ctx;
|
|
||||||
#else
|
|
||||||
typedef unsigned char archive_sha256_ctx;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA384_LIBC)
|
|
||||||
typedef SHA384_CTX archive_sha384_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA384_LIBC2)
|
|
||||||
typedef SHA384_CTX archive_sha384_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA384_LIBC3)
|
|
||||||
typedef SHA2_CTX archive_sha384_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA384_LIBSYSTEM)
|
|
||||||
typedef CC_SHA512_CTX archive_sha384_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA384_NETTLE)
|
|
||||||
typedef struct sha384_ctx archive_sha384_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA384_OPENSSL)
|
|
||||||
typedef EVP_MD_CTX archive_sha384_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA384_WIN)
|
|
||||||
typedef Digest_CTX archive_sha384_ctx;
|
|
||||||
#else
|
|
||||||
typedef unsigned char archive_sha384_ctx;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA512_LIBC)
|
|
||||||
typedef SHA512_CTX archive_sha512_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA512_LIBC2)
|
|
||||||
typedef SHA512_CTX archive_sha512_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA512_LIBC3)
|
|
||||||
typedef SHA2_CTX archive_sha512_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA512_LIBMD)
|
|
||||||
typedef SHA512_CTX archive_sha512_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA512_LIBSYSTEM)
|
|
||||||
typedef CC_SHA512_CTX archive_sha512_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA512_NETTLE)
|
|
||||||
typedef struct sha512_ctx archive_sha512_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA512_OPENSSL)
|
|
||||||
typedef EVP_MD_CTX archive_sha512_ctx;
|
|
||||||
#elif defined(ARCHIVE_CRYPTO_SHA512_WIN)
|
|
||||||
typedef Digest_CTX archive_sha512_ctx;
|
|
||||||
#else
|
|
||||||
typedef unsigned char archive_sha512_ctx;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* defines */
|
|
||||||
#if defined(ARCHIVE_CRYPTO_MD5_LIBC) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_MD5_LIBMD) || \
|
|
||||||
defined(ARCHIVE_CRYPTO_MD5_LIBSYSTEM) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_MD5_NETTLE) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_MD5_OPENSSL) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_MD5_WIN)
|
|
||||||
#define ARCHIVE_HAS_MD5
|
|
||||||
#endif
|
|
||||||
#define archive_md5_init(ctx)\
|
|
||||||
__archive_crypto.md5init(ctx)
|
|
||||||
#define archive_md5_final(ctx, md)\
|
|
||||||
__archive_crypto.md5final(ctx, md)
|
|
||||||
#define archive_md5_update(ctx, buf, n)\
|
|
||||||
__archive_crypto.md5update(ctx, buf, n)
|
|
||||||
|
|
||||||
#if defined(ARCHIVE_CRYPTO_RMD160_LIBC) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_RMD160_NETTLE) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_RMD160_OPENSSL)
|
|
||||||
#define ARCHIVE_HAS_RMD160
|
|
||||||
#endif
|
|
||||||
#define archive_rmd160_init(ctx)\
|
|
||||||
__archive_crypto.rmd160init(ctx)
|
|
||||||
#define archive_rmd160_final(ctx, md)\
|
|
||||||
__archive_crypto.rmd160final(ctx, md)
|
|
||||||
#define archive_rmd160_update(ctx, buf, n)\
|
|
||||||
__archive_crypto.rmd160update(ctx, buf, n)
|
|
||||||
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA1_LIBC) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA1_LIBMD) || \
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA1_LIBSYSTEM) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA1_NETTLE) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA1_OPENSSL) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA1_WIN)
|
|
||||||
#define ARCHIVE_HAS_SHA1
|
|
||||||
#endif
|
|
||||||
#define archive_sha1_init(ctx)\
|
|
||||||
__archive_crypto.sha1init(ctx)
|
|
||||||
#define archive_sha1_final(ctx, md)\
|
|
||||||
__archive_crypto.sha1final(ctx, md)
|
|
||||||
#define archive_sha1_update(ctx, buf, n)\
|
|
||||||
__archive_crypto.sha1update(ctx, buf, n)
|
|
||||||
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA256_LIBC) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_LIBC2) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_LIBC3) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_LIBMD) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_LIBSYSTEM) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_NETTLE) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_OPENSSL) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA256_WIN)
|
|
||||||
#define ARCHIVE_HAS_SHA256
|
|
||||||
#endif
|
|
||||||
#define archive_sha256_init(ctx)\
|
|
||||||
__archive_crypto.sha256init(ctx)
|
|
||||||
#define archive_sha256_final(ctx, md)\
|
|
||||||
__archive_crypto.sha256final(ctx, md)
|
|
||||||
#define archive_sha256_update(ctx, buf, n)\
|
|
||||||
__archive_crypto.sha256update(ctx, buf, n)
|
|
||||||
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA384_LIBC) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_LIBC2) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_LIBC3) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_LIBSYSTEM) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_NETTLE) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_OPENSSL) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA384_WIN)
|
|
||||||
#define ARCHIVE_HAS_SHA384
|
|
||||||
#endif
|
|
||||||
#define archive_sha384_init(ctx)\
|
|
||||||
__archive_crypto.sha384init(ctx)
|
|
||||||
#define archive_sha384_final(ctx, md)\
|
|
||||||
__archive_crypto.sha384final(ctx, md)
|
|
||||||
#define archive_sha384_update(ctx, buf, n)\
|
|
||||||
__archive_crypto.sha384update(ctx, buf, n)
|
|
||||||
|
|
||||||
#if defined(ARCHIVE_CRYPTO_SHA512_LIBC) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_LIBC2) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_LIBC3) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_LIBMD) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_LIBSYSTEM) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_NETTLE) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_OPENSSL) ||\
|
|
||||||
defined(ARCHIVE_CRYPTO_SHA512_WIN)
|
|
||||||
#define ARCHIVE_HAS_SHA512
|
|
||||||
#endif
|
|
||||||
#define archive_sha512_init(ctx)\
|
|
||||||
__archive_crypto.sha512init(ctx)
|
|
||||||
#define archive_sha512_final(ctx, md)\
|
|
||||||
__archive_crypto.sha512final(ctx, md)
|
|
||||||
#define archive_sha512_update(ctx, buf, n)\
|
|
||||||
__archive_crypto.sha512update(ctx, buf, n)
|
|
||||||
|
|
||||||
/* Minimal interface to crypto functionality for internal use in libarchive */
|
|
||||||
struct archive_crypto
|
|
||||||
{
|
|
||||||
/* Message Digest */
|
|
||||||
int (*md5init)(archive_md5_ctx *ctx);
|
|
||||||
int (*md5update)(archive_md5_ctx *, const void *, size_t);
|
|
||||||
int (*md5final)(archive_md5_ctx *, void *);
|
|
||||||
int (*rmd160init)(archive_rmd160_ctx *);
|
|
||||||
int (*rmd160update)(archive_rmd160_ctx *, const void *, size_t);
|
|
||||||
int (*rmd160final)(archive_rmd160_ctx *, void *);
|
|
||||||
int (*sha1init)(archive_sha1_ctx *);
|
|
||||||
int (*sha1update)(archive_sha1_ctx *, const void *, size_t);
|
|
||||||
int (*sha1final)(archive_sha1_ctx *, void *);
|
|
||||||
int (*sha256init)(archive_sha256_ctx *);
|
|
||||||
int (*sha256update)(archive_sha256_ctx *, const void *, size_t);
|
|
||||||
int (*sha256final)(archive_sha256_ctx *, void *);
|
|
||||||
int (*sha384init)(archive_sha384_ctx *);
|
|
||||||
int (*sha384update)(archive_sha384_ctx *, const void *, size_t);
|
|
||||||
int (*sha384final)(archive_sha384_ctx *, void *);
|
|
||||||
int (*sha512init)(archive_sha512_ctx *);
|
|
||||||
int (*sha512update)(archive_sha512_ctx *, const void *, size_t);
|
|
||||||
int (*sha512final)(archive_sha512_ctx *, void *);
|
|
||||||
};
|
|
||||||
|
|
||||||
extern const struct archive_crypto __archive_crypto;
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,162 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2002 Thomas Moestl <tmm@FreeBSD.org>
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
||||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
||||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
||||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
||||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
||||||
* SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* $FreeBSD: head/lib/libarchive/archive_endian.h 201085 2009-12-28 02:17:15Z kientzle $
|
|
||||||
*
|
|
||||||
* Borrowed from FreeBSD's <sys/endian.h>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __LIBARCHIVE_BUILD
|
|
||||||
#error This header is only to be used internally to libarchive.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Note: This is a purely internal header! */
|
|
||||||
/* Do not use this outside of libarchive internal code! */
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_ENDIAN_H_INCLUDED
|
|
||||||
#define ARCHIVE_ENDIAN_H_INCLUDED
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Disabling inline keyword for compilers known to choke on it:
|
|
||||||
* - Watcom C++ in C code. (For any version?)
|
|
||||||
* - SGI MIPSpro
|
|
||||||
* - Microsoft Visual C++ 6.0 (supposedly newer versions too)
|
|
||||||
*/
|
|
||||||
#if defined(__WATCOMC__) || defined(__sgi) || defined(__hpux) || defined(__BORLANDC__)
|
|
||||||
#define inline
|
|
||||||
#elif defined(_MSC_VER)
|
|
||||||
#define inline __inline
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
|
|
||||||
|
|
||||||
static inline uint16_t
|
|
||||||
archive_be16dec(const void *pp)
|
|
||||||
{
|
|
||||||
unsigned char const *p = (unsigned char const *)pp;
|
|
||||||
|
|
||||||
return ((p[0] << 8) | p[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline uint32_t
|
|
||||||
archive_be32dec(const void *pp)
|
|
||||||
{
|
|
||||||
unsigned char const *p = (unsigned char const *)pp;
|
|
||||||
|
|
||||||
return ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline uint64_t
|
|
||||||
archive_be64dec(const void *pp)
|
|
||||||
{
|
|
||||||
unsigned char const *p = (unsigned char const *)pp;
|
|
||||||
|
|
||||||
return (((uint64_t)archive_be32dec(p) << 32) | archive_be32dec(p + 4));
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline uint16_t
|
|
||||||
archive_le16dec(const void *pp)
|
|
||||||
{
|
|
||||||
unsigned char const *p = (unsigned char const *)pp;
|
|
||||||
|
|
||||||
return ((p[1] << 8) | p[0]);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline uint32_t
|
|
||||||
archive_le32dec(const void *pp)
|
|
||||||
{
|
|
||||||
unsigned char const *p = (unsigned char const *)pp;
|
|
||||||
|
|
||||||
return ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline uint64_t
|
|
||||||
archive_le64dec(const void *pp)
|
|
||||||
{
|
|
||||||
unsigned char const *p = (unsigned char const *)pp;
|
|
||||||
|
|
||||||
return (((uint64_t)archive_le32dec(p + 4) << 32) | archive_le32dec(p));
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
archive_be16enc(void *pp, uint16_t u)
|
|
||||||
{
|
|
||||||
unsigned char *p = (unsigned char *)pp;
|
|
||||||
|
|
||||||
p[0] = (u >> 8) & 0xff;
|
|
||||||
p[1] = u & 0xff;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
archive_be32enc(void *pp, uint32_t u)
|
|
||||||
{
|
|
||||||
unsigned char *p = (unsigned char *)pp;
|
|
||||||
|
|
||||||
p[0] = (u >> 24) & 0xff;
|
|
||||||
p[1] = (u >> 16) & 0xff;
|
|
||||||
p[2] = (u >> 8) & 0xff;
|
|
||||||
p[3] = u & 0xff;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
archive_be64enc(void *pp, uint64_t u)
|
|
||||||
{
|
|
||||||
unsigned char *p = (unsigned char *)pp;
|
|
||||||
|
|
||||||
archive_be32enc(p, (uint32_t)(u >> 32));
|
|
||||||
archive_be32enc(p + 4, (uint32_t)(u & 0xffffffff));
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
archive_le16enc(void *pp, uint16_t u)
|
|
||||||
{
|
|
||||||
unsigned char *p = (unsigned char *)pp;
|
|
||||||
|
|
||||||
p[0] = u & 0xff;
|
|
||||||
p[1] = (u >> 8) & 0xff;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
archive_le32enc(void *pp, uint32_t u)
|
|
||||||
{
|
|
||||||
unsigned char *p = (unsigned char *)pp;
|
|
||||||
|
|
||||||
p[0] = u & 0xff;
|
|
||||||
p[1] = (u >> 8) & 0xff;
|
|
||||||
p[2] = (u >> 16) & 0xff;
|
|
||||||
p[3] = (u >> 24) & 0xff;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
archive_le64enc(void *pp, uint64_t u)
|
|
||||||
{
|
|
||||||
unsigned char *p = (unsigned char *)pp;
|
|
||||||
|
|
||||||
archive_le32enc(p, (uint32_t)(u & 0xffffffff));
|
|
||||||
archive_le32enc(p + 4, (uint32_t)(u >> 32));
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,624 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2008 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* $FreeBSD: head/lib/libarchive/archive_entry.h 201096 2009-12-28 02:41:27Z kientzle $
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_ENTRY_H_INCLUDED
|
|
||||||
#define ARCHIVE_ENTRY_H_INCLUDED
|
|
||||||
|
|
||||||
/* Note: Compiler will complain if this does not match archive.h! */
|
|
||||||
#define ARCHIVE_VERSION_NUMBER 3001002
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Note: archive_entry.h is for use outside of libarchive; the
|
|
||||||
* configuration headers (config.h, archive_platform.h, etc.) are
|
|
||||||
* purely internal. Do NOT use HAVE_XXX configuration macros to
|
|
||||||
* control the behavior of this header! If you must conditionalize,
|
|
||||||
* use predefined compiler and/or platform macros.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <stddef.h> /* for wchar_t */
|
|
||||||
#include <time.h>
|
|
||||||
|
|
||||||
#if defined(_WIN32) && !defined(__CYGWIN__)
|
|
||||||
#include <windows.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Get a suitable 64-bit integer type. */
|
|
||||||
#if defined(_WIN32) && !defined(__CYGWIN__)
|
|
||||||
# define __LA_INT64_T __int64
|
|
||||||
#else
|
|
||||||
#include <unistd.h>
|
|
||||||
# if defined(_SCO_DS)
|
|
||||||
# define __LA_INT64_T long long
|
|
||||||
# else
|
|
||||||
# define __LA_INT64_T int64_t
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Get a suitable definition for mode_t */
|
|
||||||
#if ARCHIVE_VERSION_NUMBER >= 3999000
|
|
||||||
/* Switch to plain 'int' for libarchive 4.0. It's less broken than 'mode_t' */
|
|
||||||
# define __LA_MODE_T int
|
|
||||||
#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__)
|
|
||||||
# define __LA_MODE_T unsigned short
|
|
||||||
#else
|
|
||||||
# define __LA_MODE_T mode_t
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* On Windows, define LIBARCHIVE_STATIC if you're building or using a
|
|
||||||
* .lib. The default here assumes you're building a DLL. Only
|
|
||||||
* libarchive source should ever define __LIBARCHIVE_BUILD.
|
|
||||||
*/
|
|
||||||
#if ((defined __WIN32__) || (defined _WIN32) || defined(__CYGWIN__)) && (!defined LIBARCHIVE_STATIC)
|
|
||||||
# ifdef __LIBARCHIVE_BUILD
|
|
||||||
# ifdef __GNUC__
|
|
||||||
# define __LA_DECL __attribute__((dllexport)) extern
|
|
||||||
# else
|
|
||||||
# define __LA_DECL __declspec(dllexport)
|
|
||||||
# endif
|
|
||||||
# else
|
|
||||||
# ifdef __GNUC__
|
|
||||||
# define __LA_DECL
|
|
||||||
# else
|
|
||||||
# define __LA_DECL __declspec(dllimport)
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
/* Static libraries on all platforms and shared libraries on non-Windows. */
|
|
||||||
# define __LA_DECL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Description of an archive entry.
|
|
||||||
*
|
|
||||||
* You can think of this as "struct stat" with some text fields added in.
|
|
||||||
*
|
|
||||||
* TODO: Add "comment", "charset", and possibly other entries that are
|
|
||||||
* supported by "pax interchange" format. However, GNU, ustar, cpio,
|
|
||||||
* and other variants don't support these features, so they're not an
|
|
||||||
* excruciatingly high priority right now.
|
|
||||||
*
|
|
||||||
* TODO: "pax interchange" format allows essentially arbitrary
|
|
||||||
* key/value attributes to be attached to any entry. Supporting
|
|
||||||
* such extensions may make this library useful for special
|
|
||||||
* applications (e.g., a package manager could attach special
|
|
||||||
* package-management attributes to each entry).
|
|
||||||
*/
|
|
||||||
struct archive;
|
|
||||||
struct archive_entry;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* File-type constants. These are returned from archive_entry_filetype()
|
|
||||||
* and passed to archive_entry_set_filetype().
|
|
||||||
*
|
|
||||||
* These values match S_XXX defines on every platform I've checked,
|
|
||||||
* including Windows, AIX, Linux, Solaris, and BSD. They're
|
|
||||||
* (re)defined here because platforms generally don't define the ones
|
|
||||||
* they don't support. For example, Windows doesn't define S_IFLNK or
|
|
||||||
* S_IFBLK. Instead of having a mass of conditional logic and system
|
|
||||||
* checks to define any S_XXX values that aren't supported locally,
|
|
||||||
* I've just defined a new set of such constants so that
|
|
||||||
* libarchive-based applications can manipulate and identify archive
|
|
||||||
* entries properly even if the hosting platform can't store them on
|
|
||||||
* disk.
|
|
||||||
*
|
|
||||||
* These values are also used directly within some portable formats,
|
|
||||||
* such as cpio. If you find a platform that varies from these, the
|
|
||||||
* correct solution is to leave these alone and translate from these
|
|
||||||
* portable values to platform-native values when entries are read from
|
|
||||||
* or written to disk.
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
* In libarchive 4.0, we can drop the casts here.
|
|
||||||
* They're needed to work around Borland C's broken mode_t.
|
|
||||||
*/
|
|
||||||
#define AE_IFMT ((__LA_MODE_T)0170000)
|
|
||||||
#define AE_IFREG ((__LA_MODE_T)0100000)
|
|
||||||
#define AE_IFLNK ((__LA_MODE_T)0120000)
|
|
||||||
#define AE_IFSOCK ((__LA_MODE_T)0140000)
|
|
||||||
#define AE_IFCHR ((__LA_MODE_T)0020000)
|
|
||||||
#define AE_IFBLK ((__LA_MODE_T)0060000)
|
|
||||||
#define AE_IFDIR ((__LA_MODE_T)0040000)
|
|
||||||
#define AE_IFIFO ((__LA_MODE_T)0010000)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Basic object manipulation
|
|
||||||
*/
|
|
||||||
|
|
||||||
__LA_DECL struct archive_entry *archive_entry_clear(struct archive_entry *);
|
|
||||||
/* The 'clone' function does a deep copy; all of the strings are copied too. */
|
|
||||||
__LA_DECL struct archive_entry *archive_entry_clone(struct archive_entry *);
|
|
||||||
__LA_DECL void archive_entry_free(struct archive_entry *);
|
|
||||||
__LA_DECL struct archive_entry *archive_entry_new(void);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This form of archive_entry_new2() will pull character-set
|
|
||||||
* conversion information from the specified archive handle. The
|
|
||||||
* older archive_entry_new(void) form is equivalent to calling
|
|
||||||
* archive_entry_new2(NULL) and will result in the use of an internal
|
|
||||||
* default character-set conversion.
|
|
||||||
*/
|
|
||||||
__LA_DECL struct archive_entry *archive_entry_new2(struct archive *);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Retrieve fields from an archive_entry.
|
|
||||||
*
|
|
||||||
* There are a number of implicit conversions among these fields. For
|
|
||||||
* example, if a regular string field is set and you read the _w wide
|
|
||||||
* character field, the entry will implicitly convert narrow-to-wide
|
|
||||||
* using the current locale. Similarly, dev values are automatically
|
|
||||||
* updated when you write devmajor or devminor and vice versa.
|
|
||||||
*
|
|
||||||
* In addition, fields can be "set" or "unset." Unset string fields
|
|
||||||
* return NULL, non-string fields have _is_set() functions to test
|
|
||||||
* whether they've been set. You can "unset" a string field by
|
|
||||||
* assigning NULL; non-string fields have _unset() functions to
|
|
||||||
* unset them.
|
|
||||||
*
|
|
||||||
* Note: There is one ambiguity in the above; string fields will
|
|
||||||
* also return NULL when implicit character set conversions fail.
|
|
||||||
* This is usually what you want.
|
|
||||||
*/
|
|
||||||
__LA_DECL time_t archive_entry_atime(struct archive_entry *);
|
|
||||||
__LA_DECL long archive_entry_atime_nsec(struct archive_entry *);
|
|
||||||
__LA_DECL int archive_entry_atime_is_set(struct archive_entry *);
|
|
||||||
__LA_DECL time_t archive_entry_birthtime(struct archive_entry *);
|
|
||||||
__LA_DECL long archive_entry_birthtime_nsec(struct archive_entry *);
|
|
||||||
__LA_DECL int archive_entry_birthtime_is_set(struct archive_entry *);
|
|
||||||
__LA_DECL time_t archive_entry_ctime(struct archive_entry *);
|
|
||||||
__LA_DECL long archive_entry_ctime_nsec(struct archive_entry *);
|
|
||||||
__LA_DECL int archive_entry_ctime_is_set(struct archive_entry *);
|
|
||||||
__LA_DECL dev_t archive_entry_dev(struct archive_entry *);
|
|
||||||
__LA_DECL int archive_entry_dev_is_set(struct archive_entry *);
|
|
||||||
__LA_DECL dev_t archive_entry_devmajor(struct archive_entry *);
|
|
||||||
__LA_DECL dev_t archive_entry_devminor(struct archive_entry *);
|
|
||||||
__LA_DECL __LA_MODE_T archive_entry_filetype(struct archive_entry *);
|
|
||||||
__LA_DECL void archive_entry_fflags(struct archive_entry *,
|
|
||||||
unsigned long * /* set */,
|
|
||||||
unsigned long * /* clear */);
|
|
||||||
__LA_DECL const char *archive_entry_fflags_text(struct archive_entry *);
|
|
||||||
__LA_DECL __LA_INT64_T archive_entry_gid(struct archive_entry *);
|
|
||||||
__LA_DECL const char *archive_entry_gname(struct archive_entry *);
|
|
||||||
__LA_DECL const wchar_t *archive_entry_gname_w(struct archive_entry *);
|
|
||||||
__LA_DECL const char *archive_entry_hardlink(struct archive_entry *);
|
|
||||||
__LA_DECL const wchar_t *archive_entry_hardlink_w(struct archive_entry *);
|
|
||||||
__LA_DECL __LA_INT64_T archive_entry_ino(struct archive_entry *);
|
|
||||||
__LA_DECL __LA_INT64_T archive_entry_ino64(struct archive_entry *);
|
|
||||||
__LA_DECL int archive_entry_ino_is_set(struct archive_entry *);
|
|
||||||
__LA_DECL __LA_MODE_T archive_entry_mode(struct archive_entry *);
|
|
||||||
__LA_DECL time_t archive_entry_mtime(struct archive_entry *);
|
|
||||||
__LA_DECL long archive_entry_mtime_nsec(struct archive_entry *);
|
|
||||||
__LA_DECL int archive_entry_mtime_is_set(struct archive_entry *);
|
|
||||||
__LA_DECL unsigned int archive_entry_nlink(struct archive_entry *);
|
|
||||||
__LA_DECL const char *archive_entry_pathname(struct archive_entry *);
|
|
||||||
__LA_DECL const wchar_t *archive_entry_pathname_w(struct archive_entry *);
|
|
||||||
__LA_DECL __LA_MODE_T archive_entry_perm(struct archive_entry *);
|
|
||||||
__LA_DECL dev_t archive_entry_rdev(struct archive_entry *);
|
|
||||||
__LA_DECL dev_t archive_entry_rdevmajor(struct archive_entry *);
|
|
||||||
__LA_DECL dev_t archive_entry_rdevminor(struct archive_entry *);
|
|
||||||
__LA_DECL const char *archive_entry_sourcepath(struct archive_entry *);
|
|
||||||
__LA_DECL const wchar_t *archive_entry_sourcepath_w(struct archive_entry *);
|
|
||||||
__LA_DECL __LA_INT64_T archive_entry_size(struct archive_entry *);
|
|
||||||
__LA_DECL int archive_entry_size_is_set(struct archive_entry *);
|
|
||||||
__LA_DECL const char *archive_entry_strmode(struct archive_entry *);
|
|
||||||
__LA_DECL const char *archive_entry_symlink(struct archive_entry *);
|
|
||||||
__LA_DECL const wchar_t *archive_entry_symlink_w(struct archive_entry *);
|
|
||||||
__LA_DECL __LA_INT64_T archive_entry_uid(struct archive_entry *);
|
|
||||||
__LA_DECL const char *archive_entry_uname(struct archive_entry *);
|
|
||||||
__LA_DECL const wchar_t *archive_entry_uname_w(struct archive_entry *);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Set fields in an archive_entry.
|
|
||||||
*
|
|
||||||
* Note: Before libarchive 2.4, there were 'set' and 'copy' versions
|
|
||||||
* of the string setters. 'copy' copied the actual string, 'set' just
|
|
||||||
* stored the pointer. In libarchive 2.4 and later, strings are
|
|
||||||
* always copied.
|
|
||||||
*/
|
|
||||||
|
|
||||||
__LA_DECL void archive_entry_set_atime(struct archive_entry *, time_t, long);
|
|
||||||
__LA_DECL void archive_entry_unset_atime(struct archive_entry *);
|
|
||||||
#if defined(_WIN32) && !defined(__CYGWIN__)
|
|
||||||
__LA_DECL void archive_entry_copy_bhfi(struct archive_entry *, BY_HANDLE_FILE_INFORMATION *);
|
|
||||||
#endif
|
|
||||||
__LA_DECL void archive_entry_set_birthtime(struct archive_entry *, time_t, long);
|
|
||||||
__LA_DECL void archive_entry_unset_birthtime(struct archive_entry *);
|
|
||||||
__LA_DECL void archive_entry_set_ctime(struct archive_entry *, time_t, long);
|
|
||||||
__LA_DECL void archive_entry_unset_ctime(struct archive_entry *);
|
|
||||||
__LA_DECL void archive_entry_set_dev(struct archive_entry *, dev_t);
|
|
||||||
__LA_DECL void archive_entry_set_devmajor(struct archive_entry *, dev_t);
|
|
||||||
__LA_DECL void archive_entry_set_devminor(struct archive_entry *, dev_t);
|
|
||||||
__LA_DECL void archive_entry_set_filetype(struct archive_entry *, unsigned int);
|
|
||||||
__LA_DECL void archive_entry_set_fflags(struct archive_entry *,
|
|
||||||
unsigned long /* set */, unsigned long /* clear */);
|
|
||||||
/* Returns pointer to start of first invalid token, or NULL if none. */
|
|
||||||
/* Note that all recognized tokens are processed, regardless. */
|
|
||||||
__LA_DECL const char *archive_entry_copy_fflags_text(struct archive_entry *,
|
|
||||||
const char *);
|
|
||||||
__LA_DECL const wchar_t *archive_entry_copy_fflags_text_w(struct archive_entry *,
|
|
||||||
const wchar_t *);
|
|
||||||
__LA_DECL void archive_entry_set_gid(struct archive_entry *, __LA_INT64_T);
|
|
||||||
__LA_DECL void archive_entry_set_gname(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_gname(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_gname_w(struct archive_entry *, const wchar_t *);
|
|
||||||
__LA_DECL int archive_entry_update_gname_utf8(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_set_hardlink(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_hardlink(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_hardlink_w(struct archive_entry *, const wchar_t *);
|
|
||||||
__LA_DECL int archive_entry_update_hardlink_utf8(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_set_ino(struct archive_entry *, __LA_INT64_T);
|
|
||||||
__LA_DECL void archive_entry_set_ino64(struct archive_entry *, __LA_INT64_T);
|
|
||||||
__LA_DECL void archive_entry_set_link(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_link(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_link_w(struct archive_entry *, const wchar_t *);
|
|
||||||
__LA_DECL int archive_entry_update_link_utf8(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_set_mode(struct archive_entry *, __LA_MODE_T);
|
|
||||||
__LA_DECL void archive_entry_set_mtime(struct archive_entry *, time_t, long);
|
|
||||||
__LA_DECL void archive_entry_unset_mtime(struct archive_entry *);
|
|
||||||
__LA_DECL void archive_entry_set_nlink(struct archive_entry *, unsigned int);
|
|
||||||
__LA_DECL void archive_entry_set_pathname(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_pathname(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_pathname_w(struct archive_entry *, const wchar_t *);
|
|
||||||
__LA_DECL int archive_entry_update_pathname_utf8(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_set_perm(struct archive_entry *, __LA_MODE_T);
|
|
||||||
__LA_DECL void archive_entry_set_rdev(struct archive_entry *, dev_t);
|
|
||||||
__LA_DECL void archive_entry_set_rdevmajor(struct archive_entry *, dev_t);
|
|
||||||
__LA_DECL void archive_entry_set_rdevminor(struct archive_entry *, dev_t);
|
|
||||||
__LA_DECL void archive_entry_set_size(struct archive_entry *, __LA_INT64_T);
|
|
||||||
__LA_DECL void archive_entry_unset_size(struct archive_entry *);
|
|
||||||
__LA_DECL void archive_entry_copy_sourcepath(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_sourcepath_w(struct archive_entry *, const wchar_t *);
|
|
||||||
__LA_DECL void archive_entry_set_symlink(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_symlink(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_symlink_w(struct archive_entry *, const wchar_t *);
|
|
||||||
__LA_DECL int archive_entry_update_symlink_utf8(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_set_uid(struct archive_entry *, __LA_INT64_T);
|
|
||||||
__LA_DECL void archive_entry_set_uname(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_uname(struct archive_entry *, const char *);
|
|
||||||
__LA_DECL void archive_entry_copy_uname_w(struct archive_entry *, const wchar_t *);
|
|
||||||
__LA_DECL int archive_entry_update_uname_utf8(struct archive_entry *, const char *);
|
|
||||||
/*
|
|
||||||
* Routines to bulk copy fields to/from a platform-native "struct
|
|
||||||
* stat." Libarchive used to just store a struct stat inside of each
|
|
||||||
* archive_entry object, but this created issues when trying to
|
|
||||||
* manipulate archives on systems different than the ones they were
|
|
||||||
* created on.
|
|
||||||
*
|
|
||||||
* TODO: On Linux and other LFS systems, provide both stat32 and
|
|
||||||
* stat64 versions of these functions and all of the macro glue so
|
|
||||||
* that archive_entry_stat is magically defined to
|
|
||||||
* archive_entry_stat32 or archive_entry_stat64 as appropriate.
|
|
||||||
*/
|
|
||||||
__LA_DECL const struct stat *archive_entry_stat(struct archive_entry *);
|
|
||||||
__LA_DECL void archive_entry_copy_stat(struct archive_entry *, const struct stat *);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Storage for Mac OS-specific AppleDouble metadata information.
|
|
||||||
* Apple-format tar files store a separate binary blob containing
|
|
||||||
* encoded metadata with ACL, extended attributes, etc.
|
|
||||||
* This provides a place to store that blob.
|
|
||||||
*/
|
|
||||||
|
|
||||||
__LA_DECL const void * archive_entry_mac_metadata(struct archive_entry *, size_t *);
|
|
||||||
__LA_DECL void archive_entry_copy_mac_metadata(struct archive_entry *, const void *, size_t);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ACL routines. This used to simply store and return text-format ACL
|
|
||||||
* strings, but that proved insufficient for a number of reasons:
|
|
||||||
* = clients need control over uname/uid and gname/gid mappings
|
|
||||||
* = there are many different ACL text formats
|
|
||||||
* = would like to be able to read/convert archives containing ACLs
|
|
||||||
* on platforms that lack ACL libraries
|
|
||||||
*
|
|
||||||
* This last point, in particular, forces me to implement a reasonably
|
|
||||||
* complete set of ACL support routines.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Permission bits.
|
|
||||||
*/
|
|
||||||
#define ARCHIVE_ENTRY_ACL_EXECUTE 0x00000001
|
|
||||||
#define ARCHIVE_ENTRY_ACL_WRITE 0x00000002
|
|
||||||
#define ARCHIVE_ENTRY_ACL_READ 0x00000004
|
|
||||||
#define ARCHIVE_ENTRY_ACL_READ_DATA 0x00000008
|
|
||||||
#define ARCHIVE_ENTRY_ACL_LIST_DIRECTORY 0x00000008
|
|
||||||
#define ARCHIVE_ENTRY_ACL_WRITE_DATA 0x00000010
|
|
||||||
#define ARCHIVE_ENTRY_ACL_ADD_FILE 0x00000010
|
|
||||||
#define ARCHIVE_ENTRY_ACL_APPEND_DATA 0x00000020
|
|
||||||
#define ARCHIVE_ENTRY_ACL_ADD_SUBDIRECTORY 0x00000020
|
|
||||||
#define ARCHIVE_ENTRY_ACL_READ_NAMED_ATTRS 0x00000040
|
|
||||||
#define ARCHIVE_ENTRY_ACL_WRITE_NAMED_ATTRS 0x00000080
|
|
||||||
#define ARCHIVE_ENTRY_ACL_DELETE_CHILD 0x00000100
|
|
||||||
#define ARCHIVE_ENTRY_ACL_READ_ATTRIBUTES 0x00000200
|
|
||||||
#define ARCHIVE_ENTRY_ACL_WRITE_ATTRIBUTES 0x00000400
|
|
||||||
#define ARCHIVE_ENTRY_ACL_DELETE 0x00000800
|
|
||||||
#define ARCHIVE_ENTRY_ACL_READ_ACL 0x00001000
|
|
||||||
#define ARCHIVE_ENTRY_ACL_WRITE_ACL 0x00002000
|
|
||||||
#define ARCHIVE_ENTRY_ACL_WRITE_OWNER 0x00004000
|
|
||||||
#define ARCHIVE_ENTRY_ACL_SYNCHRONIZE 0x00008000
|
|
||||||
|
|
||||||
#define ARCHIVE_ENTRY_ACL_PERMS_POSIX1E \
|
|
||||||
(ARCHIVE_ENTRY_ACL_EXECUTE \
|
|
||||||
| ARCHIVE_ENTRY_ACL_WRITE \
|
|
||||||
| ARCHIVE_ENTRY_ACL_READ)
|
|
||||||
|
|
||||||
#define ARCHIVE_ENTRY_ACL_PERMS_NFS4 \
|
|
||||||
(ARCHIVE_ENTRY_ACL_EXECUTE \
|
|
||||||
| ARCHIVE_ENTRY_ACL_READ_DATA \
|
|
||||||
| ARCHIVE_ENTRY_ACL_LIST_DIRECTORY \
|
|
||||||
| ARCHIVE_ENTRY_ACL_WRITE_DATA \
|
|
||||||
| ARCHIVE_ENTRY_ACL_ADD_FILE \
|
|
||||||
| ARCHIVE_ENTRY_ACL_APPEND_DATA \
|
|
||||||
| ARCHIVE_ENTRY_ACL_ADD_SUBDIRECTORY \
|
|
||||||
| ARCHIVE_ENTRY_ACL_READ_NAMED_ATTRS \
|
|
||||||
| ARCHIVE_ENTRY_ACL_WRITE_NAMED_ATTRS \
|
|
||||||
| ARCHIVE_ENTRY_ACL_DELETE_CHILD \
|
|
||||||
| ARCHIVE_ENTRY_ACL_READ_ATTRIBUTES \
|
|
||||||
| ARCHIVE_ENTRY_ACL_WRITE_ATTRIBUTES \
|
|
||||||
| ARCHIVE_ENTRY_ACL_DELETE \
|
|
||||||
| ARCHIVE_ENTRY_ACL_READ_ACL \
|
|
||||||
| ARCHIVE_ENTRY_ACL_WRITE_ACL \
|
|
||||||
| ARCHIVE_ENTRY_ACL_WRITE_OWNER \
|
|
||||||
| ARCHIVE_ENTRY_ACL_SYNCHRONIZE)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Inheritance values (NFS4 ACLs only); included in permset.
|
|
||||||
*/
|
|
||||||
#define ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT 0x02000000
|
|
||||||
#define ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT 0x04000000
|
|
||||||
#define ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT 0x08000000
|
|
||||||
#define ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY 0x10000000
|
|
||||||
#define ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS 0x20000000
|
|
||||||
#define ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS 0x40000000
|
|
||||||
|
|
||||||
#define ARCHIVE_ENTRY_ACL_INHERITANCE_NFS4 \
|
|
||||||
(ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT \
|
|
||||||
| ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT \
|
|
||||||
| ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT \
|
|
||||||
| ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY \
|
|
||||||
| ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS \
|
|
||||||
| ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS)
|
|
||||||
|
|
||||||
/* We need to be able to specify combinations of these. */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_TYPE_ACCESS 256 /* POSIX.1e only */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_TYPE_DEFAULT 512 /* POSIX.1e only */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_TYPE_ALLOW 1024 /* NFS4 only */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_TYPE_DENY 2048 /* NFS4 only */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_TYPE_AUDIT 4096 /* NFS4 only */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_TYPE_ALARM 8192 /* NFS4 only */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_TYPE_POSIX1E (ARCHIVE_ENTRY_ACL_TYPE_ACCESS \
|
|
||||||
| ARCHIVE_ENTRY_ACL_TYPE_DEFAULT)
|
|
||||||
#define ARCHIVE_ENTRY_ACL_TYPE_NFS4 (ARCHIVE_ENTRY_ACL_TYPE_ALLOW \
|
|
||||||
| ARCHIVE_ENTRY_ACL_TYPE_DENY \
|
|
||||||
| ARCHIVE_ENTRY_ACL_TYPE_AUDIT \
|
|
||||||
| ARCHIVE_ENTRY_ACL_TYPE_ALARM)
|
|
||||||
|
|
||||||
/* Tag values mimic POSIX.1e */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_USER 10001 /* Specified user. */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_USER_OBJ 10002 /* User who owns the file. */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_GROUP 10003 /* Specified group. */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_GROUP_OBJ 10004 /* Group who owns the file. */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_MASK 10005 /* Modify group access (POSIX.1e only) */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_OTHER 10006 /* Public (POSIX.1e only) */
|
|
||||||
#define ARCHIVE_ENTRY_ACL_EVERYONE 10107 /* Everyone (NFS4 only) */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Set the ACL by clearing it and adding entries one at a time.
|
|
||||||
* Unlike the POSIX.1e ACL routines, you must specify the type
|
|
||||||
* (access/default) for each entry. Internally, the ACL data is just
|
|
||||||
* a soup of entries. API calls here allow you to retrieve just the
|
|
||||||
* entries of interest. This design (which goes against the spirit of
|
|
||||||
* POSIX.1e) is useful for handling archive formats that combine
|
|
||||||
* default and access information in a single ACL list.
|
|
||||||
*/
|
|
||||||
__LA_DECL void archive_entry_acl_clear(struct archive_entry *);
|
|
||||||
__LA_DECL int archive_entry_acl_add_entry(struct archive_entry *,
|
|
||||||
int /* type */, int /* permset */, int /* tag */,
|
|
||||||
int /* qual */, const char * /* name */);
|
|
||||||
__LA_DECL int archive_entry_acl_add_entry_w(struct archive_entry *,
|
|
||||||
int /* type */, int /* permset */, int /* tag */,
|
|
||||||
int /* qual */, const wchar_t * /* name */);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* To retrieve the ACL, first "reset", then repeatedly ask for the
|
|
||||||
* "next" entry. The want_type parameter allows you to request only
|
|
||||||
* certain types of entries.
|
|
||||||
*/
|
|
||||||
__LA_DECL int archive_entry_acl_reset(struct archive_entry *, int /* want_type */);
|
|
||||||
__LA_DECL int archive_entry_acl_next(struct archive_entry *, int /* want_type */,
|
|
||||||
int * /* type */, int * /* permset */, int * /* tag */,
|
|
||||||
int * /* qual */, const char ** /* name */);
|
|
||||||
__LA_DECL int archive_entry_acl_next_w(struct archive_entry *, int /* want_type */,
|
|
||||||
int * /* type */, int * /* permset */, int * /* tag */,
|
|
||||||
int * /* qual */, const wchar_t ** /* name */);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Construct a text-format ACL. The flags argument is a bitmask that
|
|
||||||
* can include any of the following:
|
|
||||||
*
|
|
||||||
* ARCHIVE_ENTRY_ACL_TYPE_ACCESS - Include POSIX.1e "access" entries.
|
|
||||||
* ARCHIVE_ENTRY_ACL_TYPE_DEFAULT - Include POSIX.1e "default" entries.
|
|
||||||
* ARCHIVE_ENTRY_ACL_TYPE_NFS4 - Include NFS4 entries.
|
|
||||||
* ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID - Include extra numeric ID field in
|
|
||||||
* each ACL entry. ('star' introduced this for POSIX.1e, this flag
|
|
||||||
* also applies to NFS4.)
|
|
||||||
* ARCHIVE_ENTRY_ACL_STYLE_MARK_DEFAULT - Include "default:" before each
|
|
||||||
* default ACL entry, as used in old Solaris ACLs.
|
|
||||||
*/
|
|
||||||
#define ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID 1024
|
|
||||||
#define ARCHIVE_ENTRY_ACL_STYLE_MARK_DEFAULT 2048
|
|
||||||
__LA_DECL const wchar_t *archive_entry_acl_text_w(struct archive_entry *,
|
|
||||||
int /* flags */);
|
|
||||||
__LA_DECL const char *archive_entry_acl_text(struct archive_entry *,
|
|
||||||
int /* flags */);
|
|
||||||
|
|
||||||
/* Return a count of entries matching 'want_type' */
|
|
||||||
__LA_DECL int archive_entry_acl_count(struct archive_entry *, int /* want_type */);
|
|
||||||
|
|
||||||
/* Return an opaque ACL object. */
|
|
||||||
/* There's not yet anything clients can actually do with this... */
|
|
||||||
struct archive_acl;
|
|
||||||
__LA_DECL struct archive_acl *archive_entry_acl(struct archive_entry *);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* extended attributes
|
|
||||||
*/
|
|
||||||
|
|
||||||
__LA_DECL void archive_entry_xattr_clear(struct archive_entry *);
|
|
||||||
__LA_DECL void archive_entry_xattr_add_entry(struct archive_entry *,
|
|
||||||
const char * /* name */, const void * /* value */,
|
|
||||||
size_t /* size */);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Interfaces to support tagging archive entries with caller-defined xattrs.
|
|
||||||
*/
|
|
||||||
__LA_DECL void archive_entry_xattr_delete_entry(struct archive_entry *,
|
|
||||||
const char * /* name */);
|
|
||||||
__LA_DECL int archive_entry_has_xattr(struct archive_entry *entry,
|
|
||||||
const char * /* name */, const void ** /* value */,
|
|
||||||
size_t * /* size */);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* To retrieve the xattr list, first "reset", then repeatedly ask for the
|
|
||||||
* "next" entry.
|
|
||||||
*/
|
|
||||||
|
|
||||||
__LA_DECL int archive_entry_xattr_count(struct archive_entry *);
|
|
||||||
__LA_DECL int archive_entry_xattr_reset(struct archive_entry *);
|
|
||||||
__LA_DECL int archive_entry_xattr_next(struct archive_entry *,
|
|
||||||
const char ** /* name */, const void ** /* value */, size_t *);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* sparse
|
|
||||||
*/
|
|
||||||
|
|
||||||
__LA_DECL void archive_entry_sparse_clear(struct archive_entry *);
|
|
||||||
__LA_DECL void archive_entry_sparse_add_entry(struct archive_entry *,
|
|
||||||
__LA_INT64_T /* offset */, __LA_INT64_T /* length */);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* To retrieve the xattr list, first "reset", then repeatedly ask for the
|
|
||||||
* "next" entry.
|
|
||||||
*/
|
|
||||||
|
|
||||||
__LA_DECL int archive_entry_sparse_count(struct archive_entry *);
|
|
||||||
__LA_DECL int archive_entry_sparse_reset(struct archive_entry *);
|
|
||||||
__LA_DECL int archive_entry_sparse_next(struct archive_entry *,
|
|
||||||
__LA_INT64_T * /* offset */, __LA_INT64_T * /* length */);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Utility to match up hardlinks.
|
|
||||||
*
|
|
||||||
* The 'struct archive_entry_linkresolver' is a cache of archive entries
|
|
||||||
* for files with multiple links. Here's how to use it:
|
|
||||||
* 1. Create a lookup object with archive_entry_linkresolver_new()
|
|
||||||
* 2. Tell it the archive format you're using.
|
|
||||||
* 3. Hand each archive_entry to archive_entry_linkify().
|
|
||||||
* That function will return 0, 1, or 2 entries that should
|
|
||||||
* be written.
|
|
||||||
* 4. Call archive_entry_linkify(resolver, NULL) until
|
|
||||||
* no more entries are returned.
|
|
||||||
* 5. Call archive_entry_linkresolver_free(resolver) to free resources.
|
|
||||||
*
|
|
||||||
* The entries returned have their hardlink and size fields updated
|
|
||||||
* appropriately. If an entry is passed in that does not refer to
|
|
||||||
* a file with multiple links, it is returned unchanged. The intention
|
|
||||||
* is that you should be able to simply filter all entries through
|
|
||||||
* this machine.
|
|
||||||
*
|
|
||||||
* To make things more efficient, be sure that each entry has a valid
|
|
||||||
* nlinks value. The hardlink cache uses this to track when all links
|
|
||||||
* have been found. If the nlinks value is zero, it will keep every
|
|
||||||
* name in the cache indefinitely, which can use a lot of memory.
|
|
||||||
*
|
|
||||||
* Note that archive_entry_size() is reset to zero if the file
|
|
||||||
* body should not be written to the archive. Pay attention!
|
|
||||||
*/
|
|
||||||
struct archive_entry_linkresolver;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* There are three different strategies for marking hardlinks.
|
|
||||||
* The descriptions below name them after the best-known
|
|
||||||
* formats that rely on each strategy:
|
|
||||||
*
|
|
||||||
* "Old cpio" is the simplest, it always returns any entry unmodified.
|
|
||||||
* As far as I know, only cpio formats use this. Old cpio archives
|
|
||||||
* store every link with the full body; the onus is on the dearchiver
|
|
||||||
* to detect and properly link the files as they are restored.
|
|
||||||
* "tar" is also pretty simple; it caches a copy the first time it sees
|
|
||||||
* any link. Subsequent appearances are modified to be hardlink
|
|
||||||
* references to the first one without any body. Used by all tar
|
|
||||||
* formats, although the newest tar formats permit the "old cpio" strategy
|
|
||||||
* as well. This strategy is very simple for the dearchiver,
|
|
||||||
* and reasonably straightforward for the archiver.
|
|
||||||
* "new cpio" is trickier. It stores the body only with the last
|
|
||||||
* occurrence. The complication is that we might not
|
|
||||||
* see every link to a particular file in a single session, so
|
|
||||||
* there's no easy way to know when we've seen the last occurrence.
|
|
||||||
* The solution here is to queue one link until we see the next.
|
|
||||||
* At the end of the session, you can enumerate any remaining
|
|
||||||
* entries by calling archive_entry_linkify(NULL) and store those
|
|
||||||
* bodies. If you have a file with three links l1, l2, and l3,
|
|
||||||
* you'll get the following behavior if you see all three links:
|
|
||||||
* linkify(l1) => NULL (the resolver stores l1 internally)
|
|
||||||
* linkify(l2) => l1 (resolver stores l2, you write l1)
|
|
||||||
* linkify(l3) => l2, l3 (all links seen, you can write both).
|
|
||||||
* If you only see l1 and l2, you'll get this behavior:
|
|
||||||
* linkify(l1) => NULL
|
|
||||||
* linkify(l2) => l1
|
|
||||||
* linkify(NULL) => l2 (at end, you retrieve remaining links)
|
|
||||||
* As the name suggests, this strategy is used by newer cpio variants.
|
|
||||||
* It's noticeably more complex for the archiver, slightly more complex
|
|
||||||
* for the dearchiver than the tar strategy, but makes it straightforward
|
|
||||||
* to restore a file using any link by simply continuing to scan until
|
|
||||||
* you see a link that is stored with a body. In contrast, the tar
|
|
||||||
* strategy requires you to rescan the archive from the beginning to
|
|
||||||
* correctly extract an arbitrary link.
|
|
||||||
*/
|
|
||||||
|
|
||||||
__LA_DECL struct archive_entry_linkresolver *archive_entry_linkresolver_new(void);
|
|
||||||
__LA_DECL void archive_entry_linkresolver_set_strategy(
|
|
||||||
struct archive_entry_linkresolver *, int /* format_code */);
|
|
||||||
__LA_DECL void archive_entry_linkresolver_free(struct archive_entry_linkresolver *);
|
|
||||||
__LA_DECL void archive_entry_linkify(struct archive_entry_linkresolver *,
|
|
||||||
struct archive_entry **, struct archive_entry **);
|
|
||||||
__LA_DECL struct archive_entry *archive_entry_partial_links(
|
|
||||||
struct archive_entry_linkresolver *res, unsigned int *links);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* This is meaningless outside of this header. */
|
|
||||||
#undef __LA_DECL
|
|
||||||
|
|
||||||
#endif /* !ARCHIVE_ENTRY_H_INCLUDED */
|
|
|
@ -1,75 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#include "archive_private.h"
|
|
||||||
#include "archive_entry.h"
|
|
||||||
|
|
||||||
#if defined(_WIN32) && !defined(__CYGWIN__)
|
|
||||||
|
|
||||||
#define EPOC_TIME ARCHIVE_LITERAL_ULL(116444736000000000)
|
|
||||||
|
|
||||||
__inline static void
|
|
||||||
fileTimeToUtc(const FILETIME *filetime, time_t *t, long *ns)
|
|
||||||
{
|
|
||||||
ULARGE_INTEGER utc;
|
|
||||||
|
|
||||||
utc.HighPart = filetime->dwHighDateTime;
|
|
||||||
utc.LowPart = filetime->dwLowDateTime;
|
|
||||||
if (utc.QuadPart >= EPOC_TIME) {
|
|
||||||
utc.QuadPart -= EPOC_TIME;
|
|
||||||
*t = (time_t)(utc.QuadPart / 10000000); /* milli seconds base */
|
|
||||||
*ns = (long)(utc.QuadPart % 10000000) * 100;/* nano seconds base */
|
|
||||||
} else {
|
|
||||||
*t = 0;
|
|
||||||
*ns = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
archive_entry_copy_bhfi(struct archive_entry *entry,
|
|
||||||
BY_HANDLE_FILE_INFORMATION *bhfi)
|
|
||||||
{
|
|
||||||
time_t secs;
|
|
||||||
long nsecs;
|
|
||||||
|
|
||||||
fileTimeToUtc(&bhfi->ftLastAccessTime, &secs, &nsecs);
|
|
||||||
archive_entry_set_atime(entry, secs, nsecs);
|
|
||||||
fileTimeToUtc(&bhfi->ftLastWriteTime, &secs, &nsecs);
|
|
||||||
archive_entry_set_mtime(entry, secs, nsecs);
|
|
||||||
fileTimeToUtc(&bhfi->ftCreationTime, &secs, &nsecs);
|
|
||||||
archive_entry_set_birthtime(entry, secs, nsecs);
|
|
||||||
archive_entry_set_ctime(entry, secs, nsecs);
|
|
||||||
archive_entry_set_dev(entry, bhfi->dwVolumeSerialNumber);
|
|
||||||
archive_entry_set_ino64(entry, (((int64_t)bhfi->nFileIndexHigh) << 32)
|
|
||||||
+ bhfi->nFileIndexLow);
|
|
||||||
archive_entry_set_nlink(entry, bhfi->nNumberOfLinks);
|
|
||||||
archive_entry_set_size(entry, (((int64_t)bhfi->nFileSizeHigh) << 32)
|
|
||||||
+ bhfi->nFileSizeLow);
|
|
||||||
/* archive_entry_set_mode(entry, st->st_mode); */
|
|
||||||
}
|
|
||||||
#endif
|
|
|
@ -1,79 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry_copy_stat.c 189466 2009-03-07 00:52:02Z kientzle $");
|
|
||||||
|
|
||||||
#ifdef HAVE_SYS_STAT_H
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "archive.h"
|
|
||||||
#include "archive_entry.h"
|
|
||||||
|
|
||||||
void
|
|
||||||
archive_entry_copy_stat(struct archive_entry *entry, const struct stat *st)
|
|
||||||
{
|
|
||||||
#if HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC
|
|
||||||
archive_entry_set_atime(entry, st->st_atime, st->st_atimespec.tv_nsec);
|
|
||||||
archive_entry_set_ctime(entry, st->st_ctime, st->st_ctimespec.tv_nsec);
|
|
||||||
archive_entry_set_mtime(entry, st->st_mtime, st->st_mtimespec.tv_nsec);
|
|
||||||
#elif HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
|
|
||||||
archive_entry_set_atime(entry, st->st_atime, st->st_atim.tv_nsec);
|
|
||||||
archive_entry_set_ctime(entry, st->st_ctime, st->st_ctim.tv_nsec);
|
|
||||||
archive_entry_set_mtime(entry, st->st_mtime, st->st_mtim.tv_nsec);
|
|
||||||
#elif HAVE_STRUCT_STAT_ST_MTIME_N
|
|
||||||
archive_entry_set_atime(entry, st->st_atime, st->st_atime_n);
|
|
||||||
archive_entry_set_ctime(entry, st->st_ctime, st->st_ctime_n);
|
|
||||||
archive_entry_set_mtime(entry, st->st_mtime, st->st_mtime_n);
|
|
||||||
#elif HAVE_STRUCT_STAT_ST_UMTIME
|
|
||||||
archive_entry_set_atime(entry, st->st_atime, st->st_uatime * 1000);
|
|
||||||
archive_entry_set_ctime(entry, st->st_ctime, st->st_uctime * 1000);
|
|
||||||
archive_entry_set_mtime(entry, st->st_mtime, st->st_umtime * 1000);
|
|
||||||
#elif HAVE_STRUCT_STAT_ST_MTIME_USEC
|
|
||||||
archive_entry_set_atime(entry, st->st_atime, st->st_atime_usec * 1000);
|
|
||||||
archive_entry_set_ctime(entry, st->st_ctime, st->st_ctime_usec * 1000);
|
|
||||||
archive_entry_set_mtime(entry, st->st_mtime, st->st_mtime_usec * 1000);
|
|
||||||
#else
|
|
||||||
archive_entry_set_atime(entry, st->st_atime, 0);
|
|
||||||
archive_entry_set_ctime(entry, st->st_ctime, 0);
|
|
||||||
archive_entry_set_mtime(entry, st->st_mtime, 0);
|
|
||||||
#endif
|
|
||||||
#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC
|
|
||||||
archive_entry_set_birthtime(entry, st->st_birthtime, st->st_birthtimespec.tv_nsec);
|
|
||||||
#elif HAVE_STRUCT_STAT_ST_BIRTHTIME
|
|
||||||
archive_entry_set_birthtime(entry, st->st_birthtime, 0);
|
|
||||||
#else
|
|
||||||
archive_entry_unset_birthtime(entry);
|
|
||||||
#endif
|
|
||||||
archive_entry_set_dev(entry, st->st_dev);
|
|
||||||
archive_entry_set_gid(entry, st->st_gid);
|
|
||||||
archive_entry_set_uid(entry, st->st_uid);
|
|
||||||
archive_entry_set_ino(entry, st->st_ino);
|
|
||||||
archive_entry_set_nlink(entry, st->st_nlink);
|
|
||||||
archive_entry_set_rdev(entry, st->st_rdev);
|
|
||||||
archive_entry_set_size(entry, st->st_size);
|
|
||||||
archive_entry_set_mode(entry, st->st_mode);
|
|
||||||
}
|
|
|
@ -1,447 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry_link_resolver.c 201100 2009-12-28 03:05:31Z kientzle $");
|
|
||||||
|
|
||||||
#ifdef HAVE_SYS_STAT_H
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_ERRNO_H
|
|
||||||
#include <errno.h>
|
|
||||||
#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#ifdef HAVE_STDLIB_H
|
|
||||||
#include <stdlib.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_STRING_H
|
|
||||||
#include <string.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "archive.h"
|
|
||||||
#include "archive_entry.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is mostly a pretty straightforward hash table implementation.
|
|
||||||
* The only interesting bit is the different strategies used to
|
|
||||||
* match up links. These strategies match those used by various
|
|
||||||
* archiving formats:
|
|
||||||
* tar - content stored with first link, remainder refer back to it.
|
|
||||||
* This requires us to match each subsequent link up with the
|
|
||||||
* first appearance.
|
|
||||||
* cpio - Old cpio just stored body with each link, match-ups were
|
|
||||||
* implicit. This is trivial.
|
|
||||||
* new cpio - New cpio only stores body with last link, match-ups
|
|
||||||
* are implicit. This is actually quite tricky; see the notes
|
|
||||||
* below.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Users pass us a format code, we translate that into a strategy here. */
|
|
||||||
#define ARCHIVE_ENTRY_LINKIFY_LIKE_TAR 0
|
|
||||||
#define ARCHIVE_ENTRY_LINKIFY_LIKE_MTREE 1
|
|
||||||
#define ARCHIVE_ENTRY_LINKIFY_LIKE_OLD_CPIO 2
|
|
||||||
#define ARCHIVE_ENTRY_LINKIFY_LIKE_NEW_CPIO 3
|
|
||||||
|
|
||||||
/* Initial size of link cache. */
|
|
||||||
#define links_cache_initial_size 1024
|
|
||||||
|
|
||||||
struct links_entry {
|
|
||||||
struct links_entry *next;
|
|
||||||
struct links_entry *previous;
|
|
||||||
struct archive_entry *canonical;
|
|
||||||
struct archive_entry *entry;
|
|
||||||
size_t hash;
|
|
||||||
unsigned int links; /* # links not yet seen */
|
|
||||||
};
|
|
||||||
|
|
||||||
struct archive_entry_linkresolver {
|
|
||||||
struct links_entry **buckets;
|
|
||||||
struct links_entry *spare;
|
|
||||||
unsigned long number_entries;
|
|
||||||
size_t number_buckets;
|
|
||||||
int strategy;
|
|
||||||
};
|
|
||||||
|
|
||||||
#define NEXT_ENTRY_DEFERRED 1
|
|
||||||
#define NEXT_ENTRY_PARTIAL 2
|
|
||||||
#define NEXT_ENTRY_ALL (NEXT_ENTRY_DEFERRED | NEXT_ENTRY_PARTIAL)
|
|
||||||
|
|
||||||
static struct links_entry *find_entry(struct archive_entry_linkresolver *,
|
|
||||||
struct archive_entry *);
|
|
||||||
static void grow_hash(struct archive_entry_linkresolver *);
|
|
||||||
static struct links_entry *insert_entry(struct archive_entry_linkresolver *,
|
|
||||||
struct archive_entry *);
|
|
||||||
static struct links_entry *next_entry(struct archive_entry_linkresolver *,
|
|
||||||
int);
|
|
||||||
|
|
||||||
struct archive_entry_linkresolver *
|
|
||||||
archive_entry_linkresolver_new(void)
|
|
||||||
{
|
|
||||||
struct archive_entry_linkresolver *res;
|
|
||||||
|
|
||||||
/* Check for positive power-of-two */
|
|
||||||
if (links_cache_initial_size == 0 ||
|
|
||||||
(links_cache_initial_size & (links_cache_initial_size - 1)) != 0)
|
|
||||||
return (NULL);
|
|
||||||
|
|
||||||
res = calloc(1, sizeof(struct archive_entry_linkresolver));
|
|
||||||
if (res == NULL)
|
|
||||||
return (NULL);
|
|
||||||
res->number_buckets = links_cache_initial_size;
|
|
||||||
res->buckets = calloc(res->number_buckets, sizeof(res->buckets[0]));
|
|
||||||
if (res->buckets == NULL) {
|
|
||||||
free(res);
|
|
||||||
return (NULL);
|
|
||||||
}
|
|
||||||
return (res);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
archive_entry_linkresolver_set_strategy(struct archive_entry_linkresolver *res,
|
|
||||||
int fmt)
|
|
||||||
{
|
|
||||||
int fmtbase = fmt & ARCHIVE_FORMAT_BASE_MASK;
|
|
||||||
|
|
||||||
switch (fmtbase) {
|
|
||||||
case ARCHIVE_FORMAT_7ZIP:
|
|
||||||
case ARCHIVE_FORMAT_AR:
|
|
||||||
case ARCHIVE_FORMAT_ZIP:
|
|
||||||
res->strategy = ARCHIVE_ENTRY_LINKIFY_LIKE_OLD_CPIO;
|
|
||||||
break;
|
|
||||||
case ARCHIVE_FORMAT_CPIO:
|
|
||||||
switch (fmt) {
|
|
||||||
case ARCHIVE_FORMAT_CPIO_SVR4_NOCRC:
|
|
||||||
case ARCHIVE_FORMAT_CPIO_SVR4_CRC:
|
|
||||||
res->strategy = ARCHIVE_ENTRY_LINKIFY_LIKE_NEW_CPIO;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
res->strategy = ARCHIVE_ENTRY_LINKIFY_LIKE_OLD_CPIO;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ARCHIVE_FORMAT_MTREE:
|
|
||||||
res->strategy = ARCHIVE_ENTRY_LINKIFY_LIKE_MTREE;
|
|
||||||
break;
|
|
||||||
case ARCHIVE_FORMAT_ISO9660:
|
|
||||||
case ARCHIVE_FORMAT_SHAR:
|
|
||||||
case ARCHIVE_FORMAT_TAR:
|
|
||||||
case ARCHIVE_FORMAT_XAR:
|
|
||||||
res->strategy = ARCHIVE_ENTRY_LINKIFY_LIKE_TAR;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
res->strategy = ARCHIVE_ENTRY_LINKIFY_LIKE_OLD_CPIO;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
archive_entry_linkresolver_free(struct archive_entry_linkresolver *res)
|
|
||||||
{
|
|
||||||
struct links_entry *le;
|
|
||||||
|
|
||||||
if (res == NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
while ((le = next_entry(res, NEXT_ENTRY_ALL)) != NULL)
|
|
||||||
archive_entry_free(le->entry);
|
|
||||||
free(res->buckets);
|
|
||||||
free(res);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
archive_entry_linkify(struct archive_entry_linkresolver *res,
|
|
||||||
struct archive_entry **e, struct archive_entry **f)
|
|
||||||
{
|
|
||||||
struct links_entry *le;
|
|
||||||
struct archive_entry *t;
|
|
||||||
|
|
||||||
*f = NULL; /* Default: Don't return a second entry. */
|
|
||||||
|
|
||||||
if (*e == NULL) {
|
|
||||||
le = next_entry(res, NEXT_ENTRY_DEFERRED);
|
|
||||||
if (le != NULL) {
|
|
||||||
*e = le->entry;
|
|
||||||
le->entry = NULL;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If it has only one link, then we're done. */
|
|
||||||
if (archive_entry_nlink(*e) == 1)
|
|
||||||
return;
|
|
||||||
/* Directories, devices never have hardlinks. */
|
|
||||||
if (archive_entry_filetype(*e) == AE_IFDIR
|
|
||||||
|| archive_entry_filetype(*e) == AE_IFBLK
|
|
||||||
|| archive_entry_filetype(*e) == AE_IFCHR)
|
|
||||||
return;
|
|
||||||
|
|
||||||
switch (res->strategy) {
|
|
||||||
case ARCHIVE_ENTRY_LINKIFY_LIKE_TAR:
|
|
||||||
le = find_entry(res, *e);
|
|
||||||
if (le != NULL) {
|
|
||||||
archive_entry_unset_size(*e);
|
|
||||||
archive_entry_copy_hardlink(*e,
|
|
||||||
archive_entry_pathname(le->canonical));
|
|
||||||
} else
|
|
||||||
insert_entry(res, *e);
|
|
||||||
return;
|
|
||||||
case ARCHIVE_ENTRY_LINKIFY_LIKE_MTREE:
|
|
||||||
le = find_entry(res, *e);
|
|
||||||
if (le != NULL) {
|
|
||||||
archive_entry_copy_hardlink(*e,
|
|
||||||
archive_entry_pathname(le->canonical));
|
|
||||||
} else
|
|
||||||
insert_entry(res, *e);
|
|
||||||
return;
|
|
||||||
case ARCHIVE_ENTRY_LINKIFY_LIKE_OLD_CPIO:
|
|
||||||
/* This one is trivial. */
|
|
||||||
return;
|
|
||||||
case ARCHIVE_ENTRY_LINKIFY_LIKE_NEW_CPIO:
|
|
||||||
le = find_entry(res, *e);
|
|
||||||
if (le != NULL) {
|
|
||||||
/*
|
|
||||||
* Put the new entry in le, return the
|
|
||||||
* old entry from le.
|
|
||||||
*/
|
|
||||||
t = *e;
|
|
||||||
*e = le->entry;
|
|
||||||
le->entry = t;
|
|
||||||
/* Make the old entry into a hardlink. */
|
|
||||||
archive_entry_unset_size(*e);
|
|
||||||
archive_entry_copy_hardlink(*e,
|
|
||||||
archive_entry_pathname(le->canonical));
|
|
||||||
/* If we ran out of links, return the
|
|
||||||
* final entry as well. */
|
|
||||||
if (le->links == 0) {
|
|
||||||
*f = le->entry;
|
|
||||||
le->entry = NULL;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
/*
|
|
||||||
* If we haven't seen it, tuck it away
|
|
||||||
* for future use.
|
|
||||||
*/
|
|
||||||
le = insert_entry(res, *e);
|
|
||||||
if (le == NULL)
|
|
||||||
/* XXX We should return an error code XXX */
|
|
||||||
return;
|
|
||||||
le->entry = *e;
|
|
||||||
*e = NULL;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct links_entry *
|
|
||||||
find_entry(struct archive_entry_linkresolver *res,
|
|
||||||
struct archive_entry *entry)
|
|
||||||
{
|
|
||||||
struct links_entry *le;
|
|
||||||
size_t hash, bucket;
|
|
||||||
dev_t dev;
|
|
||||||
int64_t ino;
|
|
||||||
|
|
||||||
/* Free a held entry. */
|
|
||||||
if (res->spare != NULL) {
|
|
||||||
archive_entry_free(res->spare->canonical);
|
|
||||||
archive_entry_free(res->spare->entry);
|
|
||||||
free(res->spare);
|
|
||||||
res->spare = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
dev = archive_entry_dev(entry);
|
|
||||||
ino = archive_entry_ino64(entry);
|
|
||||||
hash = (size_t)(dev ^ ino);
|
|
||||||
|
|
||||||
/* Try to locate this entry in the links cache. */
|
|
||||||
bucket = hash & (res->number_buckets - 1);
|
|
||||||
for (le = res->buckets[bucket]; le != NULL; le = le->next) {
|
|
||||||
if (le->hash == hash
|
|
||||||
&& dev == archive_entry_dev(le->canonical)
|
|
||||||
&& ino == archive_entry_ino64(le->canonical)) {
|
|
||||||
/*
|
|
||||||
* Decrement link count each time and release
|
|
||||||
* the entry if it hits zero. This saves
|
|
||||||
* memory and is necessary for detecting
|
|
||||||
* missed links.
|
|
||||||
*/
|
|
||||||
--le->links;
|
|
||||||
if (le->links > 0)
|
|
||||||
return (le);
|
|
||||||
/* Remove it from this hash bucket. */
|
|
||||||
if (le->previous != NULL)
|
|
||||||
le->previous->next = le->next;
|
|
||||||
if (le->next != NULL)
|
|
||||||
le->next->previous = le->previous;
|
|
||||||
if (res->buckets[bucket] == le)
|
|
||||||
res->buckets[bucket] = le->next;
|
|
||||||
res->number_entries--;
|
|
||||||
/* Defer freeing this entry. */
|
|
||||||
res->spare = le;
|
|
||||||
return (le);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return (NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct links_entry *
|
|
||||||
next_entry(struct archive_entry_linkresolver *res, int mode)
|
|
||||||
{
|
|
||||||
struct links_entry *le;
|
|
||||||
size_t bucket;
|
|
||||||
|
|
||||||
/* Free a held entry. */
|
|
||||||
if (res->spare != NULL) {
|
|
||||||
archive_entry_free(res->spare->canonical);
|
|
||||||
archive_entry_free(res->spare->entry);
|
|
||||||
free(res->spare);
|
|
||||||
res->spare = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Look for next non-empty bucket in the links cache. */
|
|
||||||
for (bucket = 0; bucket < res->number_buckets; bucket++) {
|
|
||||||
for (le = res->buckets[bucket]; le != NULL; le = le->next) {
|
|
||||||
if (le->entry != NULL &&
|
|
||||||
(mode & NEXT_ENTRY_DEFERRED) == 0)
|
|
||||||
continue;
|
|
||||||
if (le->entry == NULL &&
|
|
||||||
(mode & NEXT_ENTRY_PARTIAL) == 0)
|
|
||||||
continue;
|
|
||||||
/* Remove it from this hash bucket. */
|
|
||||||
if (le->next != NULL)
|
|
||||||
le->next->previous = le->previous;
|
|
||||||
if (le->previous != NULL)
|
|
||||||
le->previous->next = le->next;
|
|
||||||
else
|
|
||||||
res->buckets[bucket] = le->next;
|
|
||||||
res->number_entries--;
|
|
||||||
/* Defer freeing this entry. */
|
|
||||||
res->spare = le;
|
|
||||||
return (le);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return (NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct links_entry *
|
|
||||||
insert_entry(struct archive_entry_linkresolver *res,
|
|
||||||
struct archive_entry *entry)
|
|
||||||
{
|
|
||||||
struct links_entry *le;
|
|
||||||
size_t hash, bucket;
|
|
||||||
|
|
||||||
/* Add this entry to the links cache. */
|
|
||||||
le = calloc(1, sizeof(struct links_entry));
|
|
||||||
if (le == NULL)
|
|
||||||
return (NULL);
|
|
||||||
le->canonical = archive_entry_clone(entry);
|
|
||||||
|
|
||||||
/* If the links cache is getting too full, enlarge the hash table. */
|
|
||||||
if (res->number_entries > res->number_buckets * 2)
|
|
||||||
grow_hash(res);
|
|
||||||
|
|
||||||
hash = (size_t)(archive_entry_dev(entry) ^ archive_entry_ino64(entry));
|
|
||||||
bucket = hash & (res->number_buckets - 1);
|
|
||||||
|
|
||||||
/* If we could allocate the entry, record it. */
|
|
||||||
if (res->buckets[bucket] != NULL)
|
|
||||||
res->buckets[bucket]->previous = le;
|
|
||||||
res->number_entries++;
|
|
||||||
le->next = res->buckets[bucket];
|
|
||||||
le->previous = NULL;
|
|
||||||
res->buckets[bucket] = le;
|
|
||||||
le->hash = hash;
|
|
||||||
le->links = archive_entry_nlink(entry) - 1;
|
|
||||||
return (le);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
grow_hash(struct archive_entry_linkresolver *res)
|
|
||||||
{
|
|
||||||
struct links_entry *le, **new_buckets;
|
|
||||||
size_t new_size;
|
|
||||||
size_t i, bucket;
|
|
||||||
|
|
||||||
/* Try to enlarge the bucket list. */
|
|
||||||
new_size = res->number_buckets * 2;
|
|
||||||
if (new_size < res->number_buckets)
|
|
||||||
return;
|
|
||||||
new_buckets = calloc(new_size, sizeof(struct links_entry *));
|
|
||||||
|
|
||||||
if (new_buckets == NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
for (i = 0; i < res->number_buckets; i++) {
|
|
||||||
while (res->buckets[i] != NULL) {
|
|
||||||
/* Remove entry from old bucket. */
|
|
||||||
le = res->buckets[i];
|
|
||||||
res->buckets[i] = le->next;
|
|
||||||
|
|
||||||
/* Add entry to new bucket. */
|
|
||||||
bucket = le->hash & (new_size - 1);
|
|
||||||
|
|
||||||
if (new_buckets[bucket] != NULL)
|
|
||||||
new_buckets[bucket]->previous = le;
|
|
||||||
le->next = new_buckets[bucket];
|
|
||||||
le->previous = NULL;
|
|
||||||
new_buckets[bucket] = le;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
free(res->buckets);
|
|
||||||
res->buckets = new_buckets;
|
|
||||||
res->number_buckets = new_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct archive_entry *
|
|
||||||
archive_entry_partial_links(struct archive_entry_linkresolver *res,
|
|
||||||
unsigned int *links)
|
|
||||||
{
|
|
||||||
struct archive_entry *e;
|
|
||||||
struct links_entry *le;
|
|
||||||
|
|
||||||
/* Free a held entry. */
|
|
||||||
if (res->spare != NULL) {
|
|
||||||
archive_entry_free(res->spare->canonical);
|
|
||||||
archive_entry_free(res->spare->entry);
|
|
||||||
free(res->spare);
|
|
||||||
res->spare = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
le = next_entry(res, NEXT_ENTRY_PARTIAL);
|
|
||||||
if (le != NULL) {
|
|
||||||
e = le->canonical;
|
|
||||||
if (links != NULL)
|
|
||||||
*links = le->links;
|
|
||||||
le->canonical = NULL;
|
|
||||||
} else {
|
|
||||||
e = NULL;
|
|
||||||
if (links != NULL)
|
|
||||||
*links = 0;
|
|
||||||
}
|
|
||||||
return (e);
|
|
||||||
}
|
|
|
@ -1,88 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2011 Michihiro NAKAJIMA
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* $FreeBSD$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __LIBARCHIVE_BUILD
|
|
||||||
#error This header is only to be used internally to libarchive.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_ENTRY_LOCALE_H_INCLUDED
|
|
||||||
#define ARCHIVE_ENTRY_LOCALE_H_INCLUDED
|
|
||||||
|
|
||||||
struct archive_entry;
|
|
||||||
struct archive_string_conv;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Utility functions to set and get entry attributes by translating
|
|
||||||
* character-set. These are designed for use in format readers and writers.
|
|
||||||
*
|
|
||||||
* The return code and interface of these are quite different from other
|
|
||||||
* functions for archive_entry defined in archive_entry.h.
|
|
||||||
* Common return code are:
|
|
||||||
* Return 0 if the string conversion succeeded.
|
|
||||||
* Return -1 if the string conversion failed.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define archive_entry_gname_l _archive_entry_gname_l
|
|
||||||
int _archive_entry_gname_l(struct archive_entry *,
|
|
||||||
const char **, size_t *, struct archive_string_conv *);
|
|
||||||
#define archive_entry_hardlink_l _archive_entry_hardlink_l
|
|
||||||
int _archive_entry_hardlink_l(struct archive_entry *,
|
|
||||||
const char **, size_t *, struct archive_string_conv *);
|
|
||||||
#define archive_entry_pathname_l _archive_entry_pathname_l
|
|
||||||
int _archive_entry_pathname_l(struct archive_entry *,
|
|
||||||
const char **, size_t *, struct archive_string_conv *);
|
|
||||||
#define archive_entry_symlink_l _archive_entry_symlink_l
|
|
||||||
int _archive_entry_symlink_l(struct archive_entry *,
|
|
||||||
const char **, size_t *, struct archive_string_conv *);
|
|
||||||
#define archive_entry_uname_l _archive_entry_uname_l
|
|
||||||
int _archive_entry_uname_l(struct archive_entry *,
|
|
||||||
const char **, size_t *, struct archive_string_conv *);
|
|
||||||
#define archive_entry_acl_text_l _archive_entry_acl_text_l
|
|
||||||
int _archive_entry_acl_text_l(struct archive_entry *, int,
|
|
||||||
const char **, size_t *, struct archive_string_conv *);
|
|
||||||
|
|
||||||
|
|
||||||
#define archive_entry_copy_gname_l _archive_entry_copy_gname_l
|
|
||||||
int _archive_entry_copy_gname_l(struct archive_entry *,
|
|
||||||
const char *, size_t, struct archive_string_conv *);
|
|
||||||
#define archive_entry_copy_hardlink_l _archive_entry_copy_hardlink_l
|
|
||||||
int _archive_entry_copy_hardlink_l(struct archive_entry *,
|
|
||||||
const char *, size_t, struct archive_string_conv *);
|
|
||||||
#define archive_entry_copy_link_l _archive_entry_copy_link_l
|
|
||||||
int _archive_entry_copy_link_l(struct archive_entry *,
|
|
||||||
const char *, size_t, struct archive_string_conv *);
|
|
||||||
#define archive_entry_copy_pathname_l _archive_entry_copy_pathname_l
|
|
||||||
int _archive_entry_copy_pathname_l(struct archive_entry *,
|
|
||||||
const char *, size_t, struct archive_string_conv *);
|
|
||||||
#define archive_entry_copy_symlink_l _archive_entry_copy_symlink_l
|
|
||||||
int _archive_entry_copy_symlink_l(struct archive_entry *,
|
|
||||||
const char *, size_t, struct archive_string_conv *);
|
|
||||||
#define archive_entry_copy_uname_l _archive_entry_copy_uname_l
|
|
||||||
int _archive_entry_copy_uname_l(struct archive_entry *,
|
|
||||||
const char *, size_t, struct archive_string_conv *);
|
|
||||||
|
|
||||||
#endif /* ARCHIVE_ENTRY_LOCALE_H_INCLUDED */
|
|
|
@ -1,176 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* $FreeBSD: head/lib/libarchive/archive_entry_private.h 201096 2009-12-28 02:41:27Z kientzle $
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __LIBARCHIVE_BUILD
|
|
||||||
#error This header is only to be used internally to libarchive.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED
|
|
||||||
#define ARCHIVE_ENTRY_PRIVATE_H_INCLUDED
|
|
||||||
|
|
||||||
#include "archive_acl_private.h"
|
|
||||||
#include "archive_string.h"
|
|
||||||
|
|
||||||
struct ae_xattr {
|
|
||||||
struct ae_xattr *next;
|
|
||||||
|
|
||||||
char *name;
|
|
||||||
void *value;
|
|
||||||
size_t size;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct ae_sparse {
|
|
||||||
struct ae_sparse *next;
|
|
||||||
|
|
||||||
int64_t offset;
|
|
||||||
int64_t length;
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Description of an archive entry.
|
|
||||||
*
|
|
||||||
* Basically, this is a "struct stat" with a few text fields added in.
|
|
||||||
*
|
|
||||||
* TODO: Add "comment", "charset", and possibly other entries
|
|
||||||
* that are supported by "pax interchange" format. However, GNU, ustar,
|
|
||||||
* cpio, and other variants don't support these features, so they're not an
|
|
||||||
* excruciatingly high priority right now.
|
|
||||||
*
|
|
||||||
* TODO: "pax interchange" format allows essentially arbitrary
|
|
||||||
* key/value attributes to be attached to any entry. Supporting
|
|
||||||
* such extensions may make this library useful for special
|
|
||||||
* applications (e.g., a package manager could attach special
|
|
||||||
* package-management attributes to each entry). There are tricky
|
|
||||||
* API issues involved, so this is not going to happen until
|
|
||||||
* there's a real demand for it.
|
|
||||||
*
|
|
||||||
* TODO: Design a good API for handling sparse files.
|
|
||||||
*/
|
|
||||||
struct archive_entry {
|
|
||||||
struct archive *archive;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Note that ae_stat.st_mode & AE_IFMT can be 0!
|
|
||||||
*
|
|
||||||
* This occurs when the actual file type of the object is not
|
|
||||||
* in the archive. For example, 'tar' archives store
|
|
||||||
* hardlinks without marking the type of the underlying
|
|
||||||
* object.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* We have a "struct aest" for holding file metadata rather than just
|
|
||||||
* a "struct stat" because on some platforms the "struct stat" has
|
|
||||||
* fields which are too narrow to hold the range of possible values;
|
|
||||||
* we don't want to lose information if we read an archive and write
|
|
||||||
* out another (e.g., in "tar -cf new.tar @old.tar").
|
|
||||||
*
|
|
||||||
* The "stat" pointer points to some form of platform-specific struct
|
|
||||||
* stat; it is declared as a void * rather than a struct stat * as
|
|
||||||
* some platforms have multiple varieties of stat structures.
|
|
||||||
*/
|
|
||||||
void *stat;
|
|
||||||
int stat_valid; /* Set to 0 whenever a field in aest changes. */
|
|
||||||
|
|
||||||
struct aest {
|
|
||||||
int64_t aest_atime;
|
|
||||||
uint32_t aest_atime_nsec;
|
|
||||||
int64_t aest_ctime;
|
|
||||||
uint32_t aest_ctime_nsec;
|
|
||||||
int64_t aest_mtime;
|
|
||||||
uint32_t aest_mtime_nsec;
|
|
||||||
int64_t aest_birthtime;
|
|
||||||
uint32_t aest_birthtime_nsec;
|
|
||||||
int64_t aest_gid;
|
|
||||||
int64_t aest_ino;
|
|
||||||
uint32_t aest_nlink;
|
|
||||||
uint64_t aest_size;
|
|
||||||
int64_t aest_uid;
|
|
||||||
/*
|
|
||||||
* Because converting between device codes and
|
|
||||||
* major/minor values is platform-specific and
|
|
||||||
* inherently a bit risky, we only do that conversion
|
|
||||||
* lazily. That way, we will do a better job of
|
|
||||||
* preserving information in those cases where no
|
|
||||||
* conversion is actually required.
|
|
||||||
*/
|
|
||||||
int aest_dev_is_broken_down;
|
|
||||||
dev_t aest_dev;
|
|
||||||
dev_t aest_devmajor;
|
|
||||||
dev_t aest_devminor;
|
|
||||||
int aest_rdev_is_broken_down;
|
|
||||||
dev_t aest_rdev;
|
|
||||||
dev_t aest_rdevmajor;
|
|
||||||
dev_t aest_rdevminor;
|
|
||||||
} ae_stat;
|
|
||||||
|
|
||||||
int ae_set; /* bitmap of fields that are currently set */
|
|
||||||
#define AE_SET_HARDLINK 1
|
|
||||||
#define AE_SET_SYMLINK 2
|
|
||||||
#define AE_SET_ATIME 4
|
|
||||||
#define AE_SET_CTIME 8
|
|
||||||
#define AE_SET_MTIME 16
|
|
||||||
#define AE_SET_BIRTHTIME 32
|
|
||||||
#define AE_SET_SIZE 64
|
|
||||||
#define AE_SET_INO 128
|
|
||||||
#define AE_SET_DEV 256
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Use aes here so that we get transparent mbs<->wcs conversions.
|
|
||||||
*/
|
|
||||||
struct archive_mstring ae_fflags_text; /* Text fflags per fflagstostr(3) */
|
|
||||||
unsigned long ae_fflags_set; /* Bitmap fflags */
|
|
||||||
unsigned long ae_fflags_clear;
|
|
||||||
struct archive_mstring ae_gname; /* Name of owning group */
|
|
||||||
struct archive_mstring ae_hardlink; /* Name of target for hardlink */
|
|
||||||
struct archive_mstring ae_pathname; /* Name of entry */
|
|
||||||
struct archive_mstring ae_symlink; /* symlink contents */
|
|
||||||
struct archive_mstring ae_uname; /* Name of owner */
|
|
||||||
|
|
||||||
/* Not used within libarchive; useful for some clients. */
|
|
||||||
struct archive_mstring ae_sourcepath; /* Path this entry is sourced from. */
|
|
||||||
|
|
||||||
void *mac_metadata;
|
|
||||||
size_t mac_metadata_size;
|
|
||||||
|
|
||||||
/* ACL support. */
|
|
||||||
struct archive_acl acl;
|
|
||||||
|
|
||||||
/* extattr support. */
|
|
||||||
struct ae_xattr *xattr_head;
|
|
||||||
struct ae_xattr *xattr_p;
|
|
||||||
|
|
||||||
/* sparse support. */
|
|
||||||
struct ae_sparse *sparse_head;
|
|
||||||
struct ae_sparse *sparse_tail;
|
|
||||||
struct ae_sparse *sparse_p;
|
|
||||||
|
|
||||||
/* Miscellaneous. */
|
|
||||||
char strmode[12];
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* ARCHIVE_ENTRY_PRIVATE_H_INCLUDED */
|
|
|
@ -1,156 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* Copyright (c) 2010-2011 Michihiro NAKAJIMA
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#include "archive.h"
|
|
||||||
#include "archive_entry.h"
|
|
||||||
#include "archive_private.h"
|
|
||||||
#include "archive_entry_private.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* sparse handling
|
|
||||||
*/
|
|
||||||
|
|
||||||
void
|
|
||||||
archive_entry_sparse_clear(struct archive_entry *entry)
|
|
||||||
{
|
|
||||||
struct ae_sparse *sp;
|
|
||||||
|
|
||||||
while (entry->sparse_head != NULL) {
|
|
||||||
sp = entry->sparse_head->next;
|
|
||||||
free(entry->sparse_head);
|
|
||||||
entry->sparse_head = sp;
|
|
||||||
}
|
|
||||||
entry->sparse_tail = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
archive_entry_sparse_add_entry(struct archive_entry *entry,
|
|
||||||
int64_t offset, int64_t length)
|
|
||||||
{
|
|
||||||
struct ae_sparse *sp;
|
|
||||||
|
|
||||||
if (offset < 0 || length < 0)
|
|
||||||
/* Invalid value */
|
|
||||||
return;
|
|
||||||
if (offset + length < 0 ||
|
|
||||||
offset + length > archive_entry_size(entry))
|
|
||||||
/* A value of "length" parameter is too large. */
|
|
||||||
return;
|
|
||||||
if ((sp = entry->sparse_tail) != NULL) {
|
|
||||||
if (sp->offset + sp->length > offset)
|
|
||||||
/* Invalid value. */
|
|
||||||
return;
|
|
||||||
if (sp->offset + sp->length == offset) {
|
|
||||||
if (sp->offset + sp->length + length < 0)
|
|
||||||
/* A value of "length" parameter is
|
|
||||||
* too large. */
|
|
||||||
return;
|
|
||||||
/* Expand existing sparse block size. */
|
|
||||||
sp->length += length;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((sp = (struct ae_sparse *)malloc(sizeof(*sp))) == NULL)
|
|
||||||
/* XXX Error XXX */
|
|
||||||
return;
|
|
||||||
|
|
||||||
sp->offset = offset;
|
|
||||||
sp->length = length;
|
|
||||||
sp->next = NULL;
|
|
||||||
|
|
||||||
if (entry->sparse_head == NULL)
|
|
||||||
entry->sparse_head = entry->sparse_tail = sp;
|
|
||||||
else {
|
|
||||||
/* Add a new sparse block to the tail of list. */
|
|
||||||
if (entry->sparse_tail != NULL)
|
|
||||||
entry->sparse_tail->next = sp;
|
|
||||||
entry->sparse_tail = sp;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* returns number of the sparse entries
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
archive_entry_sparse_count(struct archive_entry *entry)
|
|
||||||
{
|
|
||||||
struct ae_sparse *sp;
|
|
||||||
int count = 0;
|
|
||||||
|
|
||||||
for (sp = entry->sparse_head; sp != NULL; sp = sp->next)
|
|
||||||
count++;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Sanity check if this entry is exactly sparse.
|
|
||||||
* If amount of sparse blocks is just one and it indicates the whole
|
|
||||||
* file data, we should remove it and return zero.
|
|
||||||
*/
|
|
||||||
if (count == 1) {
|
|
||||||
sp = entry->sparse_head;
|
|
||||||
if (sp->offset == 0 &&
|
|
||||||
sp->length >= archive_entry_size(entry)) {
|
|
||||||
count = 0;
|
|
||||||
archive_entry_sparse_clear(entry);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (count);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
archive_entry_sparse_reset(struct archive_entry * entry)
|
|
||||||
{
|
|
||||||
entry->sparse_p = entry->sparse_head;
|
|
||||||
|
|
||||||
return archive_entry_sparse_count(entry);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
archive_entry_sparse_next(struct archive_entry * entry,
|
|
||||||
int64_t *offset, int64_t *length)
|
|
||||||
{
|
|
||||||
if (entry->sparse_p) {
|
|
||||||
*offset = entry->sparse_p->offset;
|
|
||||||
*length = entry->sparse_p->length;
|
|
||||||
|
|
||||||
entry->sparse_p = entry->sparse_p->next;
|
|
||||||
|
|
||||||
return (ARCHIVE_OK);
|
|
||||||
} else {
|
|
||||||
*offset = 0;
|
|
||||||
*length = 0;
|
|
||||||
return (ARCHIVE_WARN);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* end of sparse handling
|
|
||||||
*/
|
|
|
@ -1,118 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry_stat.c 201100 2009-12-28 03:05:31Z kientzle $");
|
|
||||||
|
|
||||||
#ifdef HAVE_SYS_STAT_H
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_STDLIB_H
|
|
||||||
#include <stdlib.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "archive_entry.h"
|
|
||||||
#include "archive_entry_private.h"
|
|
||||||
|
|
||||||
const struct stat *
|
|
||||||
archive_entry_stat(struct archive_entry *entry)
|
|
||||||
{
|
|
||||||
struct stat *st;
|
|
||||||
if (entry->stat == NULL) {
|
|
||||||
entry->stat = calloc(1, sizeof(*st));
|
|
||||||
if (entry->stat == NULL)
|
|
||||||
return (NULL);
|
|
||||||
entry->stat_valid = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If none of the underlying fields have been changed, we
|
|
||||||
* don't need to regenerate. In theory, we could use a bitmap
|
|
||||||
* here to flag only those items that have changed, but the
|
|
||||||
* extra complexity probably isn't worth it. It will be very
|
|
||||||
* rare for anyone to change just one field then request a new
|
|
||||||
* stat structure.
|
|
||||||
*/
|
|
||||||
if (entry->stat_valid)
|
|
||||||
return (entry->stat);
|
|
||||||
|
|
||||||
st = entry->stat;
|
|
||||||
/*
|
|
||||||
* Use the public interfaces to extract items, so that
|
|
||||||
* the appropriate conversions get invoked.
|
|
||||||
*/
|
|
||||||
st->st_atime = archive_entry_atime(entry);
|
|
||||||
#if HAVE_STRUCT_STAT_ST_BIRTHTIME
|
|
||||||
st->st_birthtime = archive_entry_birthtime(entry);
|
|
||||||
#endif
|
|
||||||
st->st_ctime = archive_entry_ctime(entry);
|
|
||||||
st->st_mtime = archive_entry_mtime(entry);
|
|
||||||
st->st_dev = archive_entry_dev(entry);
|
|
||||||
st->st_gid = (gid_t)archive_entry_gid(entry);
|
|
||||||
st->st_uid = (uid_t)archive_entry_uid(entry);
|
|
||||||
st->st_ino = (ino_t)archive_entry_ino64(entry);
|
|
||||||
st->st_nlink = archive_entry_nlink(entry);
|
|
||||||
st->st_rdev = archive_entry_rdev(entry);
|
|
||||||
st->st_size = (off_t)archive_entry_size(entry);
|
|
||||||
st->st_mode = archive_entry_mode(entry);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* On systems that support high-res timestamps, copy that
|
|
||||||
* information into struct stat.
|
|
||||||
*/
|
|
||||||
#if HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC
|
|
||||||
st->st_atimespec.tv_nsec = archive_entry_atime_nsec(entry);
|
|
||||||
st->st_ctimespec.tv_nsec = archive_entry_ctime_nsec(entry);
|
|
||||||
st->st_mtimespec.tv_nsec = archive_entry_mtime_nsec(entry);
|
|
||||||
#elif HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
|
|
||||||
st->st_atim.tv_nsec = archive_entry_atime_nsec(entry);
|
|
||||||
st->st_ctim.tv_nsec = archive_entry_ctime_nsec(entry);
|
|
||||||
st->st_mtim.tv_nsec = archive_entry_mtime_nsec(entry);
|
|
||||||
#elif HAVE_STRUCT_STAT_ST_MTIME_N
|
|
||||||
st->st_atime_n = archive_entry_atime_nsec(entry);
|
|
||||||
st->st_ctime_n = archive_entry_ctime_nsec(entry);
|
|
||||||
st->st_mtime_n = archive_entry_mtime_nsec(entry);
|
|
||||||
#elif HAVE_STRUCT_STAT_ST_UMTIME
|
|
||||||
st->st_uatime = archive_entry_atime_nsec(entry) / 1000;
|
|
||||||
st->st_uctime = archive_entry_ctime_nsec(entry) / 1000;
|
|
||||||
st->st_umtime = archive_entry_mtime_nsec(entry) / 1000;
|
|
||||||
#elif HAVE_STRUCT_STAT_ST_MTIME_USEC
|
|
||||||
st->st_atime_usec = archive_entry_atime_nsec(entry) / 1000;
|
|
||||||
st->st_ctime_usec = archive_entry_ctime_nsec(entry) / 1000;
|
|
||||||
st->st_mtime_usec = archive_entry_mtime_nsec(entry) / 1000;
|
|
||||||
#endif
|
|
||||||
#if HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC
|
|
||||||
st->st_birthtimespec.tv_nsec = archive_entry_birthtime_nsec(entry);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* TODO: On Linux, store 32 or 64 here depending on whether
|
|
||||||
* the cached stat structure is a stat32 or a stat64. This
|
|
||||||
* will allow us to support both variants interchangeably.
|
|
||||||
*/
|
|
||||||
entry->stat_valid = 1;
|
|
||||||
|
|
||||||
return (st);
|
|
||||||
}
|
|
|
@ -1,87 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.4 2008/06/15 05:14:01 kientzle Exp $");
|
|
||||||
|
|
||||||
#ifdef HAVE_SYS_STAT_H
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_STRING_H
|
|
||||||
#include <string.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "archive_entry.h"
|
|
||||||
#include "archive_entry_private.h"
|
|
||||||
|
|
||||||
const char *
|
|
||||||
archive_entry_strmode(struct archive_entry *entry)
|
|
||||||
{
|
|
||||||
static const mode_t permbits[] =
|
|
||||||
{ 0400, 0200, 0100, 0040, 0020, 0010, 0004, 0002, 0001 };
|
|
||||||
char *bp = entry->strmode;
|
|
||||||
mode_t mode;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
/* Fill in a default string, then selectively override. */
|
|
||||||
strcpy(bp, "?rwxrwxrwx ");
|
|
||||||
|
|
||||||
mode = archive_entry_mode(entry);
|
|
||||||
switch (archive_entry_filetype(entry)) {
|
|
||||||
case AE_IFREG: bp[0] = '-'; break;
|
|
||||||
case AE_IFBLK: bp[0] = 'b'; break;
|
|
||||||
case AE_IFCHR: bp[0] = 'c'; break;
|
|
||||||
case AE_IFDIR: bp[0] = 'd'; break;
|
|
||||||
case AE_IFLNK: bp[0] = 'l'; break;
|
|
||||||
case AE_IFSOCK: bp[0] = 's'; break;
|
|
||||||
case AE_IFIFO: bp[0] = 'p'; break;
|
|
||||||
default:
|
|
||||||
if (archive_entry_hardlink(entry) != NULL) {
|
|
||||||
bp[0] = 'h';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < 9; i++)
|
|
||||||
if (!(mode & permbits[i]))
|
|
||||||
bp[i+1] = '-';
|
|
||||||
|
|
||||||
if (mode & S_ISUID) {
|
|
||||||
if (mode & 0100) bp[3] = 's';
|
|
||||||
else bp[3] = 'S';
|
|
||||||
}
|
|
||||||
if (mode & S_ISGID) {
|
|
||||||
if (mode & 0010) bp[6] = 's';
|
|
||||||
else bp[6] = 'S';
|
|
||||||
}
|
|
||||||
if (mode & S_ISVTX) {
|
|
||||||
if (mode & 0001) bp[9] = 't';
|
|
||||||
else bp[9] = 'T';
|
|
||||||
}
|
|
||||||
if (archive_entry_acl_count(entry, ARCHIVE_ENTRY_ACL_TYPE_ACCESS))
|
|
||||||
bp[10] = '+';
|
|
||||||
|
|
||||||
return (bp);
|
|
||||||
}
|
|
|
@ -1,210 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry_xattr.c 201096 2009-12-28 02:41:27Z kientzle $");
|
|
||||||
|
|
||||||
#ifdef HAVE_SYS_STAT_H
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_SYS_TYPES_H
|
|
||||||
#include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_LIMITS_H
|
|
||||||
#include <limits.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_LINUX_FS_H
|
|
||||||
#include <linux/fs.h> /* for Linux file flags */
|
|
||||||
#endif
|
|
||||||
/*
|
|
||||||
* Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.
|
|
||||||
* As the include guards don't agree, the order of include is important.
|
|
||||||
*/
|
|
||||||
#ifdef HAVE_LINUX_EXT2_FS_H
|
|
||||||
#include <linux/ext2_fs.h> /* for Linux file flags */
|
|
||||||
#endif
|
|
||||||
#if defined(HAVE_EXT2FS_EXT2_FS_H) && !defined(__CYGWIN__)
|
|
||||||
#include <ext2fs/ext2_fs.h> /* for Linux file flags */
|
|
||||||
#endif
|
|
||||||
#include <stddef.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#ifdef HAVE_STDLIB_H
|
|
||||||
#include <stdlib.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_STRING_H
|
|
||||||
#include <string.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_WCHAR_H
|
|
||||||
#include <wchar.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "archive.h"
|
|
||||||
#include "archive_entry.h"
|
|
||||||
#include "archive_private.h"
|
|
||||||
#include "archive_entry_private.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* extended attribute handling
|
|
||||||
*/
|
|
||||||
|
|
||||||
void
|
|
||||||
archive_entry_xattr_clear(struct archive_entry *entry)
|
|
||||||
{
|
|
||||||
struct ae_xattr *xp;
|
|
||||||
|
|
||||||
while (entry->xattr_head != NULL) {
|
|
||||||
xp = entry->xattr_head->next;
|
|
||||||
free(entry->xattr_head->name);
|
|
||||||
free(entry->xattr_head->value);
|
|
||||||
free(entry->xattr_head);
|
|
||||||
entry->xattr_head = xp;
|
|
||||||
}
|
|
||||||
|
|
||||||
entry->xattr_head = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
archive_entry_xattr_add_entry(struct archive_entry *entry,
|
|
||||||
const char *name, const void *value, size_t size)
|
|
||||||
{
|
|
||||||
struct ae_xattr *xp;
|
|
||||||
|
|
||||||
for (xp = entry->xattr_head; xp != NULL; xp = xp->next)
|
|
||||||
;
|
|
||||||
|
|
||||||
if ((xp = (struct ae_xattr *)malloc(sizeof(struct ae_xattr))) == NULL)
|
|
||||||
/* XXX Error XXX */
|
|
||||||
return;
|
|
||||||
|
|
||||||
xp->name = strdup(name);
|
|
||||||
if ((xp->value = malloc(size)) != NULL) {
|
|
||||||
memcpy(xp->value, value, size);
|
|
||||||
xp->size = size;
|
|
||||||
} else
|
|
||||||
xp->size = 0;
|
|
||||||
|
|
||||||
xp->next = entry->xattr_head;
|
|
||||||
entry->xattr_head = xp;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Delete the named extended attribute, if present.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
archive_entry_xattr_delete_entry(struct archive_entry *entry,
|
|
||||||
const char *name)
|
|
||||||
{
|
|
||||||
struct ae_xattr *xp, *pxp;
|
|
||||||
|
|
||||||
pxp = NULL;
|
|
||||||
for (xp = entry->xattr_head; xp != NULL; xp = xp->next)
|
|
||||||
{
|
|
||||||
if (strcmp(name, xp->name) == 0) {
|
|
||||||
free(xp->name);
|
|
||||||
if (xp->size > 0)
|
|
||||||
free(xp->value);
|
|
||||||
if (pxp == NULL) {
|
|
||||||
/*
|
|
||||||
* Free at head.
|
|
||||||
*/
|
|
||||||
entry->xattr_head = xp->next;
|
|
||||||
free(xp);
|
|
||||||
} else {
|
|
||||||
pxp->next = xp->next;
|
|
||||||
free(xp);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
pxp = xp;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Search for the named extended attribute. Return it's value and size
|
|
||||||
* if present.
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
archive_entry_has_xattr(struct archive_entry *entry,
|
|
||||||
const char *name, const void **value, size_t *size)
|
|
||||||
{
|
|
||||||
struct ae_xattr *xp;
|
|
||||||
|
|
||||||
for (xp = entry->xattr_head; xp != NULL; xp = xp->next)
|
|
||||||
{
|
|
||||||
if (strcmp(name, xp->name) == 0) {
|
|
||||||
*value = xp->value;
|
|
||||||
*size = xp->size;
|
|
||||||
return (1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* returns number of the extended attribute entries
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
archive_entry_xattr_count(struct archive_entry *entry)
|
|
||||||
{
|
|
||||||
struct ae_xattr *xp;
|
|
||||||
int count = 0;
|
|
||||||
|
|
||||||
for (xp = entry->xattr_head; xp != NULL; xp = xp->next)
|
|
||||||
count++;
|
|
||||||
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
archive_entry_xattr_reset(struct archive_entry * entry)
|
|
||||||
{
|
|
||||||
entry->xattr_p = entry->xattr_head;
|
|
||||||
|
|
||||||
return archive_entry_xattr_count(entry);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
archive_entry_xattr_next(struct archive_entry * entry,
|
|
||||||
const char **name, const void **value, size_t *size)
|
|
||||||
{
|
|
||||||
if (entry->xattr_p) {
|
|
||||||
*name = entry->xattr_p->name;
|
|
||||||
*value = entry->xattr_p->value;
|
|
||||||
*size = entry->xattr_p->size;
|
|
||||||
|
|
||||||
entry->xattr_p = entry->xattr_p->next;
|
|
||||||
|
|
||||||
return (ARCHIVE_OK);
|
|
||||||
} else {
|
|
||||||
*name = NULL;
|
|
||||||
*value = NULL;
|
|
||||||
*size = (size_t)0;
|
|
||||||
return (ARCHIVE_WARN);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* end of xattr handling
|
|
||||||
*/
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,211 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2011 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#include "archive_options_private.h"
|
|
||||||
|
|
||||||
static const char *
|
|
||||||
parse_option(const char **str,
|
|
||||||
const char **mod, const char **opt, const char **val);
|
|
||||||
|
|
||||||
int
|
|
||||||
_archive_set_option(struct archive *a,
|
|
||||||
const char *m, const char *o, const char *v,
|
|
||||||
int magic, const char *fn, option_handler use_option)
|
|
||||||
{
|
|
||||||
const char *mp, *op, *vp;
|
|
||||||
int r;
|
|
||||||
|
|
||||||
archive_check_magic(a, magic, ARCHIVE_STATE_NEW, fn);
|
|
||||||
|
|
||||||
mp = m != NULL && m[0] == '\0' ? NULL : m;
|
|
||||||
op = o != NULL && o[0] == '\0' ? NULL : o;
|
|
||||||
vp = v != NULL && v[0] == '\0' ? NULL : v;
|
|
||||||
|
|
||||||
if (op == NULL && vp == NULL)
|
|
||||||
return (ARCHIVE_OK);
|
|
||||||
if (op == NULL) {
|
|
||||||
archive_set_error(a, ARCHIVE_ERRNO_MISC, "Empty option");
|
|
||||||
return (ARCHIVE_FAILED);
|
|
||||||
}
|
|
||||||
|
|
||||||
r = use_option(a, mp, op, vp);
|
|
||||||
if (r == ARCHIVE_WARN - 1) {
|
|
||||||
archive_set_error(a, ARCHIVE_ERRNO_MISC,
|
|
||||||
"Unknown module name: `%s'", mp);
|
|
||||||
return (ARCHIVE_FAILED);
|
|
||||||
}
|
|
||||||
if (r == ARCHIVE_WARN) {
|
|
||||||
archive_set_error(a, ARCHIVE_ERRNO_MISC,
|
|
||||||
"Undefined option: `%s%s%s%s%s%s'",
|
|
||||||
vp?"":"!", mp?mp:"", mp?":":"", op, vp?"=":"", vp?vp:"");
|
|
||||||
return (ARCHIVE_FAILED);
|
|
||||||
}
|
|
||||||
return (r);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
_archive_set_either_option(struct archive *a, const char *m, const char *o, const char *v,
|
|
||||||
option_handler use_format_option, option_handler use_filter_option)
|
|
||||||
{
|
|
||||||
int r1, r2;
|
|
||||||
|
|
||||||
if (o == NULL && v == NULL)
|
|
||||||
return (ARCHIVE_OK);
|
|
||||||
if (o == NULL)
|
|
||||||
return (ARCHIVE_FAILED);
|
|
||||||
|
|
||||||
r1 = use_format_option(a, m, o, v);
|
|
||||||
if (r1 == ARCHIVE_FATAL)
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
|
|
||||||
r2 = use_filter_option(a, m, o, v);
|
|
||||||
if (r2 == ARCHIVE_FATAL)
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
|
|
||||||
if (r2 == ARCHIVE_WARN - 1)
|
|
||||||
return r1;
|
|
||||||
return r1 > r2 ? r1 : r2;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
_archive_set_options(struct archive *a, const char *options,
|
|
||||||
int magic, const char *fn, option_handler use_option)
|
|
||||||
{
|
|
||||||
int allok = 1, anyok = 0, ignore_mod_err = 0, r;
|
|
||||||
char *data;
|
|
||||||
const char *s, *mod, *opt, *val;
|
|
||||||
|
|
||||||
archive_check_magic(a, magic, ARCHIVE_STATE_NEW, fn);
|
|
||||||
|
|
||||||
if (options == NULL || options[0] == '\0')
|
|
||||||
return ARCHIVE_OK;
|
|
||||||
|
|
||||||
data = (char *)malloc(strlen(options) + 1);
|
|
||||||
strcpy(data, options);
|
|
||||||
s = (const char *)data;
|
|
||||||
|
|
||||||
do {
|
|
||||||
mod = opt = val = NULL;
|
|
||||||
|
|
||||||
parse_option(&s, &mod, &opt, &val);
|
|
||||||
if (mod == NULL && opt != NULL &&
|
|
||||||
strcmp("__ignore_wrong_module_name__", opt) == 0) {
|
|
||||||
/* Ignore module name error */
|
|
||||||
if (val != NULL) {
|
|
||||||
ignore_mod_err = 1;
|
|
||||||
anyok = 1;
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
r = use_option(a, mod, opt, val);
|
|
||||||
if (r == ARCHIVE_FATAL) {
|
|
||||||
free(data);
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
if (r == ARCHIVE_FAILED && mod != NULL) {
|
|
||||||
free(data);
|
|
||||||
return (ARCHIVE_FAILED);
|
|
||||||
}
|
|
||||||
if (r == ARCHIVE_WARN - 1) {
|
|
||||||
if (ignore_mod_err)
|
|
||||||
continue;
|
|
||||||
/* The module name is wrong. */
|
|
||||||
archive_set_error(a, ARCHIVE_ERRNO_MISC,
|
|
||||||
"Unknown module name: `%s'", mod);
|
|
||||||
free(data);
|
|
||||||
return (ARCHIVE_FAILED);
|
|
||||||
}
|
|
||||||
if (r == ARCHIVE_WARN) {
|
|
||||||
/* The option name is wrong. No-one used this. */
|
|
||||||
archive_set_error(a, ARCHIVE_ERRNO_MISC,
|
|
||||||
"Undefined option: `%s%s%s'",
|
|
||||||
mod?mod:"", mod?":":"", opt);
|
|
||||||
free(data);
|
|
||||||
return (ARCHIVE_FAILED);
|
|
||||||
}
|
|
||||||
if (r == ARCHIVE_OK)
|
|
||||||
anyok = 1;
|
|
||||||
else
|
|
||||||
allok = 0;
|
|
||||||
} while (s != NULL);
|
|
||||||
|
|
||||||
free(data);
|
|
||||||
return allok ? ARCHIVE_OK : anyok ? ARCHIVE_WARN : ARCHIVE_FAILED;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const char *
|
|
||||||
parse_option(const char **s, const char **m, const char **o, const char **v)
|
|
||||||
{
|
|
||||||
const char *end, *mod, *opt, *val;
|
|
||||||
char *p;
|
|
||||||
|
|
||||||
end = NULL;
|
|
||||||
mod = NULL;
|
|
||||||
opt = *s;
|
|
||||||
val = "1";
|
|
||||||
|
|
||||||
p = strchr(opt, ',');
|
|
||||||
|
|
||||||
if (p != NULL) {
|
|
||||||
*p = '\0';
|
|
||||||
end = ((const char *)p) + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (0 == strlen(opt)) {
|
|
||||||
*s = end;
|
|
||||||
*m = NULL;
|
|
||||||
*o = NULL;
|
|
||||||
*v = NULL;
|
|
||||||
return end;
|
|
||||||
}
|
|
||||||
|
|
||||||
p = strchr(opt, ':');
|
|
||||||
if (p != NULL) {
|
|
||||||
*p = '\0';
|
|
||||||
mod = opt;
|
|
||||||
opt = ++p;
|
|
||||||
}
|
|
||||||
|
|
||||||
p = strchr(opt, '=');
|
|
||||||
if (p != NULL) {
|
|
||||||
*p = '\0';
|
|
||||||
val = ++p;
|
|
||||||
} else if (opt[0] == '!') {
|
|
||||||
++opt;
|
|
||||||
val = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
*s = end;
|
|
||||||
*m = mod;
|
|
||||||
*o = opt;
|
|
||||||
*v = val;
|
|
||||||
|
|
||||||
return end;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,47 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2011 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#include "archive_private.h"
|
|
||||||
|
|
||||||
typedef int (*option_handler)(struct archive *a,
|
|
||||||
const char *mod, const char *opt, const char *val);
|
|
||||||
|
|
||||||
int
|
|
||||||
_archive_set_option(struct archive *a,
|
|
||||||
const char *mod, const char *opt, const char *val,
|
|
||||||
int magic, const char *fn, option_handler use_option);
|
|
||||||
|
|
||||||
int
|
|
||||||
_archive_set_options(struct archive *a, const char *options,
|
|
||||||
int magic, const char *fn, option_handler use_option);
|
|
||||||
|
|
||||||
int
|
|
||||||
_archive_set_either_option(struct archive *a,
|
|
||||||
const char *m, const char *o, const char *v,
|
|
||||||
option_handler use_format_option, option_handler use_filter_option);
|
|
||||||
|
|
|
@ -1,459 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer
|
|
||||||
* in this position and unchanged.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifdef HAVE_STRING_H
|
|
||||||
#include <string.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_WCHAR_H
|
|
||||||
#include <wchar.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "archive_pathmatch.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Check whether a character 'c' is matched by a list specification [...]:
|
|
||||||
* * Leading '!' or '^' negates the class.
|
|
||||||
* * <char>-<char> is a range of characters
|
|
||||||
* * \<char> removes any special meaning for <char>
|
|
||||||
*
|
|
||||||
* Some interesting boundary cases:
|
|
||||||
* a-d-e is one range (a-d) followed by two single characters - and e.
|
|
||||||
* \a-\d is same as a-d
|
|
||||||
* a\-d is three single characters: a, d, -
|
|
||||||
* Trailing - is not special (so [a-] is two characters a and -).
|
|
||||||
* Initial - is not special ([a-] is same as [-a] is same as [\\-a])
|
|
||||||
* This function never sees a trailing \.
|
|
||||||
* [] always fails
|
|
||||||
* [!] always succeeds
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
pm_list(const char *start, const char *end, const char c, int flags)
|
|
||||||
{
|
|
||||||
const char *p = start;
|
|
||||||
char rangeStart = '\0', nextRangeStart;
|
|
||||||
int match = 1, nomatch = 0;
|
|
||||||
|
|
||||||
/* This will be used soon... */
|
|
||||||
(void)flags; /* UNUSED */
|
|
||||||
|
|
||||||
/* If this is a negated class, return success for nomatch. */
|
|
||||||
if ((*p == '!' || *p == '^') && p < end) {
|
|
||||||
match = 0;
|
|
||||||
nomatch = 1;
|
|
||||||
++p;
|
|
||||||
}
|
|
||||||
|
|
||||||
while (p < end) {
|
|
||||||
nextRangeStart = '\0';
|
|
||||||
switch (*p) {
|
|
||||||
case '-':
|
|
||||||
/* Trailing or initial '-' is not special. */
|
|
||||||
if ((rangeStart == '\0') || (p == end - 1)) {
|
|
||||||
if (*p == c)
|
|
||||||
return (match);
|
|
||||||
} else {
|
|
||||||
char rangeEnd = *++p;
|
|
||||||
if (rangeEnd == '\\')
|
|
||||||
rangeEnd = *++p;
|
|
||||||
if ((rangeStart <= c) && (c <= rangeEnd))
|
|
||||||
return (match);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case '\\':
|
|
||||||
++p;
|
|
||||||
/* Fall through */
|
|
||||||
default:
|
|
||||||
if (*p == c)
|
|
||||||
return (match);
|
|
||||||
nextRangeStart = *p; /* Possible start of range. */
|
|
||||||
}
|
|
||||||
rangeStart = nextRangeStart;
|
|
||||||
++p;
|
|
||||||
}
|
|
||||||
return (nomatch);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
pm_list_w(const wchar_t *start, const wchar_t *end, const wchar_t c, int flags)
|
|
||||||
{
|
|
||||||
const wchar_t *p = start;
|
|
||||||
wchar_t rangeStart = L'\0', nextRangeStart;
|
|
||||||
int match = 1, nomatch = 0;
|
|
||||||
|
|
||||||
/* This will be used soon... */
|
|
||||||
(void)flags; /* UNUSED */
|
|
||||||
|
|
||||||
/* If this is a negated class, return success for nomatch. */
|
|
||||||
if ((*p == L'!' || *p == L'^') && p < end) {
|
|
||||||
match = 0;
|
|
||||||
nomatch = 1;
|
|
||||||
++p;
|
|
||||||
}
|
|
||||||
|
|
||||||
while (p < end) {
|
|
||||||
nextRangeStart = L'\0';
|
|
||||||
switch (*p) {
|
|
||||||
case L'-':
|
|
||||||
/* Trailing or initial '-' is not special. */
|
|
||||||
if ((rangeStart == L'\0') || (p == end - 1)) {
|
|
||||||
if (*p == c)
|
|
||||||
return (match);
|
|
||||||
} else {
|
|
||||||
wchar_t rangeEnd = *++p;
|
|
||||||
if (rangeEnd == L'\\')
|
|
||||||
rangeEnd = *++p;
|
|
||||||
if ((rangeStart <= c) && (c <= rangeEnd))
|
|
||||||
return (match);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case L'\\':
|
|
||||||
++p;
|
|
||||||
/* Fall through */
|
|
||||||
default:
|
|
||||||
if (*p == c)
|
|
||||||
return (match);
|
|
||||||
nextRangeStart = *p; /* Possible start of range. */
|
|
||||||
}
|
|
||||||
rangeStart = nextRangeStart;
|
|
||||||
++p;
|
|
||||||
}
|
|
||||||
return (nomatch);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If s is pointing to "./", ".//", "./././" or the like, skip it.
|
|
||||||
*/
|
|
||||||
static const char *
|
|
||||||
pm_slashskip(const char *s) {
|
|
||||||
while ((*s == '/')
|
|
||||||
|| (s[0] == '.' && s[1] == '/')
|
|
||||||
|| (s[0] == '.' && s[1] == '\0'))
|
|
||||||
++s;
|
|
||||||
return (s);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const wchar_t *
|
|
||||||
pm_slashskip_w(const wchar_t *s) {
|
|
||||||
while ((*s == L'/')
|
|
||||||
|| (s[0] == L'.' && s[1] == L'/')
|
|
||||||
|| (s[0] == L'.' && s[1] == L'\0'))
|
|
||||||
++s;
|
|
||||||
return (s);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
pm(const char *p, const char *s, int flags)
|
|
||||||
{
|
|
||||||
const char *end;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Ignore leading './', './/', '././', etc.
|
|
||||||
*/
|
|
||||||
if (s[0] == '.' && s[1] == '/')
|
|
||||||
s = pm_slashskip(s + 1);
|
|
||||||
if (p[0] == '.' && p[1] == '/')
|
|
||||||
p = pm_slashskip(p + 1);
|
|
||||||
|
|
||||||
for (;;) {
|
|
||||||
switch (*p) {
|
|
||||||
case '\0':
|
|
||||||
if (s[0] == '/') {
|
|
||||||
if (flags & PATHMATCH_NO_ANCHOR_END)
|
|
||||||
return (1);
|
|
||||||
/* "dir" == "dir/" == "dir/." */
|
|
||||||
s = pm_slashskip(s);
|
|
||||||
}
|
|
||||||
return (*s == '\0');
|
|
||||||
case '?':
|
|
||||||
/* ? always succeeds, unless we hit end of 's' */
|
|
||||||
if (*s == '\0')
|
|
||||||
return (0);
|
|
||||||
break;
|
|
||||||
case '*':
|
|
||||||
/* "*" == "**" == "***" ... */
|
|
||||||
while (*p == '*')
|
|
||||||
++p;
|
|
||||||
/* Trailing '*' always succeeds. */
|
|
||||||
if (*p == '\0')
|
|
||||||
return (1);
|
|
||||||
while (*s) {
|
|
||||||
if (archive_pathmatch(p, s, flags))
|
|
||||||
return (1);
|
|
||||||
++s;
|
|
||||||
}
|
|
||||||
return (0);
|
|
||||||
case '[':
|
|
||||||
/*
|
|
||||||
* Find the end of the [...] character class,
|
|
||||||
* ignoring \] that might occur within the class.
|
|
||||||
*/
|
|
||||||
end = p + 1;
|
|
||||||
while (*end != '\0' && *end != ']') {
|
|
||||||
if (*end == '\\' && end[1] != '\0')
|
|
||||||
++end;
|
|
||||||
++end;
|
|
||||||
}
|
|
||||||
if (*end == ']') {
|
|
||||||
/* We found [...], try to match it. */
|
|
||||||
if (!pm_list(p + 1, end, *s, flags))
|
|
||||||
return (0);
|
|
||||||
p = end; /* Jump to trailing ']' char. */
|
|
||||||
break;
|
|
||||||
} else
|
|
||||||
/* No final ']', so just match '['. */
|
|
||||||
if (*p != *s)
|
|
||||||
return (0);
|
|
||||||
break;
|
|
||||||
case '\\':
|
|
||||||
/* Trailing '\\' matches itself. */
|
|
||||||
if (p[1] == '\0') {
|
|
||||||
if (*s != '\\')
|
|
||||||
return (0);
|
|
||||||
} else {
|
|
||||||
++p;
|
|
||||||
if (*p != *s)
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case '/':
|
|
||||||
if (*s != '/' && *s != '\0')
|
|
||||||
return (0);
|
|
||||||
/* Note: pattern "/\./" won't match "/";
|
|
||||||
* pm_slashskip() correctly stops at backslash. */
|
|
||||||
p = pm_slashskip(p);
|
|
||||||
s = pm_slashskip(s);
|
|
||||||
if (*p == '\0' && (flags & PATHMATCH_NO_ANCHOR_END))
|
|
||||||
return (1);
|
|
||||||
--p; /* Counteract the increment below. */
|
|
||||||
--s;
|
|
||||||
break;
|
|
||||||
case '$':
|
|
||||||
/* '$' is special only at end of pattern and only
|
|
||||||
* if PATHMATCH_NO_ANCHOR_END is specified. */
|
|
||||||
if (p[1] == '\0' && (flags & PATHMATCH_NO_ANCHOR_END)){
|
|
||||||
/* "dir" == "dir/" == "dir/." */
|
|
||||||
return (*pm_slashskip(s) == '\0');
|
|
||||||
}
|
|
||||||
/* Otherwise, '$' is not special. */
|
|
||||||
/* FALL THROUGH */
|
|
||||||
default:
|
|
||||||
if (*p != *s)
|
|
||||||
return (0);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
++p;
|
|
||||||
++s;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
pm_w(const wchar_t *p, const wchar_t *s, int flags)
|
|
||||||
{
|
|
||||||
const wchar_t *end;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Ignore leading './', './/', '././', etc.
|
|
||||||
*/
|
|
||||||
if (s[0] == L'.' && s[1] == L'/')
|
|
||||||
s = pm_slashskip_w(s + 1);
|
|
||||||
if (p[0] == L'.' && p[1] == L'/')
|
|
||||||
p = pm_slashskip_w(p + 1);
|
|
||||||
|
|
||||||
for (;;) {
|
|
||||||
switch (*p) {
|
|
||||||
case L'\0':
|
|
||||||
if (s[0] == L'/') {
|
|
||||||
if (flags & PATHMATCH_NO_ANCHOR_END)
|
|
||||||
return (1);
|
|
||||||
/* "dir" == "dir/" == "dir/." */
|
|
||||||
s = pm_slashskip_w(s);
|
|
||||||
}
|
|
||||||
return (*s == L'\0');
|
|
||||||
case L'?':
|
|
||||||
/* ? always succeeds, unless we hit end of 's' */
|
|
||||||
if (*s == L'\0')
|
|
||||||
return (0);
|
|
||||||
break;
|
|
||||||
case L'*':
|
|
||||||
/* "*" == "**" == "***" ... */
|
|
||||||
while (*p == L'*')
|
|
||||||
++p;
|
|
||||||
/* Trailing '*' always succeeds. */
|
|
||||||
if (*p == L'\0')
|
|
||||||
return (1);
|
|
||||||
while (*s) {
|
|
||||||
if (archive_pathmatch_w(p, s, flags))
|
|
||||||
return (1);
|
|
||||||
++s;
|
|
||||||
}
|
|
||||||
return (0);
|
|
||||||
case L'[':
|
|
||||||
/*
|
|
||||||
* Find the end of the [...] character class,
|
|
||||||
* ignoring \] that might occur within the class.
|
|
||||||
*/
|
|
||||||
end = p + 1;
|
|
||||||
while (*end != L'\0' && *end != L']') {
|
|
||||||
if (*end == L'\\' && end[1] != L'\0')
|
|
||||||
++end;
|
|
||||||
++end;
|
|
||||||
}
|
|
||||||
if (*end == L']') {
|
|
||||||
/* We found [...], try to match it. */
|
|
||||||
if (!pm_list_w(p + 1, end, *s, flags))
|
|
||||||
return (0);
|
|
||||||
p = end; /* Jump to trailing ']' char. */
|
|
||||||
break;
|
|
||||||
} else
|
|
||||||
/* No final ']', so just match '['. */
|
|
||||||
if (*p != *s)
|
|
||||||
return (0);
|
|
||||||
break;
|
|
||||||
case L'\\':
|
|
||||||
/* Trailing '\\' matches itself. */
|
|
||||||
if (p[1] == L'\0') {
|
|
||||||
if (*s != L'\\')
|
|
||||||
return (0);
|
|
||||||
} else {
|
|
||||||
++p;
|
|
||||||
if (*p != *s)
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case L'/':
|
|
||||||
if (*s != L'/' && *s != L'\0')
|
|
||||||
return (0);
|
|
||||||
/* Note: pattern "/\./" won't match "/";
|
|
||||||
* pm_slashskip() correctly stops at backslash. */
|
|
||||||
p = pm_slashskip_w(p);
|
|
||||||
s = pm_slashskip_w(s);
|
|
||||||
if (*p == L'\0' && (flags & PATHMATCH_NO_ANCHOR_END))
|
|
||||||
return (1);
|
|
||||||
--p; /* Counteract the increment below. */
|
|
||||||
--s;
|
|
||||||
break;
|
|
||||||
case L'$':
|
|
||||||
/* '$' is special only at end of pattern and only
|
|
||||||
* if PATHMATCH_NO_ANCHOR_END is specified. */
|
|
||||||
if (p[1] == L'\0' && (flags & PATHMATCH_NO_ANCHOR_END)){
|
|
||||||
/* "dir" == "dir/" == "dir/." */
|
|
||||||
return (*pm_slashskip_w(s) == L'\0');
|
|
||||||
}
|
|
||||||
/* Otherwise, '$' is not special. */
|
|
||||||
/* FALL THROUGH */
|
|
||||||
default:
|
|
||||||
if (*p != *s)
|
|
||||||
return (0);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
++p;
|
|
||||||
++s;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Main entry point. */
|
|
||||||
int
|
|
||||||
__archive_pathmatch(const char *p, const char *s, int flags)
|
|
||||||
{
|
|
||||||
/* Empty pattern only matches the empty string. */
|
|
||||||
if (p == NULL || *p == '\0')
|
|
||||||
return (s == NULL || *s == '\0');
|
|
||||||
|
|
||||||
/* Leading '^' anchors the start of the pattern. */
|
|
||||||
if (*p == '^') {
|
|
||||||
++p;
|
|
||||||
flags &= ~PATHMATCH_NO_ANCHOR_START;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (*p == '/' && *s != '/')
|
|
||||||
return (0);
|
|
||||||
|
|
||||||
/* Certain patterns and file names anchor implicitly. */
|
|
||||||
if (*p == '*' || *p == '/' || *p == '/') {
|
|
||||||
while (*p == '/')
|
|
||||||
++p;
|
|
||||||
while (*s == '/')
|
|
||||||
++s;
|
|
||||||
return (pm(p, s, flags));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If start is unanchored, try to match start of each path element. */
|
|
||||||
if (flags & PATHMATCH_NO_ANCHOR_START) {
|
|
||||||
for ( ; s != NULL; s = strchr(s, '/')) {
|
|
||||||
if (*s == '/')
|
|
||||||
s++;
|
|
||||||
if (pm(p, s, flags))
|
|
||||||
return (1);
|
|
||||||
}
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Default: Match from beginning. */
|
|
||||||
return (pm(p, s, flags));
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
__archive_pathmatch_w(const wchar_t *p, const wchar_t *s, int flags)
|
|
||||||
{
|
|
||||||
/* Empty pattern only matches the empty string. */
|
|
||||||
if (p == NULL || *p == L'\0')
|
|
||||||
return (s == NULL || *s == L'\0');
|
|
||||||
|
|
||||||
/* Leading '^' anchors the start of the pattern. */
|
|
||||||
if (*p == L'^') {
|
|
||||||
++p;
|
|
||||||
flags &= ~PATHMATCH_NO_ANCHOR_START;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (*p == L'/' && *s != L'/')
|
|
||||||
return (0);
|
|
||||||
|
|
||||||
/* Certain patterns and file names anchor implicitly. */
|
|
||||||
if (*p == L'*' || *p == L'/' || *p == L'/') {
|
|
||||||
while (*p == L'/')
|
|
||||||
++p;
|
|
||||||
while (*s == L'/')
|
|
||||||
++s;
|
|
||||||
return (pm_w(p, s, flags));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If start is unanchored, try to match start of each path element. */
|
|
||||||
if (flags & PATHMATCH_NO_ANCHOR_START) {
|
|
||||||
for ( ; s != NULL; s = wcschr(s, L'/')) {
|
|
||||||
if (*s == L'/')
|
|
||||||
s++;
|
|
||||||
if (pm_w(p, s, flags))
|
|
||||||
return (1);
|
|
||||||
}
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Default: Match from beginning. */
|
|
||||||
return (pm_w(p, s, flags));
|
|
||||||
}
|
|
|
@ -1,52 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer
|
|
||||||
* in this position and unchanged.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* $FreeBSD$
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __LIBARCHIVE_BUILD
|
|
||||||
#ifndef __LIBARCHIVE_TEST
|
|
||||||
#error This header is only to be used internally to libarchive.
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_PATHMATCH_H
|
|
||||||
#define ARCHIVE_PATHMATCH_H
|
|
||||||
|
|
||||||
/* Don't anchor at beginning unless the pattern starts with "^" */
|
|
||||||
#define PATHMATCH_NO_ANCHOR_START 1
|
|
||||||
/* Don't anchor at end unless the pattern ends with "$" */
|
|
||||||
#define PATHMATCH_NO_ANCHOR_END 2
|
|
||||||
|
|
||||||
/* Note that "^" and "$" are not special unless you set the corresponding
|
|
||||||
* flag above. */
|
|
||||||
|
|
||||||
int __archive_pathmatch(const char *p, const char *s, int flags);
|
|
||||||
int __archive_pathmatch_w(const wchar_t *p, const wchar_t *s, int flags);
|
|
||||||
|
|
||||||
#define archive_pathmatch(p, s, f) __archive_pathmatch(p, s, f)
|
|
||||||
#define archive_pathmatch_w(p, s, f) __archive_pathmatch_w(p, s, f)
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,165 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* $FreeBSD: head/lib/libarchive/archive_platform.h 201090 2009-12-28 02:22:04Z kientzle $
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* !!ONLY FOR USE INTERNALLY TO LIBARCHIVE!! */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This header is the first thing included in any of the libarchive
|
|
||||||
* source files. As far as possible, platform-specific issues should
|
|
||||||
* be dealt with here and not within individual source files. I'm
|
|
||||||
* actively trying to minimize #if blocks within the main source,
|
|
||||||
* since they obfuscate the code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_PLATFORM_H_INCLUDED
|
|
||||||
#define ARCHIVE_PLATFORM_H_INCLUDED
|
|
||||||
|
|
||||||
/* archive.h and archive_entry.h require this. */
|
|
||||||
#define __LIBARCHIVE_BUILD 1
|
|
||||||
|
|
||||||
#if defined(PLATFORM_CONFIG_H)
|
|
||||||
/* Use hand-built config.h in environments that need it. */
|
|
||||||
#include PLATFORM_CONFIG_H
|
|
||||||
#elif defined(HAVE_CONFIG_H)
|
|
||||||
/* Most POSIX platforms use the 'configure' script to build config.h */
|
|
||||||
#include "config.h"
|
|
||||||
#else
|
|
||||||
/* Warn if the library hasn't been (automatically or manually) configured. */
|
|
||||||
#error Oops: No config.h and no pre-built configuration in archive_platform.h.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* It should be possible to get rid of this by extending the feature-test
|
|
||||||
* macros to cover Windows API functions, probably along with non-trivial
|
|
||||||
* refactoring of code to find structures that sit more cleanly on top of
|
|
||||||
* either Windows or Posix APIs. */
|
|
||||||
#if (defined(__WIN32__) || defined(_WIN32) || defined(__WIN32)) && !defined(__CYGWIN__)
|
|
||||||
#include "archive_windows.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The config files define a lot of feature macros. The following
|
|
||||||
* uses those macros to select/define replacements and include key
|
|
||||||
* headers as required.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Get a real definition for __FBSDID if we can */
|
|
||||||
#if HAVE_SYS_CDEFS_H
|
|
||||||
#include <sys/cdefs.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* If not, define it so as to avoid dangling semicolons. */
|
|
||||||
#ifndef __FBSDID
|
|
||||||
#define __FBSDID(a) struct _undefined_hack
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Try to get standard C99-style integer type definitions. */
|
|
||||||
#if HAVE_INTTYPES_H
|
|
||||||
#include <inttypes.h>
|
|
||||||
#endif
|
|
||||||
#if HAVE_STDINT_H
|
|
||||||
#include <stdint.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Borland warns about its own constants! */
|
|
||||||
#if defined(__BORLANDC__)
|
|
||||||
# if HAVE_DECL_UINT64_MAX
|
|
||||||
# undef UINT64_MAX
|
|
||||||
# undef HAVE_DECL_UINT64_MAX
|
|
||||||
# endif
|
|
||||||
# if HAVE_DECL_UINT64_MIN
|
|
||||||
# undef UINT64_MIN
|
|
||||||
# undef HAVE_DECL_UINT64_MIN
|
|
||||||
# endif
|
|
||||||
# if HAVE_DECL_INT64_MAX
|
|
||||||
# undef INT64_MAX
|
|
||||||
# undef HAVE_DECL_INT64_MAX
|
|
||||||
# endif
|
|
||||||
# if HAVE_DECL_INT64_MIN
|
|
||||||
# undef INT64_MIN
|
|
||||||
# undef HAVE_DECL_INT64_MIN
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Some platforms lack the standard *_MAX definitions. */
|
|
||||||
#if !HAVE_DECL_SIZE_MAX
|
|
||||||
#define SIZE_MAX (~(size_t)0)
|
|
||||||
#endif
|
|
||||||
#if !HAVE_DECL_SSIZE_MAX
|
|
||||||
#define SSIZE_MAX ((ssize_t)(SIZE_MAX >> 1))
|
|
||||||
#endif
|
|
||||||
#if !HAVE_DECL_UINT32_MAX
|
|
||||||
#define UINT32_MAX (~(uint32_t)0)
|
|
||||||
#endif
|
|
||||||
#if !HAVE_DECL_UINT64_MAX
|
|
||||||
#define UINT64_MAX (~(uint64_t)0)
|
|
||||||
#endif
|
|
||||||
#if !HAVE_DECL_INT64_MAX
|
|
||||||
#define INT64_MAX ((int64_t)(UINT64_MAX >> 1))
|
|
||||||
#endif
|
|
||||||
#if !HAVE_DECL_INT64_MIN
|
|
||||||
#define INT64_MIN ((int64_t)(~INT64_MAX))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If this platform has <sys/acl.h>, acl_create(), acl_init(),
|
|
||||||
* acl_set_file(), and ACL_USER, we assume it has the rest of the
|
|
||||||
* POSIX.1e draft functions used in archive_read_extract.c.
|
|
||||||
*/
|
|
||||||
#if HAVE_SYS_ACL_H && HAVE_ACL_CREATE_ENTRY && HAVE_ACL_INIT && HAVE_ACL_SET_FILE && HAVE_ACL_USER
|
|
||||||
#define HAVE_POSIX_ACL 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If we can't restore metadata using a file descriptor, then
|
|
||||||
* for compatibility's sake, close files before trying to restore metadata.
|
|
||||||
*/
|
|
||||||
#if defined(HAVE_FCHMOD) || defined(HAVE_FUTIMES) || defined(HAVE_ACL_SET_FD) || defined(HAVE_ACL_SET_FD_NP) || defined(HAVE_FCHOWN)
|
|
||||||
#define CAN_RESTORE_METADATA_FD
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Set up defaults for internal error codes. */
|
|
||||||
#ifndef ARCHIVE_ERRNO_FILE_FORMAT
|
|
||||||
#if HAVE_EFTYPE
|
|
||||||
#define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
|
|
||||||
#else
|
|
||||||
#if HAVE_EILSEQ
|
|
||||||
#define ARCHIVE_ERRNO_FILE_FORMAT EILSEQ
|
|
||||||
#else
|
|
||||||
#define ARCHIVE_ERRNO_FILE_FORMAT EINVAL
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_ERRNO_PROGRAMMER
|
|
||||||
#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_ERRNO_MISC
|
|
||||||
#define ARCHIVE_ERRNO_MISC (-1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* !ARCHIVE_PLATFORM_H_INCLUDED */
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,119 +0,0 @@
|
||||||
/* Ppmd7.h -- PPMdH compression codec
|
|
||||||
2010-03-12 : Igor Pavlov : Public domain
|
|
||||||
This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
|
|
||||||
|
|
||||||
/* This code supports virtual RangeDecoder and includes the implementation
|
|
||||||
of RangeCoder from 7z, instead of RangeCoder from original PPMd var.H.
|
|
||||||
If you need the compatibility with original PPMd var.H, you can use external RangeDecoder */
|
|
||||||
|
|
||||||
#ifndef __LIBARCHIVE_BUILD
|
|
||||||
#error This header is only to be used internally to libarchive.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_PPMD7_PRIVATE_H_INCLUDED
|
|
||||||
#define ARCHIVE_PPMD7_PRIVATE_H_INCLUDED
|
|
||||||
|
|
||||||
#include "archive_ppmd_private.h"
|
|
||||||
|
|
||||||
#define PPMD7_MIN_ORDER 2
|
|
||||||
#define PPMD7_MAX_ORDER 64
|
|
||||||
|
|
||||||
#define PPMD7_MIN_MEM_SIZE (1 << 11)
|
|
||||||
#define PPMD7_MAX_MEM_SIZE (0xFFFFFFFF - 12 * 3)
|
|
||||||
|
|
||||||
struct CPpmd7_Context_;
|
|
||||||
|
|
||||||
typedef
|
|
||||||
#ifdef PPMD_32BIT
|
|
||||||
struct CPpmd7_Context_ *
|
|
||||||
#else
|
|
||||||
UInt32
|
|
||||||
#endif
|
|
||||||
CPpmd7_Context_Ref;
|
|
||||||
|
|
||||||
typedef struct CPpmd7_Context_
|
|
||||||
{
|
|
||||||
UInt16 NumStats;
|
|
||||||
UInt16 SummFreq;
|
|
||||||
CPpmd_State_Ref Stats;
|
|
||||||
CPpmd7_Context_Ref Suffix;
|
|
||||||
} CPpmd7_Context;
|
|
||||||
|
|
||||||
#define Ppmd7Context_OneState(p) ((CPpmd_State *)&(p)->SummFreq)
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
CPpmd7_Context *MinContext, *MaxContext;
|
|
||||||
CPpmd_State *FoundState;
|
|
||||||
unsigned OrderFall, InitEsc, PrevSuccess, MaxOrder, HiBitsFlag;
|
|
||||||
Int32 RunLength, InitRL; /* must be 32-bit at least */
|
|
||||||
|
|
||||||
UInt32 Size;
|
|
||||||
UInt32 GlueCount;
|
|
||||||
Byte *Base, *LoUnit, *HiUnit, *Text, *UnitsStart;
|
|
||||||
UInt32 AlignOffset;
|
|
||||||
|
|
||||||
Byte Indx2Units[PPMD_NUM_INDEXES];
|
|
||||||
Byte Units2Indx[128];
|
|
||||||
CPpmd_Void_Ref FreeList[PPMD_NUM_INDEXES];
|
|
||||||
Byte NS2Indx[256], NS2BSIndx[256], HB2Flag[256];
|
|
||||||
CPpmd_See DummySee, See[25][16];
|
|
||||||
UInt16 BinSumm[128][64];
|
|
||||||
} CPpmd7;
|
|
||||||
|
|
||||||
/* ---------- Decode ---------- */
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
UInt32 (*GetThreshold)(void *p, UInt32 total);
|
|
||||||
void (*Decode)(void *p, UInt32 start, UInt32 size);
|
|
||||||
UInt32 (*DecodeBit)(void *p, UInt32 size0);
|
|
||||||
} IPpmd7_RangeDec;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
IPpmd7_RangeDec p;
|
|
||||||
UInt32 Range;
|
|
||||||
UInt32 Code;
|
|
||||||
UInt32 Low;
|
|
||||||
UInt32 Bottom;
|
|
||||||
IByteIn *Stream;
|
|
||||||
} CPpmd7z_RangeDec;
|
|
||||||
|
|
||||||
/* ---------- Encode ---------- */
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
UInt64 Low;
|
|
||||||
UInt32 Range;
|
|
||||||
Byte Cache;
|
|
||||||
UInt64 CacheSize;
|
|
||||||
IByteOut *Stream;
|
|
||||||
} CPpmd7z_RangeEnc;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
/* Base Functions */
|
|
||||||
void (*Ppmd7_Construct)(CPpmd7 *p);
|
|
||||||
Bool (*Ppmd7_Alloc)(CPpmd7 *p, UInt32 size, ISzAlloc *alloc);
|
|
||||||
void (*Ppmd7_Free)(CPpmd7 *p, ISzAlloc *alloc);
|
|
||||||
void (*Ppmd7_Init)(CPpmd7 *p, unsigned maxOrder);
|
|
||||||
#define Ppmd7_WasAllocated(p) ((p)->Base != NULL)
|
|
||||||
|
|
||||||
/* Decode Functions */
|
|
||||||
void (*Ppmd7z_RangeDec_CreateVTable)(CPpmd7z_RangeDec *p);
|
|
||||||
void (*PpmdRAR_RangeDec_CreateVTable)(CPpmd7z_RangeDec *p);
|
|
||||||
Bool (*Ppmd7z_RangeDec_Init)(CPpmd7z_RangeDec *p);
|
|
||||||
Bool (*PpmdRAR_RangeDec_Init)(CPpmd7z_RangeDec *p);
|
|
||||||
#define Ppmd7z_RangeDec_IsFinishedOK(p) ((p)->Code == 0)
|
|
||||||
int (*Ppmd7_DecodeSymbol)(CPpmd7 *p, IPpmd7_RangeDec *rc);
|
|
||||||
|
|
||||||
/* Encode Functions */
|
|
||||||
void (*Ppmd7z_RangeEnc_Init)(CPpmd7z_RangeEnc *p);
|
|
||||||
void (*Ppmd7z_RangeEnc_FlushData)(CPpmd7z_RangeEnc *p);
|
|
||||||
|
|
||||||
void (*Ppmd7_EncodeSymbol)(CPpmd7 *p, CPpmd7z_RangeEnc *rc, int symbol);
|
|
||||||
} IPpmd7;
|
|
||||||
|
|
||||||
extern const IPpmd7 __archive_ppmd7_functions;
|
|
||||||
#endif
|
|
|
@ -1,158 +0,0 @@
|
||||||
/* Ppmd.h -- PPMD codec common code
|
|
||||||
2010-03-12 : Igor Pavlov : Public domain
|
|
||||||
This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
|
|
||||||
|
|
||||||
#ifndef __LIBARCHIVE_BUILD
|
|
||||||
#error This header is only to be used internally to libarchive.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_PPMD_PRIVATE_H_INCLUDED
|
|
||||||
#define ARCHIVE_PPMD_PRIVATE_H_INCLUDED
|
|
||||||
|
|
||||||
#include <stddef.h>
|
|
||||||
|
|
||||||
#include "archive_read_private.h"
|
|
||||||
|
|
||||||
/*** Begin defined in Types.h ***/
|
|
||||||
|
|
||||||
#if !defined(ZCONF_H)
|
|
||||||
typedef unsigned char Byte;
|
|
||||||
#endif
|
|
||||||
typedef short Int16;
|
|
||||||
typedef unsigned short UInt16;
|
|
||||||
|
|
||||||
#ifdef _LZMA_UINT32_IS_ULONG
|
|
||||||
typedef long Int32;
|
|
||||||
typedef unsigned long UInt32;
|
|
||||||
#else
|
|
||||||
typedef int Int32;
|
|
||||||
typedef unsigned int UInt32;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _SZ_NO_INT_64
|
|
||||||
|
|
||||||
/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
|
|
||||||
NOTES: Some code will work incorrectly in that case! */
|
|
||||||
|
|
||||||
typedef long Int64;
|
|
||||||
typedef unsigned long UInt64;
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) || defined(__BORLANDC__)
|
|
||||||
typedef __int64 Int64;
|
|
||||||
typedef unsigned __int64 UInt64;
|
|
||||||
#define UINT64_CONST(n) n
|
|
||||||
#else
|
|
||||||
typedef long long int Int64;
|
|
||||||
typedef unsigned long long int UInt64;
|
|
||||||
#define UINT64_CONST(n) n ## ULL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef int Bool;
|
|
||||||
#define True 1
|
|
||||||
#define False 0
|
|
||||||
|
|
||||||
/* The following interfaces use first parameter as pointer to structure */
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
struct archive_read *a;
|
|
||||||
Byte (*Read)(void *p); /* reads one byte, returns 0 in case of EOF or error */
|
|
||||||
} IByteIn;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
struct archive_write *a;
|
|
||||||
void (*Write)(void *p, Byte b);
|
|
||||||
} IByteOut;
|
|
||||||
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
void *(*Alloc)(void *p, size_t size);
|
|
||||||
void (*Free)(void *p, void *address); /* address can be 0 */
|
|
||||||
} ISzAlloc;
|
|
||||||
|
|
||||||
/*** End defined in Types.h ***/
|
|
||||||
/*** Begin defined in CpuArch.h ***/
|
|
||||||
|
|
||||||
#if defined(_M_IX86) || defined(__i386__)
|
|
||||||
#define MY_CPU_X86
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(MY_CPU_X86) || defined(_M_ARM)
|
|
||||||
#define MY_CPU_32BIT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef MY_CPU_32BIT
|
|
||||||
#define PPMD_32BIT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*** End defined in CpuArch.h ***/
|
|
||||||
|
|
||||||
#define PPMD_INT_BITS 7
|
|
||||||
#define PPMD_PERIOD_BITS 7
|
|
||||||
#define PPMD_BIN_SCALE (1 << (PPMD_INT_BITS + PPMD_PERIOD_BITS))
|
|
||||||
|
|
||||||
#define PPMD_GET_MEAN_SPEC(summ, shift, round) (((summ) + (1 << ((shift) - (round)))) >> (shift))
|
|
||||||
#define PPMD_GET_MEAN(summ) PPMD_GET_MEAN_SPEC((summ), PPMD_PERIOD_BITS, 2)
|
|
||||||
#define PPMD_UPDATE_PROB_0(prob) ((prob) + (1 << PPMD_INT_BITS) - PPMD_GET_MEAN(prob))
|
|
||||||
#define PPMD_UPDATE_PROB_1(prob) ((prob) - PPMD_GET_MEAN(prob))
|
|
||||||
|
|
||||||
#define PPMD_N1 4
|
|
||||||
#define PPMD_N2 4
|
|
||||||
#define PPMD_N3 4
|
|
||||||
#define PPMD_N4 ((128 + 3 - 1 * PPMD_N1 - 2 * PPMD_N2 - 3 * PPMD_N3) / 4)
|
|
||||||
#define PPMD_NUM_INDEXES (PPMD_N1 + PPMD_N2 + PPMD_N3 + PPMD_N4)
|
|
||||||
|
|
||||||
/* SEE-contexts for PPM-contexts with masked symbols */
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
UInt16 Summ; /* Freq */
|
|
||||||
Byte Shift; /* Speed of Freq change; low Shift is for fast change */
|
|
||||||
Byte Count; /* Count to next change of Shift */
|
|
||||||
} CPpmd_See;
|
|
||||||
|
|
||||||
#define Ppmd_See_Update(p) if ((p)->Shift < PPMD_PERIOD_BITS && --(p)->Count == 0) \
|
|
||||||
{ (p)->Summ <<= 1; (p)->Count = (Byte)(3 << (p)->Shift++); }
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
Byte Symbol;
|
|
||||||
Byte Freq;
|
|
||||||
UInt16 SuccessorLow;
|
|
||||||
UInt16 SuccessorHigh;
|
|
||||||
} CPpmd_State;
|
|
||||||
|
|
||||||
typedef
|
|
||||||
#ifdef PPMD_32BIT
|
|
||||||
CPpmd_State *
|
|
||||||
#else
|
|
||||||
UInt32
|
|
||||||
#endif
|
|
||||||
CPpmd_State_Ref;
|
|
||||||
|
|
||||||
typedef
|
|
||||||
#ifdef PPMD_32BIT
|
|
||||||
void *
|
|
||||||
#else
|
|
||||||
UInt32
|
|
||||||
#endif
|
|
||||||
CPpmd_Void_Ref;
|
|
||||||
|
|
||||||
typedef
|
|
||||||
#ifdef PPMD_32BIT
|
|
||||||
Byte *
|
|
||||||
#else
|
|
||||||
UInt32
|
|
||||||
#endif
|
|
||||||
CPpmd_Byte_Ref;
|
|
||||||
|
|
||||||
#define PPMD_SetAllBitsIn256Bytes(p) \
|
|
||||||
{ unsigned j; for (j = 0; j < 256 / sizeof(p[0]); j += 8) { \
|
|
||||||
p[j+7] = p[j+6] = p[j+5] = p[j+4] = p[j+3] = p[j+2] = p[j+1] = p[j+0] = ~(size_t)0; }}
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,169 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* $FreeBSD: head/lib/libarchive/archive_private.h 201098 2009-12-28 02:58:14Z kientzle $
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __LIBARCHIVE_BUILD
|
|
||||||
#error This header is only to be used internally to libarchive.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_PRIVATE_H_INCLUDED
|
|
||||||
#define ARCHIVE_PRIVATE_H_INCLUDED
|
|
||||||
|
|
||||||
#if HAVE_ICONV_H
|
|
||||||
#include <iconv.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "archive.h"
|
|
||||||
#include "archive_string.h"
|
|
||||||
|
|
||||||
#if defined(__GNUC__) && (__GNUC__ > 2 || \
|
|
||||||
(__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
|
|
||||||
#define __LA_DEAD __attribute__((__noreturn__))
|
|
||||||
#else
|
|
||||||
#define __LA_DEAD
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ARCHIVE_WRITE_MAGIC (0xb0c5c0deU)
|
|
||||||
#define ARCHIVE_READ_MAGIC (0xdeb0c5U)
|
|
||||||
#define ARCHIVE_WRITE_DISK_MAGIC (0xc001b0c5U)
|
|
||||||
#define ARCHIVE_READ_DISK_MAGIC (0xbadb0c5U)
|
|
||||||
#define ARCHIVE_MATCH_MAGIC (0xcad11c9U)
|
|
||||||
|
|
||||||
#define ARCHIVE_STATE_NEW 1U
|
|
||||||
#define ARCHIVE_STATE_HEADER 2U
|
|
||||||
#define ARCHIVE_STATE_DATA 4U
|
|
||||||
#define ARCHIVE_STATE_EOF 0x10U
|
|
||||||
#define ARCHIVE_STATE_CLOSED 0x20U
|
|
||||||
#define ARCHIVE_STATE_FATAL 0x8000U
|
|
||||||
#define ARCHIVE_STATE_ANY (0xFFFFU & ~ARCHIVE_STATE_FATAL)
|
|
||||||
|
|
||||||
struct archive_vtable {
|
|
||||||
int (*archive_close)(struct archive *);
|
|
||||||
int (*archive_free)(struct archive *);
|
|
||||||
int (*archive_write_header)(struct archive *,
|
|
||||||
struct archive_entry *);
|
|
||||||
int (*archive_write_finish_entry)(struct archive *);
|
|
||||||
ssize_t (*archive_write_data)(struct archive *,
|
|
||||||
const void *, size_t);
|
|
||||||
ssize_t (*archive_write_data_block)(struct archive *,
|
|
||||||
const void *, size_t, int64_t);
|
|
||||||
|
|
||||||
int (*archive_read_next_header)(struct archive *,
|
|
||||||
struct archive_entry **);
|
|
||||||
int (*archive_read_next_header2)(struct archive *,
|
|
||||||
struct archive_entry *);
|
|
||||||
int (*archive_read_data_block)(struct archive *,
|
|
||||||
const void **, size_t *, int64_t *);
|
|
||||||
|
|
||||||
int (*archive_filter_count)(struct archive *);
|
|
||||||
int64_t (*archive_filter_bytes)(struct archive *, int);
|
|
||||||
int (*archive_filter_code)(struct archive *, int);
|
|
||||||
const char * (*archive_filter_name)(struct archive *, int);
|
|
||||||
};
|
|
||||||
|
|
||||||
struct archive_string_conv;
|
|
||||||
|
|
||||||
struct archive {
|
|
||||||
/*
|
|
||||||
* The magic/state values are used to sanity-check the
|
|
||||||
* client's usage. If an API function is called at a
|
|
||||||
* ridiculous time, or the client passes us an invalid
|
|
||||||
* pointer, these values allow me to catch that.
|
|
||||||
*/
|
|
||||||
unsigned int magic;
|
|
||||||
unsigned int state;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Some public API functions depend on the "real" type of the
|
|
||||||
* archive object.
|
|
||||||
*/
|
|
||||||
struct archive_vtable *vtable;
|
|
||||||
|
|
||||||
int archive_format;
|
|
||||||
const char *archive_format_name;
|
|
||||||
|
|
||||||
int compression_code; /* Currently active compression. */
|
|
||||||
const char *compression_name;
|
|
||||||
|
|
||||||
/* Number of file entries processed. */
|
|
||||||
int file_count;
|
|
||||||
|
|
||||||
int archive_error_number;
|
|
||||||
const char *error;
|
|
||||||
struct archive_string error_string;
|
|
||||||
|
|
||||||
char *current_code;
|
|
||||||
unsigned current_codepage; /* Current ACP(ANSI CodePage). */
|
|
||||||
unsigned current_oemcp; /* Current OEMCP(OEM CodePage). */
|
|
||||||
struct archive_string_conv *sconv;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This flag is only used when invoking read/write callbacks. It
|
|
||||||
* tells the callback routine whether a metadata read or write is
|
|
||||||
* being requested. This lets higher-level processing routines to
|
|
||||||
* separately store/handle metadata and data.
|
|
||||||
*/
|
|
||||||
int cb_is_metadata;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Set the metadata handling flag. This indicates to libarchive
|
|
||||||
* that callback routines are processing metadata as a separate
|
|
||||||
* stream. This means that cb_is_metadata flag is set during
|
|
||||||
* read/write. In addition, archive reads are handled differently
|
|
||||||
* using a shadow filter structure with separate copy buffer.
|
|
||||||
*/
|
|
||||||
int is_metadata_streaming;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Check magic value and state; return(ARCHIVE_FATAL) if it isn't valid. */
|
|
||||||
int __archive_check_magic(struct archive *, unsigned int magic,
|
|
||||||
unsigned int state, const char *func);
|
|
||||||
#define archive_check_magic(a, expected_magic, allowed_states, function_name) \
|
|
||||||
do { \
|
|
||||||
int magic_test = __archive_check_magic((a), (expected_magic), \
|
|
||||||
(allowed_states), (function_name)); \
|
|
||||||
if (magic_test == ARCHIVE_FATAL) \
|
|
||||||
return ARCHIVE_FATAL; \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
void __archive_errx(int retvalue, const char *msg) __LA_DEAD;
|
|
||||||
|
|
||||||
void __archive_ensure_cloexec_flag(int fd);
|
|
||||||
int __archive_mktemp(const char *tmpdir);
|
|
||||||
|
|
||||||
int __archive_clean(struct archive *);
|
|
||||||
|
|
||||||
#define err_combine(a,b) ((a) < (b) ? (a) : (b))
|
|
||||||
|
|
||||||
#if defined(__BORLANDC__) || (defined(_MSC_VER) && _MSC_VER <= 1300)
|
|
||||||
# define ARCHIVE_LITERAL_LL(x) x##i64
|
|
||||||
# define ARCHIVE_LITERAL_ULL(x) x##ui64
|
|
||||||
#else
|
|
||||||
# define ARCHIVE_LITERAL_LL(x) x##ll
|
|
||||||
# define ARCHIVE_LITERAL_ULL(x) x##ull
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,709 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2001 The NetBSD Foundation, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This code is derived from software contributed to The NetBSD Foundation
|
|
||||||
* by Matt Thomas <matt@3am-software.com>.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
|
||||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
|
||||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
|
||||||
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
||||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
||||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
||||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
||||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* Based on: NetBSD: rb.c,v 1.6 2010/04/30 13:58:09 joerg Exp
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
|
|
||||||
#include <stddef.h>
|
|
||||||
|
|
||||||
#include "archive_rb.h"
|
|
||||||
|
|
||||||
/* Keep in sync with archive_rb.h */
|
|
||||||
#define RB_DIR_LEFT 0
|
|
||||||
#define RB_DIR_RIGHT 1
|
|
||||||
#define RB_DIR_OTHER 1
|
|
||||||
#define rb_left rb_nodes[RB_DIR_LEFT]
|
|
||||||
#define rb_right rb_nodes[RB_DIR_RIGHT]
|
|
||||||
|
|
||||||
#define RB_FLAG_POSITION 0x2
|
|
||||||
#define RB_FLAG_RED 0x1
|
|
||||||
#define RB_FLAG_MASK (RB_FLAG_POSITION|RB_FLAG_RED)
|
|
||||||
#define RB_FATHER(rb) \
|
|
||||||
((struct archive_rb_node *)((rb)->rb_info & ~RB_FLAG_MASK))
|
|
||||||
#define RB_SET_FATHER(rb, father) \
|
|
||||||
((void)((rb)->rb_info = (uintptr_t)(father)|((rb)->rb_info & RB_FLAG_MASK)))
|
|
||||||
|
|
||||||
#define RB_SENTINEL_P(rb) ((rb) == NULL)
|
|
||||||
#define RB_LEFT_SENTINEL_P(rb) RB_SENTINEL_P((rb)->rb_left)
|
|
||||||
#define RB_RIGHT_SENTINEL_P(rb) RB_SENTINEL_P((rb)->rb_right)
|
|
||||||
#define RB_FATHER_SENTINEL_P(rb) RB_SENTINEL_P(RB_FATHER((rb)))
|
|
||||||
#define RB_CHILDLESS_P(rb) \
|
|
||||||
(RB_SENTINEL_P(rb) || (RB_LEFT_SENTINEL_P(rb) && RB_RIGHT_SENTINEL_P(rb)))
|
|
||||||
#define RB_TWOCHILDREN_P(rb) \
|
|
||||||
(!RB_SENTINEL_P(rb) && !RB_LEFT_SENTINEL_P(rb) && !RB_RIGHT_SENTINEL_P(rb))
|
|
||||||
|
|
||||||
#define RB_POSITION(rb) \
|
|
||||||
(((rb)->rb_info & RB_FLAG_POSITION) ? RB_DIR_RIGHT : RB_DIR_LEFT)
|
|
||||||
#define RB_RIGHT_P(rb) (RB_POSITION(rb) == RB_DIR_RIGHT)
|
|
||||||
#define RB_LEFT_P(rb) (RB_POSITION(rb) == RB_DIR_LEFT)
|
|
||||||
#define RB_RED_P(rb) (!RB_SENTINEL_P(rb) && ((rb)->rb_info & RB_FLAG_RED) != 0)
|
|
||||||
#define RB_BLACK_P(rb) (RB_SENTINEL_P(rb) || ((rb)->rb_info & RB_FLAG_RED) == 0)
|
|
||||||
#define RB_MARK_RED(rb) ((void)((rb)->rb_info |= RB_FLAG_RED))
|
|
||||||
#define RB_MARK_BLACK(rb) ((void)((rb)->rb_info &= ~RB_FLAG_RED))
|
|
||||||
#define RB_INVERT_COLOR(rb) ((void)((rb)->rb_info ^= RB_FLAG_RED))
|
|
||||||
#define RB_ROOT_P(rbt, rb) ((rbt)->rbt_root == (rb))
|
|
||||||
#define RB_SET_POSITION(rb, position) \
|
|
||||||
((void)((position) ? ((rb)->rb_info |= RB_FLAG_POSITION) : \
|
|
||||||
((rb)->rb_info &= ~RB_FLAG_POSITION)))
|
|
||||||
#define RB_ZERO_PROPERTIES(rb) ((void)((rb)->rb_info &= ~RB_FLAG_MASK))
|
|
||||||
#define RB_COPY_PROPERTIES(dst, src) \
|
|
||||||
((void)((dst)->rb_info ^= ((dst)->rb_info ^ (src)->rb_info) & RB_FLAG_MASK))
|
|
||||||
#define RB_SWAP_PROPERTIES(a, b) do { \
|
|
||||||
uintptr_t xorinfo = ((a)->rb_info ^ (b)->rb_info) & RB_FLAG_MASK; \
|
|
||||||
(a)->rb_info ^= xorinfo; \
|
|
||||||
(b)->rb_info ^= xorinfo; \
|
|
||||||
} while (/*CONSTCOND*/ 0)
|
|
||||||
|
|
||||||
static void __archive_rb_tree_insert_rebalance(struct archive_rb_tree *,
|
|
||||||
struct archive_rb_node *);
|
|
||||||
static void __archive_rb_tree_removal_rebalance(struct archive_rb_tree *,
|
|
||||||
struct archive_rb_node *, unsigned int);
|
|
||||||
|
|
||||||
#define RB_SENTINEL_NODE NULL
|
|
||||||
|
|
||||||
#define T 1
|
|
||||||
#define F 0
|
|
||||||
|
|
||||||
void
|
|
||||||
__archive_rb_tree_init(struct archive_rb_tree *rbt,
|
|
||||||
const struct archive_rb_tree_ops *ops)
|
|
||||||
{
|
|
||||||
rbt->rbt_ops = ops;
|
|
||||||
*((struct archive_rb_node **)&rbt->rbt_root) = RB_SENTINEL_NODE;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct archive_rb_node *
|
|
||||||
__archive_rb_tree_find_node(struct archive_rb_tree *rbt, const void *key)
|
|
||||||
{
|
|
||||||
archive_rbto_compare_key_fn compare_key = rbt->rbt_ops->rbto_compare_key;
|
|
||||||
struct archive_rb_node *parent = rbt->rbt_root;
|
|
||||||
|
|
||||||
while (!RB_SENTINEL_P(parent)) {
|
|
||||||
const signed int diff = (*compare_key)(parent, key);
|
|
||||||
if (diff == 0)
|
|
||||||
return parent;
|
|
||||||
parent = parent->rb_nodes[diff > 0];
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct archive_rb_node *
|
|
||||||
__archive_rb_tree_find_node_geq(struct archive_rb_tree *rbt, const void *key)
|
|
||||||
{
|
|
||||||
archive_rbto_compare_key_fn compare_key = rbt->rbt_ops->rbto_compare_key;
|
|
||||||
struct archive_rb_node *parent = rbt->rbt_root;
|
|
||||||
struct archive_rb_node *last = NULL;
|
|
||||||
|
|
||||||
while (!RB_SENTINEL_P(parent)) {
|
|
||||||
const signed int diff = (*compare_key)(parent, key);
|
|
||||||
if (diff == 0)
|
|
||||||
return parent;
|
|
||||||
if (diff < 0)
|
|
||||||
last = parent;
|
|
||||||
parent = parent->rb_nodes[diff > 0];
|
|
||||||
}
|
|
||||||
|
|
||||||
return last;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct archive_rb_node *
|
|
||||||
__archive_rb_tree_find_node_leq(struct archive_rb_tree *rbt, const void *key)
|
|
||||||
{
|
|
||||||
archive_rbto_compare_key_fn compare_key = rbt->rbt_ops->rbto_compare_key;
|
|
||||||
struct archive_rb_node *parent = rbt->rbt_root;
|
|
||||||
struct archive_rb_node *last = NULL;
|
|
||||||
|
|
||||||
while (!RB_SENTINEL_P(parent)) {
|
|
||||||
const signed int diff = (*compare_key)(parent, key);
|
|
||||||
if (diff == 0)
|
|
||||||
return parent;
|
|
||||||
if (diff > 0)
|
|
||||||
last = parent;
|
|
||||||
parent = parent->rb_nodes[diff > 0];
|
|
||||||
}
|
|
||||||
|
|
||||||
return last;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
__archive_rb_tree_insert_node(struct archive_rb_tree *rbt,
|
|
||||||
struct archive_rb_node *self)
|
|
||||||
{
|
|
||||||
archive_rbto_compare_nodes_fn compare_nodes = rbt->rbt_ops->rbto_compare_nodes;
|
|
||||||
struct archive_rb_node *parent, *tmp;
|
|
||||||
unsigned int position;
|
|
||||||
int rebalance;
|
|
||||||
|
|
||||||
tmp = rbt->rbt_root;
|
|
||||||
/*
|
|
||||||
* This is a hack. Because rbt->rbt_root is just a
|
|
||||||
* struct archive_rb_node *, just like rb_node->rb_nodes[RB_DIR_LEFT],
|
|
||||||
* we can use this fact to avoid a lot of tests for root and know
|
|
||||||
* that even at root, updating
|
|
||||||
* RB_FATHER(rb_node)->rb_nodes[RB_POSITION(rb_node)] will
|
|
||||||
* update rbt->rbt_root.
|
|
||||||
*/
|
|
||||||
parent = (struct archive_rb_node *)(void *)&rbt->rbt_root;
|
|
||||||
position = RB_DIR_LEFT;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Find out where to place this new leaf.
|
|
||||||
*/
|
|
||||||
while (!RB_SENTINEL_P(tmp)) {
|
|
||||||
const signed int diff = (*compare_nodes)(tmp, self);
|
|
||||||
if (diff == 0) {
|
|
||||||
/*
|
|
||||||
* Node already exists; don't insert.
|
|
||||||
*/
|
|
||||||
return F;
|
|
||||||
}
|
|
||||||
parent = tmp;
|
|
||||||
position = (diff > 0);
|
|
||||||
tmp = parent->rb_nodes[position];
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Initialize the node and insert as a leaf into the tree.
|
|
||||||
*/
|
|
||||||
RB_SET_FATHER(self, parent);
|
|
||||||
RB_SET_POSITION(self, position);
|
|
||||||
if (parent == (struct archive_rb_node *)(void *)&rbt->rbt_root) {
|
|
||||||
RB_MARK_BLACK(self); /* root is always black */
|
|
||||||
rebalance = F;
|
|
||||||
} else {
|
|
||||||
/*
|
|
||||||
* All new nodes are colored red. We only need to rebalance
|
|
||||||
* if our parent is also red.
|
|
||||||
*/
|
|
||||||
RB_MARK_RED(self);
|
|
||||||
rebalance = RB_RED_P(parent);
|
|
||||||
}
|
|
||||||
self->rb_left = parent->rb_nodes[position];
|
|
||||||
self->rb_right = parent->rb_nodes[position];
|
|
||||||
parent->rb_nodes[position] = self;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Rebalance tree after insertion
|
|
||||||
*/
|
|
||||||
if (rebalance)
|
|
||||||
__archive_rb_tree_insert_rebalance(rbt, self);
|
|
||||||
|
|
||||||
return T;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Swap the location and colors of 'self' and its child @ which. The child
|
|
||||||
* can not be a sentinel node. This is our rotation function. However,
|
|
||||||
* since it preserves coloring, it great simplifies both insertion and
|
|
||||||
* removal since rotation almost always involves the exchanging of colors
|
|
||||||
* as a separate step.
|
|
||||||
*/
|
|
||||||
/*ARGSUSED*/
|
|
||||||
static void
|
|
||||||
__archive_rb_tree_reparent_nodes(
|
|
||||||
struct archive_rb_node *old_father, const unsigned int which)
|
|
||||||
{
|
|
||||||
const unsigned int other = which ^ RB_DIR_OTHER;
|
|
||||||
struct archive_rb_node * const grandpa = RB_FATHER(old_father);
|
|
||||||
struct archive_rb_node * const old_child = old_father->rb_nodes[which];
|
|
||||||
struct archive_rb_node * const new_father = old_child;
|
|
||||||
struct archive_rb_node * const new_child = old_father;
|
|
||||||
|
|
||||||
if (new_father == NULL)
|
|
||||||
return;
|
|
||||||
/*
|
|
||||||
* Exchange descendant linkages.
|
|
||||||
*/
|
|
||||||
grandpa->rb_nodes[RB_POSITION(old_father)] = new_father;
|
|
||||||
new_child->rb_nodes[which] = old_child->rb_nodes[other];
|
|
||||||
new_father->rb_nodes[other] = new_child;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Update ancestor linkages
|
|
||||||
*/
|
|
||||||
RB_SET_FATHER(new_father, grandpa);
|
|
||||||
RB_SET_FATHER(new_child, new_father);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Exchange properties between new_father and new_child. The only
|
|
||||||
* change is that new_child's position is now on the other side.
|
|
||||||
*/
|
|
||||||
RB_SWAP_PROPERTIES(new_father, new_child);
|
|
||||||
RB_SET_POSITION(new_child, other);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Make sure to reparent the new child to ourself.
|
|
||||||
*/
|
|
||||||
if (!RB_SENTINEL_P(new_child->rb_nodes[which])) {
|
|
||||||
RB_SET_FATHER(new_child->rb_nodes[which], new_child);
|
|
||||||
RB_SET_POSITION(new_child->rb_nodes[which], which);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
__archive_rb_tree_insert_rebalance(struct archive_rb_tree *rbt,
|
|
||||||
struct archive_rb_node *self)
|
|
||||||
{
|
|
||||||
struct archive_rb_node * father = RB_FATHER(self);
|
|
||||||
struct archive_rb_node * grandpa;
|
|
||||||
struct archive_rb_node * uncle;
|
|
||||||
unsigned int which;
|
|
||||||
unsigned int other;
|
|
||||||
|
|
||||||
for (;;) {
|
|
||||||
/*
|
|
||||||
* We are red and our parent is red, therefore we must have a
|
|
||||||
* grandfather and he must be black.
|
|
||||||
*/
|
|
||||||
grandpa = RB_FATHER(father);
|
|
||||||
which = (father == grandpa->rb_right);
|
|
||||||
other = which ^ RB_DIR_OTHER;
|
|
||||||
uncle = grandpa->rb_nodes[other];
|
|
||||||
|
|
||||||
if (RB_BLACK_P(uncle))
|
|
||||||
break;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Case 1: our uncle is red
|
|
||||||
* Simply invert the colors of our parent and
|
|
||||||
* uncle and make our grandparent red. And
|
|
||||||
* then solve the problem up at his level.
|
|
||||||
*/
|
|
||||||
RB_MARK_BLACK(uncle);
|
|
||||||
RB_MARK_BLACK(father);
|
|
||||||
if (RB_ROOT_P(rbt, grandpa)) {
|
|
||||||
/*
|
|
||||||
* If our grandpa is root, don't bother
|
|
||||||
* setting him to red, just return.
|
|
||||||
*/
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
RB_MARK_RED(grandpa);
|
|
||||||
self = grandpa;
|
|
||||||
father = RB_FATHER(self);
|
|
||||||
if (RB_BLACK_P(father)) {
|
|
||||||
/*
|
|
||||||
* If our greatgrandpa is black, we're done.
|
|
||||||
*/
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Case 2&3: our uncle is black.
|
|
||||||
*/
|
|
||||||
if (self == father->rb_nodes[other]) {
|
|
||||||
/*
|
|
||||||
* Case 2: we are on the same side as our uncle
|
|
||||||
* Swap ourselves with our parent so this case
|
|
||||||
* becomes case 3. Basically our parent becomes our
|
|
||||||
* child.
|
|
||||||
*/
|
|
||||||
__archive_rb_tree_reparent_nodes(father, other);
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
* Case 3: we are opposite a child of a black uncle.
|
|
||||||
* Swap our parent and grandparent. Since our grandfather
|
|
||||||
* is black, our father will become black and our new sibling
|
|
||||||
* (former grandparent) will become red.
|
|
||||||
*/
|
|
||||||
__archive_rb_tree_reparent_nodes(grandpa, which);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Final step: Set the root to black.
|
|
||||||
*/
|
|
||||||
RB_MARK_BLACK(rbt->rbt_root);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
__archive_rb_tree_prune_node(struct archive_rb_tree *rbt,
|
|
||||||
struct archive_rb_node *self, int rebalance)
|
|
||||||
{
|
|
||||||
const unsigned int which = RB_POSITION(self);
|
|
||||||
struct archive_rb_node *father = RB_FATHER(self);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Since we are childless, we know that self->rb_left is pointing
|
|
||||||
* to the sentinel node.
|
|
||||||
*/
|
|
||||||
father->rb_nodes[which] = self->rb_left;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Rebalance if requested.
|
|
||||||
*/
|
|
||||||
if (rebalance)
|
|
||||||
__archive_rb_tree_removal_rebalance(rbt, father, which);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* When deleting an interior node
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
__archive_rb_tree_swap_prune_and_rebalance(struct archive_rb_tree *rbt,
|
|
||||||
struct archive_rb_node *self, struct archive_rb_node *standin)
|
|
||||||
{
|
|
||||||
const unsigned int standin_which = RB_POSITION(standin);
|
|
||||||
unsigned int standin_other = standin_which ^ RB_DIR_OTHER;
|
|
||||||
struct archive_rb_node *standin_son;
|
|
||||||
struct archive_rb_node *standin_father = RB_FATHER(standin);
|
|
||||||
int rebalance = RB_BLACK_P(standin);
|
|
||||||
|
|
||||||
if (standin_father == self) {
|
|
||||||
/*
|
|
||||||
* As a child of self, any children would be opposite of
|
|
||||||
* our parent.
|
|
||||||
*/
|
|
||||||
standin_son = standin->rb_nodes[standin_which];
|
|
||||||
} else {
|
|
||||||
/*
|
|
||||||
* Since we aren't a child of self, any children would be
|
|
||||||
* on the same side as our parent.
|
|
||||||
*/
|
|
||||||
standin_son = standin->rb_nodes[standin_other];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (RB_RED_P(standin_son)) {
|
|
||||||
/*
|
|
||||||
* We know we have a red child so if we flip it to black
|
|
||||||
* we don't have to rebalance.
|
|
||||||
*/
|
|
||||||
RB_MARK_BLACK(standin_son);
|
|
||||||
rebalance = F;
|
|
||||||
|
|
||||||
if (standin_father != self) {
|
|
||||||
/*
|
|
||||||
* Change the son's parentage to point to his grandpa.
|
|
||||||
*/
|
|
||||||
RB_SET_FATHER(standin_son, standin_father);
|
|
||||||
RB_SET_POSITION(standin_son, standin_which);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (standin_father == self) {
|
|
||||||
/*
|
|
||||||
* If we are about to delete the standin's father, then when
|
|
||||||
* we call rebalance, we need to use ourselves as our father.
|
|
||||||
* Otherwise remember our original father. Also, since we are
|
|
||||||
* our standin's father we only need to reparent the standin's
|
|
||||||
* brother.
|
|
||||||
*
|
|
||||||
* | R --> S |
|
|
||||||
* | Q S --> Q T |
|
|
||||||
* | t --> |
|
|
||||||
*
|
|
||||||
* Have our son/standin adopt his brother as his new son.
|
|
||||||
*/
|
|
||||||
standin_father = standin;
|
|
||||||
} else {
|
|
||||||
/*
|
|
||||||
* | R --> S . |
|
|
||||||
* | / \ | T --> / \ | / |
|
|
||||||
* | ..... | S --> ..... | T |
|
|
||||||
*
|
|
||||||
* Sever standin's connection to his father.
|
|
||||||
*/
|
|
||||||
standin_father->rb_nodes[standin_which] = standin_son;
|
|
||||||
/*
|
|
||||||
* Adopt the far son.
|
|
||||||
*/
|
|
||||||
standin->rb_nodes[standin_other] = self->rb_nodes[standin_other];
|
|
||||||
RB_SET_FATHER(standin->rb_nodes[standin_other], standin);
|
|
||||||
/*
|
|
||||||
* Use standin_other because we need to preserve standin_which
|
|
||||||
* for the removal_rebalance.
|
|
||||||
*/
|
|
||||||
standin_other = standin_which;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Move the only remaining son to our standin. If our standin is our
|
|
||||||
* son, this will be the only son needed to be moved.
|
|
||||||
*/
|
|
||||||
standin->rb_nodes[standin_other] = self->rb_nodes[standin_other];
|
|
||||||
RB_SET_FATHER(standin->rb_nodes[standin_other], standin);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Now copy the result of self to standin and then replace
|
|
||||||
* self with standin in the tree.
|
|
||||||
*/
|
|
||||||
RB_COPY_PROPERTIES(standin, self);
|
|
||||||
RB_SET_FATHER(standin, RB_FATHER(self));
|
|
||||||
RB_FATHER(standin)->rb_nodes[RB_POSITION(standin)] = standin;
|
|
||||||
|
|
||||||
if (rebalance)
|
|
||||||
__archive_rb_tree_removal_rebalance(rbt, standin_father, standin_which);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* We could do this by doing
|
|
||||||
* __archive_rb_tree_node_swap(rbt, self, which);
|
|
||||||
* __archive_rb_tree_prune_node(rbt, self, F);
|
|
||||||
*
|
|
||||||
* But it's more efficient to just evaluate and recolor the child.
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
__archive_rb_tree_prune_blackred_branch(
|
|
||||||
struct archive_rb_node *self, unsigned int which)
|
|
||||||
{
|
|
||||||
struct archive_rb_node *father = RB_FATHER(self);
|
|
||||||
struct archive_rb_node *son = self->rb_nodes[which];
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Remove ourselves from the tree and give our former child our
|
|
||||||
* properties (position, color, root).
|
|
||||||
*/
|
|
||||||
RB_COPY_PROPERTIES(son, self);
|
|
||||||
father->rb_nodes[RB_POSITION(son)] = son;
|
|
||||||
RB_SET_FATHER(son, father);
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
__archive_rb_tree_remove_node(struct archive_rb_tree *rbt,
|
|
||||||
struct archive_rb_node *self)
|
|
||||||
{
|
|
||||||
struct archive_rb_node *standin;
|
|
||||||
unsigned int which;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* In the following diagrams, we (the node to be removed) are S. Red
|
|
||||||
* nodes are lowercase. T could be either red or black.
|
|
||||||
*
|
|
||||||
* Remember the major axiom of the red-black tree: the number of
|
|
||||||
* black nodes from the root to each leaf is constant across all
|
|
||||||
* leaves, only the number of red nodes varies.
|
|
||||||
*
|
|
||||||
* Thus removing a red leaf doesn't require any other changes to a
|
|
||||||
* red-black tree. So if we must remove a node, attempt to rearrange
|
|
||||||
* the tree so we can remove a red node.
|
|
||||||
*
|
|
||||||
* The simplest case is a childless red node or a childless root node:
|
|
||||||
*
|
|
||||||
* | T --> T | or | R --> * |
|
|
||||||
* | s --> * |
|
|
||||||
*/
|
|
||||||
if (RB_CHILDLESS_P(self)) {
|
|
||||||
const int rebalance = RB_BLACK_P(self) && !RB_ROOT_P(rbt, self);
|
|
||||||
__archive_rb_tree_prune_node(rbt, self, rebalance);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!RB_TWOCHILDREN_P(self)) {
|
|
||||||
/*
|
|
||||||
* The next simplest case is the node we are deleting is
|
|
||||||
* black and has one red child.
|
|
||||||
*
|
|
||||||
* | T --> T --> T |
|
|
||||||
* | S --> R --> R |
|
|
||||||
* | r --> s --> * |
|
|
||||||
*/
|
|
||||||
which = RB_LEFT_SENTINEL_P(self) ? RB_DIR_RIGHT : RB_DIR_LEFT;
|
|
||||||
__archive_rb_tree_prune_blackred_branch(self, which);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* We invert these because we prefer to remove from the inside of
|
|
||||||
* the tree.
|
|
||||||
*/
|
|
||||||
which = RB_POSITION(self) ^ RB_DIR_OTHER;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Let's find the node closes to us opposite of our parent
|
|
||||||
* Now swap it with ourself, "prune" it, and rebalance, if needed.
|
|
||||||
*/
|
|
||||||
standin = __archive_rb_tree_iterate(rbt, self, which);
|
|
||||||
__archive_rb_tree_swap_prune_and_rebalance(rbt, self, standin);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
__archive_rb_tree_removal_rebalance(struct archive_rb_tree *rbt,
|
|
||||||
struct archive_rb_node *parent, unsigned int which)
|
|
||||||
{
|
|
||||||
|
|
||||||
while (RB_BLACK_P(parent->rb_nodes[which])) {
|
|
||||||
unsigned int other = which ^ RB_DIR_OTHER;
|
|
||||||
struct archive_rb_node *brother = parent->rb_nodes[other];
|
|
||||||
|
|
||||||
if (brother == NULL)
|
|
||||||
return;/* The tree may be broken. */
|
|
||||||
/*
|
|
||||||
* For cases 1, 2a, and 2b, our brother's children must
|
|
||||||
* be black and our father must be black
|
|
||||||
*/
|
|
||||||
if (RB_BLACK_P(parent)
|
|
||||||
&& RB_BLACK_P(brother->rb_left)
|
|
||||||
&& RB_BLACK_P(brother->rb_right)) {
|
|
||||||
if (RB_RED_P(brother)) {
|
|
||||||
/*
|
|
||||||
* Case 1: Our brother is red, swap its
|
|
||||||
* position (and colors) with our parent.
|
|
||||||
* This should now be case 2b (unless C or E
|
|
||||||
* has a red child which is case 3; thus no
|
|
||||||
* explicit branch to case 2b).
|
|
||||||
*
|
|
||||||
* B -> D
|
|
||||||
* A d -> b E
|
|
||||||
* C E -> A C
|
|
||||||
*/
|
|
||||||
__archive_rb_tree_reparent_nodes(parent, other);
|
|
||||||
brother = parent->rb_nodes[other];
|
|
||||||
if (brother == NULL)
|
|
||||||
return;/* The tree may be broken. */
|
|
||||||
} else {
|
|
||||||
/*
|
|
||||||
* Both our parent and brother are black.
|
|
||||||
* Change our brother to red, advance up rank
|
|
||||||
* and go through the loop again.
|
|
||||||
*
|
|
||||||
* B -> *B
|
|
||||||
* *A D -> A d
|
|
||||||
* C E -> C E
|
|
||||||
*/
|
|
||||||
RB_MARK_RED(brother);
|
|
||||||
if (RB_ROOT_P(rbt, parent))
|
|
||||||
return; /* root == parent == black */
|
|
||||||
which = RB_POSITION(parent);
|
|
||||||
parent = RB_FATHER(parent);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
* Avoid an else here so that case 2a above can hit either
|
|
||||||
* case 2b, 3, or 4.
|
|
||||||
*/
|
|
||||||
if (RB_RED_P(parent)
|
|
||||||
&& RB_BLACK_P(brother)
|
|
||||||
&& RB_BLACK_P(brother->rb_left)
|
|
||||||
&& RB_BLACK_P(brother->rb_right)) {
|
|
||||||
/*
|
|
||||||
* We are black, our father is red, our brother and
|
|
||||||
* both nephews are black. Simply invert/exchange the
|
|
||||||
* colors of our father and brother (to black and red
|
|
||||||
* respectively).
|
|
||||||
*
|
|
||||||
* | f --> F |
|
|
||||||
* | * B --> * b |
|
|
||||||
* | N N --> N N |
|
|
||||||
*/
|
|
||||||
RB_MARK_BLACK(parent);
|
|
||||||
RB_MARK_RED(brother);
|
|
||||||
break; /* We're done! */
|
|
||||||
} else {
|
|
||||||
/*
|
|
||||||
* Our brother must be black and have at least one
|
|
||||||
* red child (it may have two).
|
|
||||||
*/
|
|
||||||
if (RB_BLACK_P(brother->rb_nodes[other])) {
|
|
||||||
/*
|
|
||||||
* Case 3: our brother is black, our near
|
|
||||||
* nephew is red, and our far nephew is black.
|
|
||||||
* Swap our brother with our near nephew.
|
|
||||||
* This result in a tree that matches case 4.
|
|
||||||
* (Our father could be red or black).
|
|
||||||
*
|
|
||||||
* | F --> F |
|
|
||||||
* | x B --> x B |
|
|
||||||
* | n --> n |
|
|
||||||
*/
|
|
||||||
__archive_rb_tree_reparent_nodes(brother, which);
|
|
||||||
brother = parent->rb_nodes[other];
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
* Case 4: our brother is black and our far nephew
|
|
||||||
* is red. Swap our father and brother locations and
|
|
||||||
* change our far nephew to black. (these can be
|
|
||||||
* done in either order so we change the color first).
|
|
||||||
* The result is a valid red-black tree and is a
|
|
||||||
* terminal case. (again we don't care about the
|
|
||||||
* father's color)
|
|
||||||
*
|
|
||||||
* If the father is red, we will get a red-black-black
|
|
||||||
* tree:
|
|
||||||
* | f -> f --> b |
|
|
||||||
* | B -> B --> F N |
|
|
||||||
* | n -> N --> |
|
|
||||||
*
|
|
||||||
* If the father is black, we will get an all black
|
|
||||||
* tree:
|
|
||||||
* | F -> F --> B |
|
|
||||||
* | B -> B --> F N |
|
|
||||||
* | n -> N --> |
|
|
||||||
*
|
|
||||||
* If we had two red nephews, then after the swap,
|
|
||||||
* our former father would have a red grandson.
|
|
||||||
*/
|
|
||||||
if (brother->rb_nodes[other] == NULL)
|
|
||||||
return;/* The tree may be broken. */
|
|
||||||
RB_MARK_BLACK(brother->rb_nodes[other]);
|
|
||||||
__archive_rb_tree_reparent_nodes(parent, other);
|
|
||||||
break; /* We're done! */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct archive_rb_node *
|
|
||||||
__archive_rb_tree_iterate(struct archive_rb_tree *rbt,
|
|
||||||
struct archive_rb_node *self, const unsigned int direction)
|
|
||||||
{
|
|
||||||
const unsigned int other = direction ^ RB_DIR_OTHER;
|
|
||||||
|
|
||||||
if (self == NULL) {
|
|
||||||
self = rbt->rbt_root;
|
|
||||||
if (RB_SENTINEL_P(self))
|
|
||||||
return NULL;
|
|
||||||
while (!RB_SENTINEL_P(self->rb_nodes[direction]))
|
|
||||||
self = self->rb_nodes[direction];
|
|
||||||
return self;
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
* We can't go any further in this direction. We proceed up in the
|
|
||||||
* opposite direction until our parent is in direction we want to go.
|
|
||||||
*/
|
|
||||||
if (RB_SENTINEL_P(self->rb_nodes[direction])) {
|
|
||||||
while (!RB_ROOT_P(rbt, self)) {
|
|
||||||
if (other == (unsigned int)RB_POSITION(self))
|
|
||||||
return RB_FATHER(self);
|
|
||||||
self = RB_FATHER(self);
|
|
||||||
}
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Advance down one in current direction and go down as far as possible
|
|
||||||
* in the opposite direction.
|
|
||||||
*/
|
|
||||||
self = self->rb_nodes[direction];
|
|
||||||
while (!RB_SENTINEL_P(self->rb_nodes[other]))
|
|
||||||
self = self->rb_nodes[other];
|
|
||||||
return self;
|
|
||||||
}
|
|
|
@ -1,100 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2001 The NetBSD Foundation, Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This code is derived from software contributed to The NetBSD Foundation
|
|
||||||
* by Matt Thomas <matt@3am-software.com>.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
|
||||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
|
||||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
|
||||||
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
||||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
||||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
||||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
||||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* Based on NetBSD: rb.h,v 1.13 2009/08/16 10:57:01 yamt Exp
|
|
||||||
*/
|
|
||||||
#ifndef ARCHIVE_RB_H_
|
|
||||||
#define ARCHIVE_RB_H_
|
|
||||||
|
|
||||||
struct archive_rb_node {
|
|
||||||
struct archive_rb_node *rb_nodes[2];
|
|
||||||
/*
|
|
||||||
* rb_info contains the two flags and the parent back pointer.
|
|
||||||
* We put the two flags in the low two bits since we know that
|
|
||||||
* rb_node will have an alignment of 4 or 8 bytes.
|
|
||||||
*/
|
|
||||||
uintptr_t rb_info;
|
|
||||||
};
|
|
||||||
|
|
||||||
#define ARCHIVE_RB_DIR_LEFT 0
|
|
||||||
#define ARCHIVE_RB_DIR_RIGHT 1
|
|
||||||
|
|
||||||
#define ARCHIVE_RB_TREE_MIN(T) \
|
|
||||||
__archive_rb_tree_iterate((T), NULL, ARCHIVE_RB_DIR_LEFT)
|
|
||||||
#define ARCHIVE_RB_TREE_MAX(T) \
|
|
||||||
__archive_rb_tree_iterate((T), NULL, ARCHIVE_RB_DIR_RIGHT)
|
|
||||||
#define ARCHIVE_RB_TREE_FOREACH(N, T) \
|
|
||||||
for ((N) = ARCHIVE_RB_TREE_MIN(T); (N); \
|
|
||||||
(N) = __archive_rb_tree_iterate((T), (N), ARCHIVE_RB_DIR_RIGHT))
|
|
||||||
#define ARCHIVE_RB_TREE_FOREACH_REVERSE(N, T) \
|
|
||||||
for ((N) = ARCHIVE_RB_TREE_MAX(T); (N); \
|
|
||||||
(N) = __archive_rb_tree_iterate((T), (N), ARCHIVE_RB_DIR_LEFT))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* archive_rbto_compare_nodes_fn:
|
|
||||||
* return a positive value if the first node < the second node.
|
|
||||||
* return a negative value if the first node > the second node.
|
|
||||||
* return 0 if they are considered same.
|
|
||||||
*
|
|
||||||
* archive_rbto_compare_key_fn:
|
|
||||||
* return a positive value if the node < the key.
|
|
||||||
* return a negative value if the node > the key.
|
|
||||||
* return 0 if they are considered same.
|
|
||||||
*/
|
|
||||||
|
|
||||||
typedef signed int (*const archive_rbto_compare_nodes_fn)(const struct archive_rb_node *,
|
|
||||||
const struct archive_rb_node *);
|
|
||||||
typedef signed int (*const archive_rbto_compare_key_fn)(const struct archive_rb_node *,
|
|
||||||
const void *);
|
|
||||||
|
|
||||||
struct archive_rb_tree_ops {
|
|
||||||
archive_rbto_compare_nodes_fn rbto_compare_nodes;
|
|
||||||
archive_rbto_compare_key_fn rbto_compare_key;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct archive_rb_tree {
|
|
||||||
struct archive_rb_node *rbt_root;
|
|
||||||
const struct archive_rb_tree_ops *rbt_ops;
|
|
||||||
};
|
|
||||||
|
|
||||||
void __archive_rb_tree_init(struct archive_rb_tree *,
|
|
||||||
const struct archive_rb_tree_ops *);
|
|
||||||
int __archive_rb_tree_insert_node(struct archive_rb_tree *,
|
|
||||||
struct archive_rb_node *);
|
|
||||||
struct archive_rb_node *
|
|
||||||
__archive_rb_tree_find_node(struct archive_rb_tree *, const void *);
|
|
||||||
struct archive_rb_node *
|
|
||||||
__archive_rb_tree_find_node_geq(struct archive_rb_tree *, const void *);
|
|
||||||
struct archive_rb_node *
|
|
||||||
__archive_rb_tree_find_node_leq(struct archive_rb_tree *, const void *);
|
|
||||||
void __archive_rb_tree_remove_node(struct archive_rb_tree *, struct archive_rb_node *);
|
|
||||||
struct archive_rb_node *
|
|
||||||
__archive_rb_tree_iterate(struct archive_rb_tree *,
|
|
||||||
struct archive_rb_node *, const unsigned int);
|
|
||||||
|
|
||||||
#endif /* ARCHIVE_RB_H_*/
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,210 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2012 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD$");
|
|
||||||
|
|
||||||
#ifdef HAVE_ERRNO_H
|
|
||||||
#include <errno.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "archive.h"
|
|
||||||
#include "archive_private.h"
|
|
||||||
#include "archive_read_private.h"
|
|
||||||
|
|
||||||
int
|
|
||||||
archive_read_append_filter(struct archive *_a, int code)
|
|
||||||
{
|
|
||||||
int r1, r2, number_bidders, i;
|
|
||||||
char str[20];
|
|
||||||
struct archive_read_filter_bidder *bidder;
|
|
||||||
struct archive_read_filter *filter, *tmp;
|
|
||||||
struct archive_read *a = (struct archive_read *)_a;
|
|
||||||
|
|
||||||
r1 = r2 = (ARCHIVE_OK);
|
|
||||||
switch (code)
|
|
||||||
{
|
|
||||||
case ARCHIVE_FILTER_NONE:
|
|
||||||
/* No filter to add, so do nothing.
|
|
||||||
* NOTE: An initial "NONE" type filter is always set at the end of the
|
|
||||||
* filter chain.
|
|
||||||
*/
|
|
||||||
r1 = (ARCHIVE_OK);
|
|
||||||
break;
|
|
||||||
case ARCHIVE_FILTER_GZIP:
|
|
||||||
strcpy(str, "gzip");
|
|
||||||
r1 = archive_read_support_filter_gzip(_a);
|
|
||||||
break;
|
|
||||||
case ARCHIVE_FILTER_BZIP2:
|
|
||||||
strcpy(str, "bzip2");
|
|
||||||
r1 = archive_read_support_filter_bzip2(_a);
|
|
||||||
break;
|
|
||||||
case ARCHIVE_FILTER_COMPRESS:
|
|
||||||
strcpy(str, "compress (.Z)");
|
|
||||||
r1 = archive_read_support_filter_compress(_a);
|
|
||||||
break;
|
|
||||||
case ARCHIVE_FILTER_PROGRAM:
|
|
||||||
archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER,
|
|
||||||
"Cannot append program filter using archive_read_append_filter");
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
case ARCHIVE_FILTER_LZMA:
|
|
||||||
strcpy(str, "lzma");
|
|
||||||
r1 = archive_read_support_filter_lzma(_a);
|
|
||||||
break;
|
|
||||||
case ARCHIVE_FILTER_XZ:
|
|
||||||
strcpy(str, "xz");
|
|
||||||
r1 = archive_read_support_filter_xz(_a);
|
|
||||||
break;
|
|
||||||
case ARCHIVE_FILTER_UU:
|
|
||||||
strcpy(str, "uu");
|
|
||||||
r1 = archive_read_support_filter_uu(_a);
|
|
||||||
break;
|
|
||||||
case ARCHIVE_FILTER_RPM:
|
|
||||||
strcpy(str, "rpm");
|
|
||||||
r1 = archive_read_support_filter_rpm(_a);
|
|
||||||
break;
|
|
||||||
case ARCHIVE_FILTER_LZIP:
|
|
||||||
strcpy(str, "lzip");
|
|
||||||
r1 = archive_read_support_filter_lzip(_a);
|
|
||||||
break;
|
|
||||||
case ARCHIVE_FILTER_LRZIP:
|
|
||||||
strcpy(str, "lrzip");
|
|
||||||
r1 = archive_read_support_filter_lrzip(_a);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER,
|
|
||||||
"Invalid filter code specified");
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (code != ARCHIVE_FILTER_NONE)
|
|
||||||
{
|
|
||||||
number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]);
|
|
||||||
|
|
||||||
bidder = a->bidders;
|
|
||||||
for (i = 0; i < number_bidders; i++, bidder++)
|
|
||||||
{
|
|
||||||
if (!bidder->name || !strcmp(bidder->name, str))
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (!bidder->name || strcmp(bidder->name, str))
|
|
||||||
{
|
|
||||||
archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER,
|
|
||||||
"Internal error: Unable to append filter");
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
filter
|
|
||||||
= (struct archive_read_filter *)calloc(1, sizeof(*filter));
|
|
||||||
if (filter == NULL)
|
|
||||||
{
|
|
||||||
archive_set_error(&a->archive, ENOMEM, "Out of memory");
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
filter->bidder = bidder;
|
|
||||||
filter->archive = a;
|
|
||||||
filter->upstream = a->filter;
|
|
||||||
if (_a->is_metadata_streaming)
|
|
||||||
{
|
|
||||||
tmp = calloc(1, sizeof(*filter));
|
|
||||||
if (tmp == NULL)
|
|
||||||
{
|
|
||||||
free(filter);
|
|
||||||
archive_set_error(&a->archive, ENOMEM, "Out of memory");
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
memcpy(tmp, filter, sizeof (*filter));
|
|
||||||
filter->shadow = tmp;
|
|
||||||
}
|
|
||||||
a->filter = filter;
|
|
||||||
r2 = (bidder->init)(a->filter);
|
|
||||||
if (r2 != ARCHIVE_OK) {
|
|
||||||
__archive_read_close_filters(a);
|
|
||||||
__archive_read_free_filters(a);
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
a->bypass_filter_bidding = 1;
|
|
||||||
return (r1 < r2) ? r1 : r2;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
archive_read_append_filter_program(struct archive *_a, const char *cmd)
|
|
||||||
{
|
|
||||||
return (archive_read_append_filter_program_signature(_a, cmd, NULL, 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
archive_read_append_filter_program_signature(struct archive *_a,
|
|
||||||
const char *cmd, const void *signature, size_t signature_len)
|
|
||||||
{
|
|
||||||
int r, number_bidders, i;
|
|
||||||
struct archive_read_filter_bidder *bidder;
|
|
||||||
struct archive_read_filter *filter;
|
|
||||||
struct archive_read *a = (struct archive_read *)_a;
|
|
||||||
|
|
||||||
if (archive_read_support_filter_program_signature(_a, cmd, signature,
|
|
||||||
signature_len) != (ARCHIVE_OK))
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
|
|
||||||
number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]);
|
|
||||||
|
|
||||||
bidder = a->bidders;
|
|
||||||
for (i = 0; i < number_bidders; i++, bidder++)
|
|
||||||
{
|
|
||||||
/* Program bidder name set to filter name after initialization */
|
|
||||||
if (bidder->data && !bidder->name)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (!bidder->data)
|
|
||||||
{
|
|
||||||
archive_set_error(&a->archive, ARCHIVE_ERRNO_PROGRAMMER,
|
|
||||||
"Internal error: Unable to append program filter");
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
filter
|
|
||||||
= (struct archive_read_filter *)calloc(1, sizeof(*filter));
|
|
||||||
if (filter == NULL)
|
|
||||||
{
|
|
||||||
archive_set_error(&a->archive, ENOMEM, "Out of memory");
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
filter->bidder = bidder;
|
|
||||||
filter->archive = a;
|
|
||||||
filter->upstream = a->filter;
|
|
||||||
a->filter = filter;
|
|
||||||
r = (bidder->init)(a->filter);
|
|
||||||
if (r != ARCHIVE_OK) {
|
|
||||||
__archive_read_close_filters(a);
|
|
||||||
__archive_read_free_filters(a);
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
bidder->name = a->filter->name;
|
|
||||||
|
|
||||||
a->bypass_filter_bidding = 1;
|
|
||||||
return r;
|
|
||||||
}
|
|
|
@ -1,139 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.16 2008/05/23 05:01:29 cperciva Exp $");
|
|
||||||
|
|
||||||
#ifdef HAVE_SYS_TYPES_H
|
|
||||||
#include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_ERRNO_H
|
|
||||||
#include <errno.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_UNISTD_H
|
|
||||||
#include <unistd.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "archive.h"
|
|
||||||
#include "archive_private.h"
|
|
||||||
|
|
||||||
/* Maximum amount of data to write at one time. */
|
|
||||||
#define MAX_WRITE (1024 * 1024)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This implementation minimizes copying of data and is sparse-file aware.
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
pad_to(struct archive *a, int fd, int can_lseek,
|
|
||||||
size_t nulls_size, const char *nulls,
|
|
||||||
int64_t target_offset, int64_t actual_offset)
|
|
||||||
{
|
|
||||||
size_t to_write;
|
|
||||||
ssize_t bytes_written;
|
|
||||||
|
|
||||||
if (can_lseek) {
|
|
||||||
actual_offset = lseek(fd,
|
|
||||||
target_offset - actual_offset, SEEK_CUR);
|
|
||||||
if (actual_offset != target_offset) {
|
|
||||||
archive_set_error(a, errno, "Seek error");
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
return (ARCHIVE_OK);
|
|
||||||
}
|
|
||||||
while (target_offset > actual_offset) {
|
|
||||||
to_write = nulls_size;
|
|
||||||
if (target_offset < actual_offset + (int64_t)nulls_size)
|
|
||||||
to_write = (size_t)(target_offset - actual_offset);
|
|
||||||
bytes_written = write(fd, nulls, to_write);
|
|
||||||
if (bytes_written < 0) {
|
|
||||||
archive_set_error(a, errno, "Write error");
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
actual_offset += bytes_written;
|
|
||||||
}
|
|
||||||
return (ARCHIVE_OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
archive_read_data_into_fd(struct archive *a, int fd)
|
|
||||||
{
|
|
||||||
struct stat st;
|
|
||||||
int r, r2;
|
|
||||||
const void *buff;
|
|
||||||
size_t size, bytes_to_write;
|
|
||||||
ssize_t bytes_written;
|
|
||||||
int64_t target_offset;
|
|
||||||
int64_t actual_offset = 0;
|
|
||||||
int can_lseek;
|
|
||||||
char *nulls = NULL;
|
|
||||||
size_t nulls_size = 16384;
|
|
||||||
|
|
||||||
archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA,
|
|
||||||
"archive_read_data_into_fd");
|
|
||||||
|
|
||||||
can_lseek = (fstat(fd, &st) == 0) && S_ISREG(st.st_mode);
|
|
||||||
if (!can_lseek)
|
|
||||||
nulls = calloc(1, nulls_size);
|
|
||||||
|
|
||||||
while ((r = archive_read_data_block(a, &buff, &size, &target_offset)) ==
|
|
||||||
ARCHIVE_OK) {
|
|
||||||
const char *p = buff;
|
|
||||||
if (target_offset > actual_offset) {
|
|
||||||
r = pad_to(a, fd, can_lseek, nulls_size, nulls,
|
|
||||||
target_offset, actual_offset);
|
|
||||||
if (r != ARCHIVE_OK)
|
|
||||||
break;
|
|
||||||
actual_offset = target_offset;
|
|
||||||
}
|
|
||||||
while (size > 0) {
|
|
||||||
bytes_to_write = size;
|
|
||||||
if (bytes_to_write > MAX_WRITE)
|
|
||||||
bytes_to_write = MAX_WRITE;
|
|
||||||
bytes_written = write(fd, p, bytes_to_write);
|
|
||||||
if (bytes_written < 0) {
|
|
||||||
archive_set_error(a, errno, "Write error");
|
|
||||||
r = ARCHIVE_FATAL;
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
actual_offset += bytes_written;
|
|
||||||
p += bytes_written;
|
|
||||||
size -= bytes_written;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (r == ARCHIVE_EOF && target_offset > actual_offset) {
|
|
||||||
r2 = pad_to(a, fd, can_lseek, nulls_size, nulls,
|
|
||||||
target_offset, actual_offset);
|
|
||||||
if (r2 != ARCHIVE_OK)
|
|
||||||
r = r2;
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup:
|
|
||||||
free(nulls);
|
|
||||||
if (r != ARCHIVE_EOF)
|
|
||||||
return (r);
|
|
||||||
return (ARCHIVE_OK);
|
|
||||||
}
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -1,92 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2009 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer
|
|
||||||
* in this position and unchanged.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*
|
|
||||||
* $FreeBSD: head/lib/libarchive/archive_read_disk_private.h 201105 2009-12-28 03:20:54Z kientzle $
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __LIBARCHIVE_BUILD
|
|
||||||
#error This header is only to be used internally to libarchive.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARCHIVE_READ_DISK_PRIVATE_H_INCLUDED
|
|
||||||
#define ARCHIVE_READ_DISK_PRIVATE_H_INCLUDED
|
|
||||||
|
|
||||||
struct tree;
|
|
||||||
struct archive_entry;
|
|
||||||
|
|
||||||
struct archive_read_disk {
|
|
||||||
struct archive archive;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Symlink mode is one of 'L'ogical, 'P'hysical, or 'H'ybrid,
|
|
||||||
* following an old BSD convention. 'L' follows all symlinks,
|
|
||||||
* 'P' follows none, 'H' follows symlinks only for the first
|
|
||||||
* item.
|
|
||||||
*/
|
|
||||||
char symlink_mode;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Since symlink interaction changes, we need to track whether
|
|
||||||
* we're following symlinks for the current item. 'L' mode above
|
|
||||||
* sets this true, 'P' sets it false, 'H' changes it as we traverse.
|
|
||||||
*/
|
|
||||||
char follow_symlinks; /* Either 'L' or 'P'. */
|
|
||||||
|
|
||||||
/* Directory traversals. */
|
|
||||||
struct tree *tree;
|
|
||||||
int (*open_on_current_dir)(struct tree*, const char *, int);
|
|
||||||
int (*tree_current_dir_fd)(struct tree*);
|
|
||||||
int (*tree_enter_working_dir)(struct tree*);
|
|
||||||
|
|
||||||
/* Set 1 if users request to restore atime . */
|
|
||||||
int restore_time;
|
|
||||||
/* Set 1 if users request to honor nodump flag . */
|
|
||||||
int honor_nodump;
|
|
||||||
/* Set 1 if users request to enable mac copyfile. */
|
|
||||||
int enable_copyfile;
|
|
||||||
/* Set 1 if users request to traverse mount points. */
|
|
||||||
int traverse_mount_points;
|
|
||||||
|
|
||||||
const char * (*lookup_gname)(void *private, int64_t gid);
|
|
||||||
void (*cleanup_gname)(void *private);
|
|
||||||
void *lookup_gname_data;
|
|
||||||
const char * (*lookup_uname)(void *private, int64_t uid);
|
|
||||||
void (*cleanup_uname)(void *private);
|
|
||||||
void *lookup_uname_data;
|
|
||||||
|
|
||||||
int (*metadata_filter_func)(struct archive *, void *,
|
|
||||||
struct archive_entry *);
|
|
||||||
void *metadata_filter_data;
|
|
||||||
|
|
||||||
/* ARCHIVE_MATCH object. */
|
|
||||||
struct archive *matching;
|
|
||||||
/* Callback function, this will be invoked when ARCHIVE_MATCH
|
|
||||||
* archive_match_*_excluded_ae return true. */
|
|
||||||
void (*excluded_cb_func)(struct archive *, void *,
|
|
||||||
struct archive_entry *);
|
|
||||||
void *excluded_cb_data;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,311 +0,0 @@
|
||||||
/*-
|
|
||||||
* Copyright (c) 2003-2007 Tim Kientzle
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "archive_platform.h"
|
|
||||||
__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_disk_set_standard_lookup.c 201109 2009-12-28 03:30:31Z kientzle $");
|
|
||||||
|
|
||||||
#ifdef HAVE_SYS_TYPES_H
|
|
||||||
#include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_ERRNO_H
|
|
||||||
#include <errno.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_GRP_H
|
|
||||||
#include <grp.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_PWD_H
|
|
||||||
#include <pwd.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_STDLIB_H
|
|
||||||
#include <stdlib.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_STRING_H
|
|
||||||
#include <string.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "archive.h"
|
|
||||||
|
|
||||||
#if defined(_WIN32) && !defined(__CYGWIN__)
|
|
||||||
int
|
|
||||||
archive_read_disk_set_standard_lookup(struct archive *a)
|
|
||||||
{
|
|
||||||
archive_set_error(a, -1, "Standard lookups not available on Windows");
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
#else /* ! (_WIN32 && !__CYGWIN__) */
|
|
||||||
#define name_cache_size 127
|
|
||||||
|
|
||||||
static const char * const NO_NAME = "(noname)";
|
|
||||||
|
|
||||||
struct name_cache {
|
|
||||||
struct archive *archive;
|
|
||||||
char *buff;
|
|
||||||
size_t buff_size;
|
|
||||||
int probes;
|
|
||||||
int hits;
|
|
||||||
size_t size;
|
|
||||||
struct {
|
|
||||||
id_t id;
|
|
||||||
const char *name;
|
|
||||||
} cache[name_cache_size];
|
|
||||||
};
|
|
||||||
|
|
||||||
static const char * lookup_gname(void *, int64_t);
|
|
||||||
static const char * lookup_uname(void *, int64_t);
|
|
||||||
static void cleanup(void *);
|
|
||||||
static const char * lookup_gname_helper(struct name_cache *, id_t gid);
|
|
||||||
static const char * lookup_uname_helper(struct name_cache *, id_t uid);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Installs functions that use getpwuid()/getgrgid()---along with
|
|
||||||
* a simple cache to accelerate such lookups---into the archive_read_disk
|
|
||||||
* object. This is in a separate file because getpwuid()/getgrgid()
|
|
||||||
* can pull in a LOT of library code (including NIS/LDAP functions, which
|
|
||||||
* pull in DNS resolveers, etc). This can easily top 500kB, which makes
|
|
||||||
* it inappropriate for some space-constrained applications.
|
|
||||||
*
|
|
||||||
* Applications that are size-sensitive may want to just use the
|
|
||||||
* real default functions (defined in archive_read_disk.c) that just
|
|
||||||
* use the uid/gid without the lookup. Or define your own custom functions
|
|
||||||
* if you prefer.
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
archive_read_disk_set_standard_lookup(struct archive *a)
|
|
||||||
{
|
|
||||||
struct name_cache *ucache = malloc(sizeof(struct name_cache));
|
|
||||||
struct name_cache *gcache = malloc(sizeof(struct name_cache));
|
|
||||||
|
|
||||||
if (ucache == NULL || gcache == NULL) {
|
|
||||||
archive_set_error(a, ENOMEM,
|
|
||||||
"Can't allocate uname/gname lookup cache");
|
|
||||||
free(ucache);
|
|
||||||
free(gcache);
|
|
||||||
return (ARCHIVE_FATAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
memset(ucache, 0, sizeof(*ucache));
|
|
||||||
ucache->archive = a;
|
|
||||||
ucache->size = name_cache_size;
|
|
||||||
memset(gcache, 0, sizeof(*gcache));
|
|
||||||
gcache->archive = a;
|
|
||||||
gcache->size = name_cache_size;
|
|
||||||
|
|
||||||
archive_read_disk_set_gname_lookup(a, gcache, lookup_gname, cleanup);
|
|
||||||
archive_read_disk_set_uname_lookup(a, ucache, lookup_uname, cleanup);
|
|
||||||
|
|
||||||
return (ARCHIVE_OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
cleanup(void *data)
|
|
||||||
{
|
|
||||||
struct name_cache *cache = (struct name_cache *)data;
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
if (cache != NULL) {
|
|
||||||
for (i = 0; i < cache->size; i++) {
|
|
||||||
if (cache->cache[i].name != NULL &&
|
|
||||||
cache->cache[i].name != NO_NAME)
|
|
||||||
free((void *)(uintptr_t)cache->cache[i].name);
|
|
||||||
}
|
|
||||||
free(cache->buff);
|
|
||||||
free(cache);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Lookup uid/gid from uname/gname, return NULL if no match.
|
|
||||||
*/
|
|
||||||
static const char *
|
|
||||||
lookup_name(struct name_cache *cache,
|
|
||||||
const char * (*lookup_fn)(struct name_cache *, id_t), id_t id)
|
|
||||||
{
|
|
||||||
const char *name;
|
|
||||||
int slot;
|
|
||||||
|
|
||||||
|
|
||||||
cache->probes++;
|
|
||||||
|
|
||||||
slot = id % cache->size;
|
|
||||||
if (cache->cache[slot].name != NULL) {
|
|
||||||
if (cache->cache[slot].id == id) {
|
|
||||||
cache->hits++;
|
|
||||||
if (cache->cache[slot].name == NO_NAME)
|
|
||||||
return (NULL);
|
|
||||||
return (cache->cache[slot].name);
|
|
||||||
}
|
|
||||||
if (cache->cache[slot].name != NO_NAME)
|
|
||||||
free((void *)(uintptr_t)cache->cache[slot].name);
|
|
||||||
cache->cache[slot].name = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
name = (lookup_fn)(cache, id);
|
|
||||||
if (name == NULL) {
|
|
||||||
/* Cache and return the negative response. */
|
|
||||||
cache->cache[slot].name = NO_NAME;
|
|
||||||
cache->cache[slot].id = id;
|
|
||||||
return (NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
cache->cache[slot].name = name;
|
|
||||||
cache->cache[slot].id = id;
|
|
||||||
return (cache->cache[slot].name);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const char *
|
|
||||||
lookup_uname(void *data, int64_t uid)
|
|
||||||
{
|
|
||||||
struct name_cache *uname_cache = (struct name_cache *)data;
|
|
||||||
return (lookup_name(uname_cache,
|
|
||||||
&lookup_uname_helper, (id_t)uid));
|
|
||||||
}
|
|
||||||
|
|
||||||
#if HAVE_GETPWUID_R
|
|
||||||
static const char *
|
|
||||||
lookup_uname_helper(struct name_cache *cache, id_t id)
|
|
||||||
{
|
|
||||||
struct passwd pwent, *result;
|
|
||||||
char * nbuff;
|
|
||||||
size_t nbuff_size;
|
|
||||||
int r;
|
|
||||||
|
|
||||||
if (cache->buff_size == 0) {
|
|
||||||
cache->buff_size = 256;
|
|
||||||
cache->buff = malloc(cache->buff_size);
|
|
||||||
}
|
|
||||||
if (cache->buff == NULL)
|
|
||||||
return (NULL);
|
|
||||||
for (;;) {
|
|
||||||
result = &pwent; /* Old getpwuid_r ignores last arg. */
|
|
||||||
r = getpwuid_r((uid_t)id, &pwent,
|
|
||||||
cache->buff, cache->buff_size, &result);
|
|
||||||
if (r == 0)
|
|
||||||
break;
|
|
||||||
if (r != ERANGE)
|
|
||||||
break;
|
|
||||||
/* ERANGE means our buffer was too small, but POSIX
|
|
||||||
* doesn't tell us how big the buffer should be, so
|
|
||||||
* we just double it and try again. Because the buffer
|
|
||||||
* is kept around in the cache object, we shouldn't
|
|
||||||
* have to do this very often. */
|
|
||||||
nbuff_size = cache->buff_size * 2;
|
|
||||||
nbuff = realloc(cache->buff, nbuff_size);
|
|
||||||
if (nbuff == NULL)
|
|
||||||
break;
|
|
||||||
cache->buff = nbuff;
|
|
||||||
cache->buff_size = nbuff_size;
|
|
||||||
}
|
|
||||||
if (r != 0) {
|
|
||||||
archive_set_error(cache->archive, errno,
|
|
||||||
"Can't lookup user for id %d", (int)id);
|
|
||||||
return (NULL);
|
|
||||||
}
|
|
||||||
if (result == NULL)
|
|
||||||
return (NULL);
|
|
||||||
|
|
||||||
return strdup(result->pw_name);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
static const char *
|
|
||||||
lookup_uname_helper(struct name_cache *cache, id_t id)
|
|
||||||
{
|
|
||||||
struct passwd *result;
|
|
||||||
|
|
||||||
result = getpwuid((uid_t)id);
|
|
||||||
|
|
||||||
if (result == NULL)
|
|
||||||
return (NULL);
|
|
||||||
|
|
||||||
return strdup(result->pw_name);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static const char *
|
|
||||||
lookup_gname(void *data, int64_t gid)
|
|
||||||
{
|
|
||||||
struct name_cache *gname_cache = (struct name_cache *)data;
|
|
||||||
return (lookup_name(gname_cache,
|
|
||||||
&lookup_gname_helper, (id_t)gid));
|
|
||||||
}
|
|
||||||
|
|
||||||
#if HAVE_GETGRGID_R
|
|
||||||
static const char *
|
|
||||||
lookup_gname_helper(struct name_cache *cache, id_t id)
|
|
||||||
{
|
|
||||||
struct group grent, *result;
|
|
||||||
char * nbuff;
|
|
||||||
size_t nbuff_size;
|
|
||||||
int r;
|
|
||||||
|
|
||||||
if (cache->buff_size == 0) {
|
|
||||||
cache->buff_size = 256;
|
|
||||||
cache->buff = malloc(cache->buff_size);
|
|
||||||
}
|
|
||||||
if (cache->buff == NULL)
|
|
||||||
return (NULL);
|
|
||||||
for (;;) {
|
|
||||||
result = &grent; /* Old getgrgid_r ignores last arg. */
|
|
||||||
r = getgrgid_r((gid_t)id, &grent,
|
|
||||||
cache->buff, cache->buff_size, &result);
|
|
||||||
if (r == 0)
|
|
||||||
break;
|
|
||||||
if (r != ERANGE)
|
|
||||||
break;
|
|
||||||
/* ERANGE means our buffer was too small, but POSIX
|
|
||||||
* doesn't tell us how big the buffer should be, so
|
|
||||||
* we just double it and try again. */
|
|
||||||
nbuff_size = cache->buff_size * 2;
|
|
||||||
nbuff = realloc(cache->buff, nbuff_size);
|
|
||||||
if (nbuff == NULL)
|
|
||||||
break;
|
|
||||||
cache->buff = nbuff;
|
|
||||||
cache->buff_size = nbuff_size;
|
|
||||||
}
|
|
||||||
if (r != 0) {
|
|
||||||
archive_set_error(cache->archive, errno,
|
|
||||||
"Can't lookup group for id %d", (int)id);
|
|
||||||
return (NULL);
|
|
||||||
}
|
|
||||||
if (result == NULL)
|
|
||||||
return (NULL);
|
|
||||||
|
|
||||||
return strdup(result->gr_name);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
static const char *
|
|
||||||
lookup_gname_helper(struct name_cache *cache, id_t id)
|
|
||||||
{
|
|
||||||
struct group *result;
|
|
||||||
|
|
||||||
result = getgrgid((gid_t)id);
|
|
||||||
|
|
||||||
if (result == NULL)
|
|
||||||
return (NULL);
|
|
||||||
|
|
||||||
return strdup(result->gr_name);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* ! (_WIN32 && !__CYGWIN__) */
|
|
File diff suppressed because it is too large
Load diff
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue