summaryrefslogtreecommitdiff
path: root/apt-inst
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 15:51:45 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-01-26 15:51:45 +0100
commit51f9f4d78deabf54dbbb6881139d2b1a319ffbfc (patch)
tree60a2bcd8911acd5c4ab8b4558bfd30344b673ff5 /apt-inst
parent76fe5db7153957f8fda437e3bd614312b076f19e (diff)
parentc1f168f54be5b4babeb9b91cd7145441ea2489ad (diff)
merge from the mvo branch
Diffstat (limited to 'apt-inst')
-rw-r--r--apt-inst/contrib/arfile.cc6
-rw-r--r--apt-inst/makefile4
2 files changed, 6 insertions, 4 deletions
diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index a1fb97b48..8018f4d30 100644
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -87,7 +87,7 @@ bool ARArchive::LoadHeaders()
StrToNum(Head.Size,Memb->Size,sizeof(Head.Size)) == false)
{
delete Memb;
- return _error->Error(_("Invalid archive member header"));
+ return _error->Error(_("Invalid archive member header %s"), Head.Name);
}
// Check for an extra long name string
@@ -96,7 +96,7 @@ bool ARArchive::LoadHeaders()
char S[300];
unsigned long Len;
if (StrToNum(Head.Name+3,Len,sizeof(Head.Size)-3) == false ||
- Len >= strlen(S))
+ Len >= sizeof(S))
{
delete Memb;
return _error->Error(_("Invalid archive member header"));
@@ -111,7 +111,7 @@ bool ARArchive::LoadHeaders()
else
{
unsigned int I = sizeof(Head.Name) - 1;
- for (; Head.Name[I] == ' '; I--);
+ for (; Head.Name[I] == ' ' || Head.Name[I] == '/'; I--);
Memb->Name = string(Head.Name,I+1);
}
diff --git a/apt-inst/makefile b/apt-inst/makefile
index cc61841b9..abc8c3fd9 100644
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -9,9 +9,11 @@ HEADER_TARGETDIRS = apt-pkg
# Bring in the default rules
include ../buildlib/defaults.mak
+# The library name and version (indirectly used from init.h)
+include ../buildlib/libversion.mak
+
# The library name
LIBRARY=apt-inst
-LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
MAJOR=1.1
MINOR=0
SLIBS=$(PTHREADLIB) -lapt-pkg