Packaging library

Apply differences with 7zip codes of TOTA pacakge and
packaging codes of 7zip to library
which is required in TOTA packages.

Change-Id: I1590eacb76665abb180010faca0cc113d471c4f0
Signed-off-by: Sunmin Lee <sunm.lee@samsung.com>

diff --git a/C/7zDec.c b/C/7zDec.c
index 3386807..a79ed5b 100755 (executable)
--- a/C/7zDec.c
+++ b/C/7zDec.c
@@ -3,7 +3,7 @@
 \r
 #include <string.h>\r
 \r
-/* #define _7ZIP_PPMD_SUPPPORT */\r
+#define _7ZIP_PPMD_SUPPPORT\r
 \r
 #include "7z.h"\r
 \r

diff --git a/C/7zDecomp.c b/C/7zDecomp.c
new file mode 100755 (executable)
index 0000000..a270c89
--- /dev/null
+++ b/C/7zDecomp.c
@@ -0,0 +1,464 @@
+/* 7zMain.c - Test application for 7z Decoder\r
+2010-10-28 : Igor Pavlov : Public domain */\r
+\r
+#include <stdio.h>\r
+#include <string.h>\r
+\r
+#include "7z.h"\r
+#include "7zAlloc.h"\r
+#include "7zCrc.h"\r
+#include "7zFile.h"\r
+#include "7zVersion.h"\r
+\r
+#ifndef USE_WINDOWS_FILE\r
+/* for mkdir */\r
+#ifdef _WIN32\r
+#include <direct.h>\r
+#else\r
+#include <sys/stat.h>\r
+#include <errno.h>\r
+#endif\r
+#endif\r
+\r
+static ISzAlloc g_Alloc = { SzAlloc, SzFree };\r
+\r
+static int Buf_EnsureSize(CBuf *dest, size_t size)\r
+{\r
+  if (dest->size >= size)\r
+    return 1;\r
+  Buf_Free(dest, &g_Alloc);\r
+  return Buf_Create(dest, size, &g_Alloc);\r
+}\r
+\r
+#ifndef _WIN32\r
+\r
+static Byte kUtf8Limits[5] = { 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };\r
+\r
+static Bool Utf16_To_Utf8(Byte *dest, size_t *destLen, const UInt16 *src, size_t srcLen)\r
+{\r
+  size_t destPos = 0, srcPos = 0;\r
+  for (;;)\r
+  {\r
+    unsigned numAdds;\r
+    UInt32 value;\r
+    if (srcPos == srcLen)\r
+    {\r
+      *destLen = destPos;\r
+      return True;\r
+    }\r
+    value = src[srcPos++];\r
+    if (value < 0x80)\r
+    {\r
+      if (dest)\r
+        dest[destPos] = (char)value;\r
+      destPos++;\r
+      continue;\r
+    }\r
+    if (value >= 0xD800 && value < 0xE000)\r
+    {\r
+      UInt32 c2;\r
+      if (value >= 0xDC00 || srcPos == srcLen)\r
+        break;\r
+      c2 = src[srcPos++];\r
+      if (c2 < 0xDC00 || c2 >= 0xE000)\r
+        break;\r
+      value = (((value - 0xD800) << 10) | (c2 - 0xDC00)) + 0x10000;\r
+    }\r
+    for (numAdds = 1; numAdds < 5; numAdds++)\r
+      if (value < (((UInt32)1) << (numAdds * 5 + 6)))\r
+        break;\r
+    if (dest)\r
+      dest[destPos] = (char)(kUtf8Limits[numAdds - 1] + (value >> (6 * numAdds)));\r
+    destPos++;\r
+    do\r
+    {\r
+      numAdds--;\r
+      if (dest)\r
+        dest[destPos] = (char)(0x80 + ((value >> (6 * numAdds)) & 0x3F));\r
+      destPos++;\r
+    }\r
+    while (numAdds != 0);\r
+  }\r
+  *destLen = destPos;\r
+  return False;\r
+}\r
+\r
+static SRes Utf16_To_Utf8Buf(CBuf *dest, const UInt16 *src, size_t srcLen)\r
+{\r
+  size_t destLen = 0;\r
+  Bool res;\r
+  Utf16_To_Utf8(NULL, &destLen, src, srcLen);\r
+  destLen += 1;\r
+  if (!Buf_EnsureSize(dest, destLen))\r
+    return SZ_ERROR_MEM;\r
+  res = Utf16_To_Utf8(dest->data, &destLen, src, srcLen);\r
+  dest->data[destLen] = 0;\r
+  return res ? SZ_OK : SZ_ERROR_FAIL;\r
+}\r
+#endif\r
+\r
+static SRes Utf16_To_Char(CBuf *buf, const UInt16 *s, int fileMode)\r
+{\r
+  int len = 0;\r
+  for (len = 0; s[len] != '\0'; len++);\r
+\r
+  #ifdef _WIN32\r
+  {\r
+    int size = len * 3 + 100;\r
+    if (!Buf_EnsureSize(buf, size))\r
+      return SZ_ERROR_MEM;\r
+    {\r
+      char defaultChar = '_';\r
+      BOOL defUsed;\r
+      int numChars = WideCharToMultiByte(fileMode ?\r
+          (\r
+          #ifdef UNDER_CE\r
+          CP_ACP\r
+          #else\r
+          AreFileApisANSI() ? CP_ACP : CP_OEMCP\r
+          #endif\r
+          ) : CP_OEMCP,\r
+          0, s, len, (char *)buf->data, size, &defaultChar, &defUsed);\r
+      if (numChars == 0 || numChars >= size)\r
+        return SZ_ERROR_FAIL;\r
+      buf->data[numChars] = 0;\r
+      return SZ_OK;\r
+    }\r
+  }\r
+  #else\r
+  fileMode = fileMode;\r
+  return Utf16_To_Utf8Buf(buf, s, len);\r
+  #endif\r
+}\r
+\r
+static WRes MyCreateDir(const UInt16 *name)\r
+{\r
+  #ifdef USE_WINDOWS_FILE\r
+  \r
+  return CreateDirectoryW(name, NULL) ? 0 : GetLastError();\r
+  \r
+  #else\r
+\r
+  CBuf buf;\r
+  WRes res;\r
+  Buf_Init(&buf);\r
+  RINOK(Utf16_To_Char(&buf, name, 1));\r
+\r
+  res =\r
+  #ifdef _WIN32\r
+  _mkdir((const char *)buf.data)\r
+  #else\r
+  mkdir((const char *)buf.data, 0755)\r
+  #endif\r
+  == 0 ? 0 : errno;\r
+  Buf_Free(&buf, &g_Alloc);\r
+  return res;\r
+  \r
+  #endif\r
+}\r
+\r
+static WRes OutFile_OpenUtf16(CSzFile *p, const UInt16 *name)\r
+{\r
+  #ifdef USE_WINDOWS_FILE\r
+  return OutFile_OpenW(p, name);\r
+  #else\r
+  CBuf buf;\r
+  WRes res;\r
+  Buf_Init(&buf);\r
+  RINOK(Utf16_To_Char(&buf, name, 1));\r
+  res = OutFile_Open(p, (const char *)buf.data);\r
+  Buf_Free(&buf, &g_Alloc);\r
+  return res;\r
+  #endif\r
+}\r
+\r
+static SRes PrintString(const UInt16 *s)\r
+{\r
+  CBuf buf;\r
+  SRes res;\r
+  Buf_Init(&buf);\r
+  res = Utf16_To_Char(&buf, s, 0);\r
+  if (res != SZ_OK)\r
+    printf("[%s]\n",(const char *)buf.data);\r
+  Buf_Free(&buf, &g_Alloc);\r
+  return res;\r
+}\r
+\r
+static void UInt64ToStr(UInt64 value, char *s)\r
+{\r
+  char temp[32];\r
+  int pos = 0;\r
+  do\r
+  {\r
+    temp[pos++] = (char)('0' + (unsigned)(value % 10));\r
+    value /= 10;\r
+  }\r
+  while (value != 0);\r
+  do\r
+    *s++ = temp[--pos];\r
+  while (pos);\r
+  *s = '\0';\r
+}\r
+\r
+static char *UIntToStr(char *s, unsigned value, int numDigits)\r
+{\r
+  char temp[16];\r
+  int pos = 0;\r
+  do\r
+    temp[pos++] = (char)('0' + (value % 10));\r
+  while (value /= 10);\r
+  for (numDigits -= pos; numDigits > 0; numDigits--)\r
+    *s++ = '0';\r
+  do\r
+    *s++ = temp[--pos];\r
+  while (pos);\r
+  *s = '\0';\r
+  return s;\r
+}\r
+\r
+#define PERIOD_4 (4 * 365 + 1)\r
+#define PERIOD_100 (PERIOD_4 * 25 - 1)\r
+#define PERIOD_400 (PERIOD_100 * 4 + 1)\r
+\r
+static void ConvertFileTimeToString(const CNtfsFileTime *ft, char *s)\r
+{\r
+  unsigned year, mon, day, hour, min, sec;\r
+  UInt64 v64 = (ft->Low | ((UInt64)ft->High << 32)) / 10000000;\r
+  Byte ms[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };\r
+  unsigned t;\r
+  UInt32 v;\r
+  sec = (unsigned)(v64 % 60); v64 /= 60;\r
+  min = (unsigned)(v64 % 60); v64 /= 60;\r
+  hour = (unsigned)(v64 % 24); v64 /= 24;\r
+\r
+  v = (UInt32)v64;\r
+\r
+  year = (unsigned)(1601 + v / PERIOD_400 * 400);\r
+  v %= PERIOD_400;\r
+\r
+  t = v / PERIOD_100; if (t ==  4) t =  3; year += t * 100; v -= t * PERIOD_100;\r
+  t = v / PERIOD_4;   if (t == 25) t = 24; year += t * 4;   v -= t * PERIOD_4;\r
+  t = v / 365;        if (t ==  4) t =  3; year += t;       v -= t * 365;\r
+\r
+  if (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0))\r
+    ms[1] = 29;\r
+  for (mon = 1; mon <= 12; mon++)\r
+  {\r
+    unsigned s = ms[mon - 1];\r
+    if (v < s)\r
+      break;\r
+    v -= s;\r
+  }\r
+  day = (unsigned)v + 1;\r
+  s = UIntToStr(s, year, 4); *s++ = '-';\r
+  s = UIntToStr(s, mon, 2);  *s++ = '-';\r
+  s = UIntToStr(s, day, 2);  *s++ = ' ';\r
+  s = UIntToStr(s, hour, 2); *s++ = ':';\r
+  s = UIntToStr(s, min, 2);  *s++ = ':';\r
+  s = UIntToStr(s, sec, 2);\r
+}\r
+\r
+void PrintError(char *sz)\r
+{\r
+  printf("\nERROR: %s\n", sz);\r
+}\r
+\r
+static void GetAttribString(UInt32 Bool, Byte isDir, char *s)\r
+{\r
+  s[0] = '\0';\r
+}\r
+\r
+int  _7zdecompress(char *path)\r
+{\r
+  CFileInStream archiveStream;\r
+  CLookToRead lookStream;\r
+  CSzArEx db;\r
+  SRes res;\r
+  ISzAlloc allocImp;\r
+  ISzAlloc allocTempImp;\r
+  UInt16 *temp = NULL;\r
+  size_t tempSize = 0;\r
+\r
+\r
+  allocImp.Alloc = SzAlloc;\r
+  allocImp.Free = SzFree;\r
+\r
+  allocTempImp.Alloc = SzAllocTemp;\r
+  allocTempImp.Free = SzFreeTemp;\r
+\r
+  if (InFile_Open(&archiveStream.file, path))\r
+  {\r
+    PrintError("can not open input file");\r
+    return 1;\r
+  }\r
+\r
+  FileInStream_CreateVTable(&archiveStream);\r
+  LookToRead_CreateVTable(&lookStream, False);\r
+  \r
+  lookStream.realStream = &archiveStream.s;\r
+  LookToRead_Init(&lookStream);\r
+\r
+  CrcGenerateTable();\r
+\r
+  SzArEx_Init(&db);\r
+  res = SzArEx_Open(&db, &lookStream.s, &allocImp, &allocTempImp);\r
+  if (res == SZ_OK)\r
+  {\r
+    int listCommand = 0, testCommand = 0, fullPaths = 0;\r
+\r
+    fullPaths = 1;\r
+    if (res == SZ_OK)\r
+    {\r
+      UInt32 i;\r
+\r
+      /*\r
+      if you need cache, use these 3 variables.\r
+      if you use external function, you can make these variable as static.\r
+      */\r
+      UInt32 blockIndex = 0xFFFFFFFF; /* it can have any value before first call (if outBuffer = 0) */\r
+      Byte *outBuffer = 0; /* it must be 0 before first call for each new archive. */\r
+      size_t outBufferSize = 0;  /* it can have any value before first call (if outBuffer = 0) */\r
+\r
+      for (i = 0; i < db.db.NumFiles; i++)\r
+      {\r
+        size_t offset = 0;\r
+        size_t outSizeProcessed = 0;\r
+        const CSzFileItem *f = db.db.Files + i;\r
+        size_t len;\r
+        if (listCommand == 0 && f->IsDir && !fullPaths)\r
+          continue;\r
+        len = SzArEx_GetFileNameUtf16(&db, i, NULL);\r
+\r
+        if (len > tempSize)\r
+        {\r
+          SzFree(NULL, temp);\r
+          tempSize = len;\r
+          temp = (UInt16 *)SzAlloc(NULL, tempSize * sizeof(temp[0]));\r
+          if (temp == 0)\r
+          {\r
+            res = SZ_ERROR_MEM;\r
+            break;\r
+          }\r
+        }\r
+\r
+        SzArEx_GetFileNameUtf16(&db, i, temp);\r
+        if (listCommand)\r
+        {\r
+          char attr[8], s[32], t[32];\r
+\r
+          GetAttribString(f->AttribDefined ? f->Attrib : 0, f->IsDir, attr);\r
+\r
+          UInt64ToStr(f->Size, s);\r
+          if (f->MTimeDefined)\r
+            ConvertFileTimeToString(&f->MTime, t);\r
+          else\r
+          {\r
+            size_t j;\r
+            for (j = 0; j < 19; j++)\r
+              t[j] = ' ';\r
+            t[j] = '\0';\r
+          }\r
+          \r
+          printf("%s %s %10s  ", t, attr, s);\r
+          res = PrintString(temp);\r
+          if (res != SZ_OK)\r
+            break;\r
+          if (f->IsDir)\r
+            printf("/");\r
+          printf("\n");\r
+          continue;\r
+        }\r
+        fputs(testCommand ?\r
+            "Testing    ":\r
+            "Extracting ",\r
+            stdout);\r
+        res = PrintString(temp);\r
+        if (res != SZ_OK)\r
+          break;\r
+        if (f->IsDir)\r
+          printf("/");\r
+        else\r
+        {\r
+          res = SzArEx_Extract(&db, &lookStream.s, i,\r
+              &blockIndex, &outBuffer, &outBufferSize,\r
+              &offset, &outSizeProcessed,\r
+              &allocImp, &allocTempImp);\r
+          if (res != SZ_OK)\r
+            break;\r
+        }\r
+        if (!testCommand)\r
+        {\r
+          CSzFile outFile;\r
+          size_t processedSize;\r
+          size_t j;\r
+          UInt16 *name = (UInt16 *)temp;\r
+          const UInt16 *destPath = (const UInt16 *)name;\r
+          for (j = 0; name[j] != 0; j++)\r
+            if (name[j] == '/')\r
+            {\r
+              if (fullPaths)\r
+              {\r
+                name[j] = 0;\r
+                MyCreateDir(name);\r
+                name[j] = CHAR_PATH_SEPARATOR;\r
+              }\r
+              else\r
+                destPath = name + j + 1;\r
+            }\r
+          PrintString(destPath);\r
+          if (f->IsDir)\r
+          {\r
+            MyCreateDir(destPath);\r
+            printf("\n");\r
+            continue;\r
+          }\r
+          else if (OutFile_OpenUtf16(&outFile, destPath))\r
+          {\r
+            PrintError("can not open output file");\r
+            PrintString(destPath);\r
+            res = SZ_ERROR_FAIL;\r
+            break;\r
+          }\r
+          processedSize = outSizeProcessed;\r
+          if (File_Write(&outFile, outBuffer + offset, &processedSize) != 0 || processedSize != outSizeProcessed)\r
+          {\r
+            PrintError("can not write output file");\r
+            File_Close(&outFile);//wgid: 27067\r
+            res = SZ_ERROR_FAIL;\r
+            break;\r
+          }\r
+          if (File_Close(&outFile))\r
+          {\r
+            PrintError("can not close output file");\r
+            res = SZ_ERROR_FAIL;\r
+            break;\r
+          }\r
+          #ifdef USE_WINDOWS_FILE\r
+          if (f->AttribDefined)\r
+            SetFileAttributesW(destPath, f->Attrib);\r
+          #endif\r
+        }\r
+        printf("\n");\r
+      }\r
+      IAlloc_Free(&allocImp, outBuffer);\r
+    }\r
+  }\r
+  SzArEx_Free(&db, &allocImp);\r
+  SzFree(NULL, temp);\r
+\r
+  File_Close(&archiveStream.file);\r
+  if (res == SZ_OK)\r
+  {\r
+    printf("\nEverything is Ok\n");\r
+    return 0;\r
+  }\r
+  if (res == SZ_ERROR_UNSUPPORTED)\r
+    PrintError("decoder doesn't support this archive");\r
+  else if (res == SZ_ERROR_MEM)\r
+    PrintError("can not allocate memory");\r
+  else if (res == SZ_ERROR_CRC)\r
+    PrintError("CRC error");\r
+  else\r
+    printf("\nERROR #%d\n", res);\r
+  return 1;\r
+}\r

diff --git a/C/Lzma2Enc.c b/C/Lzma2Enc.c
index 35f6ed7..d52c70a 100755 (executable)
--- a/C/Lzma2Enc.c
+++ b/C/Lzma2Enc.c
@@ -4,11 +4,11 @@
 /* #include <stdio.h> */\r
 #include <string.h>\r
 \r
-/* #define _7ZIP_ST */\r
+ #define _7ZIP_ST\r
 \r
 #include "Lzma2Enc.h"\r
 \r
-#ifndef _7ZIP_ST\r
+#if 0//ndef _7ZIP_ST\r
 #include "MtCoder.h"\r
 #else\r
 #define NUM_MT_CODER_THREADS_MAX 1\r

diff --git a/C/LzmaEnc.c b/C/LzmaEnc.c
index 9e6dbdb..8dbf1ce 100755 (executable)
--- a/C/LzmaEnc.c
+++ b/C/LzmaEnc.c
@@ -2,7 +2,7 @@
 2010-04-16 : Igor Pavlov : Public domain */\r
 \r
 #include <string.h>\r
-\r
+#define _7ZIP_ST\r
 /* #define SHOW_STAT */\r
 /* #define SHOW_STAT2 */\r
 \r

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100755 (executable)
index 0000000..ca7e3e3
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,52 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(7zip C)
+
+SET(LIB7ZIP_SRCS
+       C/7zAlloc.c
+       C/7zBuf2.c
+       C/7zBuf.c
+       C/7zCrc.c
+       C/7zCrcOpt.c
+       C/7zDec.c
+       C/7zFile.c
+       C/7zIn.c
+       C/7zStream.c
+       C/7zDecomp.c
+       C/Alloc.c
+       C/Bcj2.c
+       C/Bra86.c
+       C/Bra.c
+       C/CpuArch.c
+       C/LzFind.c
+       C/Lzma2Dec.c
+       C/Lzma2Enc.c
+       C/LzmaDec.c
+       C/LzmaEnc.c
+       C/Ppmd7.c
+       C/Ppmd7Dec.c
+)
+
+SET(HEADERS
+       C/Types.h
+       C/Alloc.h
+       C/7zFile.h
+       C/7zVersion.h
+       C/LzmaDec.h
+       C/LzmaEnc.h
+)
+
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(EXEC_PREFIX "${PREFIX}/bin")
+SET(INCLUDEDIR "${PREFIX}/include/${PROJECT_NAME}")
+SET(VERSION 0.0.0)
+
+SET(LIBNAME "lib${PROJECT_NAME}")
+CONFIGURE_FILE(${LIBNAME}.pc.in ${LIBNAME}.pc @ONLY)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/C)
+INSTALL(FILES ${HEADERS} DESTINATION include/${PROJECT_NAME})
+
+ADD_LIBRARY(${PROJECT_NAME} SHARED ${LIB7ZIP_SRCS})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/lib7zip.pc.in b/lib7zip.pc.in
new file mode 100644 (file)
index 0000000..a0d2f69
--- /dev/null
+++ b/lib7zip.pc.in
@@ -0,0 +1,13 @@
+# Package Information for pkg-config
+
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDEDIR@
+
+Name: 7zip
+Description: 7zip library
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -l7zip
+Cflags: -I${includedir}

diff --git a/packaging/7zip.spec b/packaging/7zip.spec
new file mode 100644 (file)
index 0000000..894bcc1
--- /dev/null
+++ b/packaging/7zip.spec
@@ -0,0 +1,48 @@
+Name:          7zip
+Url:           http://www.7-zip.org/
+Summary:       7zip File Archiver
+Version:       9.20
+Release:       1
+Group:         System
+License:       LGPL-2.1+ and unRAR
+Source0:       %{name}-%{version}.tar.gz
+
+BuildRequires: cmake
+
+%description
+7-Zip is a file archiver with a high compression ratio.
+
+%package -n lib7zip
+Summary:       7zip library
+
+%description -n lib7zip
+7zip shared library package
+
+%package -n lib7zip-devel
+Summary:       7zip library for (devel)
+
+%description -n lib7zip-devel
+7zip library package for (devel)
+
+%prep
+%setup -q
+
+%build
+%cmake . \
+       -DCMAKE_INSTALL_PREFIX=%{_prefix}
+make %{?jobs:-j%jobs}
+
+%install
+rm -rf %{buildroot}
+%make_install
+
+%files -n lib7zip
+%license DOC/copying.txt
+%defattr(-,root,root,-)
+%{_libdir}/lib7zip.so.*
+
+%files -n lib7zip-devel
+%defattr(-,root,root,-)
+%{_includedir}/7zip/*.h
+%{_libdir}/lib7zip.so
+%{_libdir}/pkgconfig/lib7zip.pc