Revert "Apply smack new api"

This reverts commit f2597946f1ec4d4cbc852d691d2030b1afc8c780

Change-Id: I6d7862f68b97056fa1f2caecdaa31f13098528c7

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index 0374f2d..769cab1 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130627.1]"
+#define OSP_INSTALLER_VERSION "version=[20130625.1]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"
@@ -363,14 +363,4 @@ enum PrivilegeLevel
 
 };
 
-enum SmackDirType
-{
-       SMACK_DIR_TYPE_PRIVATE,
-       SMACK_DIR_TYPE_GROUP_RW,
-       SMACK_DIR_TYPE_PUBLIC_RO,
-       SMACK_DIR_TYPE_SETTINGS_RW,
-       SMACK_DIR_TYPE_ANY_LABEL,
-
-};
-
 #endif // _INSTALLER_DEFS_H_

diff --git a/src/Context/InstallationContext.cpp b/src/Context/InstallationContext.cpp
index 27b6bf8..621543a 100755 (executable)
--- a/src/Context/InstallationContext.cpp
+++ b/src/Context/InstallationContext.cpp
@@ -52,6 +52,7 @@ InstallationContext::InstallationContext(void)
 ,__isVerificationMode(false)
 ,__isUpdated(false)
 ,__isAppSetting(false)
+,__isAntiVirus(false)
 ,__isCsc(false)
 ,__isUninstallable(false)
 ,__isVirtualRoot(false)

diff --git a/src/Context/InstallationContext.h b/src/Context/InstallationContext.h
index 69bbc7f..16ab280 100755 (executable)
--- a/src/Context/InstallationContext.h
+++ b/src/Context/InstallationContext.h
@@ -100,6 +100,7 @@ public:
        bool __isVerificationMode;
        bool __isUpdated;
        bool __isAppSetting;
+       bool __isAntiVirus;
        bool __isCsc;
        bool __isUninstallable;
        bool __isVirtualRoot;

diff --git a/src/Manager/CompatibilityManager.cpp b/src/Manager/CompatibilityManager.cpp
index 521df03..e695c27 100755 (executable)
--- a/src/Manager/CompatibilityManager.cpp
+++ b/src/Manager/CompatibilityManager.cpp
@@ -225,7 +225,6 @@ CompatibilityManager::CleanDirectories(const String& rootPath, const PackageId&
 bool
 CompatibilityManager::LinkOspSharePath(const String& rootPath, const PackageId& packageId)
 {
-       int ret = 0;
        const char* pOspCompatSharedPath = "/opt/usr/share/.osp-compat/\0";
 
        std::unique_ptr<char[]> pRootPath(_StringConverter::CopyToCharArrayN(rootPath));
@@ -256,13 +255,8 @@ CompatibilityManager::LinkOspSharePath(const String& rootPath, const PackageId&
        unlink(ospSharePkgIdPath);
        unlink(ospShare2PkgIdPath);
 
-       SmackManager smackManager;
-
-       ret = symlink(ospAppSharePath, ospSharePkgIdPath);
-       smackManager.AddLabelDir(L"_", ospSharePkgIdPath);
-
-       ret = symlink(ospAppShare2Path, ospShare2PkgIdPath);
-       smackManager.AddLabelDir(L"_", ospShare2PkgIdPath);
+       InstallerUtil::CreateSymlink(ospAppSharePath, ospSharePkgIdPath);
+       InstallerUtil::CreateSymlink(ospAppShare2Path, ospShare2PkgIdPath);
 
        return true;
 }
@@ -298,7 +292,7 @@ CompatibilityManager::PrepareVirtualRoot(const Tizen::Base::String& rootPath, co
        res = CreateVirtualRootDirectories();
        TryCatch(res == true, , "CreateVirtualRootDirectories() failed.");
 
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(packageId, destPath);
 
        res = CreateSymbolicLink();
        TryCatch(res == true, , "CreateSymbolicLink() failed.");
@@ -444,7 +438,7 @@ CompatibilityManager::CreateOspInternalDirectories(const String& rootPath, const
        }
 
        SmackManager smackManager;
-       smackManager.SetupPath(packageId, L"./Storagecard", SMACK_DIR_TYPE_ANY_LABEL, L"_");
+       smackManager.AddLabelDir(L"_", L"./Storagecard");
 
        ospShareAppIdPath.Append(packageId);
 

diff --git a/src/Manager/PermissionManager.cpp b/src/Manager/PermissionManager.cpp
index adfb7bc..f956744 100755 (executable)
--- a/src/Manager/PermissionManager.cpp
+++ b/src/Manager/PermissionManager.cpp
@@ -66,7 +66,7 @@ PermissionManager::SetDirectory(InstallationContext* pContext)
        // appRoot
        // InstallerUtil::ChangeOwner(appRootPath);
        InstallerUtil::ChangeMode(appRootPath, PERM_BASE | PERM_EXECUTE);
-       smackManager.SetupPath(packageId, appRootPath, SMACK_DIR_TYPE_ANY_LABEL, L"_");
+       smackManager.AddLabelDir(packageId, appRootPath, true);
 
        if (pContext->__isPreloaded == true)
        {
@@ -74,28 +74,28 @@ PermissionManager::SetDirectory(InstallationContext* pContext)
                preloadedAppPath += L"/";
                preloadedAppPath += packageId;
 
-               smackManager.SetupPath(packageId, preloadedAppPath, SMACK_DIR_TYPE_ANY_LABEL, L"_");
+               smackManager.AddLabelDir(L"_", preloadedAppPath, true);
        }
 
        // appRoot/bin
        destPath = appRootPath + DIR_BIN;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE | PERM_EXECUTE, false);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/info
        destPath = appRootPath + DIR_INFO;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, false);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/res
        destPath = appRootPath + DIR_RES;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, false);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/lib
        destPath = appRootPath + DIR_LIB;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE | PERM_EXECUTE, false);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/shared
        destPath = appRootPath + DIR_SHARED;
@@ -105,6 +105,7 @@ PermissionManager::SetDirectory(InstallationContext* pContext)
                TryReturn(!IsFailed(r), INSTALLER_ERROR_INTERNAL_STATE, "Directory::Create() failed");
        }
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, false);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/shared/res
        destPath = appRootPath + DIR_SHARED_RES;
@@ -114,21 +115,22 @@ PermissionManager::SetDirectory(InstallationContext* pContext)
                InstallerUtil::CreateSymlink(iconPath, destPath);
        }
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, false);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/shared/data
        destPath = appRootPath + DIR_SHARED_DATA;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, true);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PUBLIC_RO);
+       smackManager.AddLabelSharedDir(packageId, destPath);
 
        // appRoot/shared/trusted
        destPath = appRootPath + DIR_SHARED_TRUSTED;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, true);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_GROUP_RW);
+       smackManager.AddLabelSharedDir(packageId, destPath);
 
        // appRoot/contents
        destPath = appRootPath + DIR_CONTENTS;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, false);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/setting
        destPath = appRootPath + DIR_SETTING;
@@ -137,6 +139,10 @@ PermissionManager::SetDirectory(InstallationContext* pContext)
                String appVersion = pContext->__version;
                String srcPath;
                String settingXmlPath;
+               String label = "*";
+               //String label = packageId;
+               //label.Append("_setting");
+
                srcPath = destPath + L"/setting." + appVersion + L".xml";
                settingXmlPath = destPath + L"/setting.xml";
 
@@ -144,7 +150,7 @@ PermissionManager::SetDirectory(InstallationContext* pContext)
                InstallerUtil::CreateSymlink(srcPath, settingXmlPath);
 
                InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE | PERM_WRITE, false);
-               smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_SETTINGS_RW);
+               smackManager.AddLabelDir(label, destPath);
        }
 
        // appRoot/data
@@ -155,7 +161,7 @@ PermissionManager::SetDirectory(InstallationContext* pContext)
                TryReturn(!IsFailed(r), false, "Directory::Create() failed");
        }
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, true);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(packageId, destPath);
 
        String apiVersion = pContext->__apiVersion;
 
@@ -228,7 +234,6 @@ PermissionManager::SetSymLink(InstallationContext* pContext)
        String appRootPath = pContext->__rootPath;
 
        SmackManager smackManager;
-       smackManager.Construct(pContext);
 
 #if 0
        oldPath = appRootPath + DIR_RES;
@@ -238,7 +243,7 @@ PermissionManager::SetSymLink(InstallationContext* pContext)
        newPath = appRootPath + L"/Res";
        std::unique_ptr< char[] > pResPath(_StringConverter::CopyToCharArrayN(newPath));
        int ret = symlink("./res", pResPath.get());
-       smackManager.SetupPath(pContext->__packageId, newPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(pContext->__packageId, newPath);
 #endif
 
 #if 0
@@ -249,7 +254,7 @@ PermissionManager::SetSymLink(InstallationContext* pContext)
        newPath = appRootPath + L"/Home";
        std::unique_ptr< char[] > pHomePath(_StringConverter::CopyToCharArrayN(newPath));
        ret = symlink("./data", pHomePath.get());
-       smackManager.SetupPath(pContext->__packageId, newPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(pContext->__packageId, newPath);
 #endif
 
        oldPath = appRootPath + DIR_RES + L"/screen-size-normal";
@@ -351,55 +356,57 @@ PermissionManager::ApplyPermissionForRds(InstallationContext* pContext)
 
        // appRoot
        InstallerUtil::ChangeMode(appRootPath, PERM_BASE | PERM_EXECUTE);
-       smackManager.SetupPath(packageId, appRootPath, SMACK_DIR_TYPE_ANY_LABEL, L"_");
+       smackManager.AddLabelDir(packageId, appRootPath, true);
 
        // appRoot/bin
        destPath = appRootPath + DIR_BIN;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE | PERM_EXECUTE, false);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/info
        destPath = appRootPath + DIR_INFO;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, false);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/res
        destPath = appRootPath + DIR_RES;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, false);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/lib
        destPath = appRootPath + DIR_LIB;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE | PERM_EXECUTE, false);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/shared
        destPath = appRootPath + DIR_SHARED;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, false);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/shared/res
        destPath = appRootPath + DIR_SHARED_RES;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, false);
+       smackManager.AddLabelSharedDir(packageId, destPath);
 
        // appRoot/shared/data
        destPath = appRootPath + DIR_SHARED_DATA;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, true);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PUBLIC_RO);
+       smackManager.AddLabelSharedDir(packageId, destPath);
 
        // appRoot/shared/trusted
        destPath = appRootPath + DIR_SHARED_TRUSTED;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, true);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_GROUP_RW);
+       smackManager.AddLabelSharedDir(packageId, destPath);
 
        // appRoot/setting
        destPath = appRootPath + DIR_SETTING;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE | PERM_WRITE, false);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_SETTINGS_RW);
+       smackManager.AddLabelDir(packageId, destPath);
 
        // appRoot/data
        destPath = appRootPath + DIR_DATA;
        InstallerUtil::ChangeDirectoryPermission(destPath, PERM_BASE, true);
-       smackManager.SetupPath(packageId, destPath, SMACK_DIR_TYPE_PRIVATE);
+       smackManager.AddLabelDir(packageId, destPath);
 
        return true;
 }

diff --git a/src/Manager/SmackManager.cpp b/src/Manager/SmackManager.cpp
index a79ffac..49f3619 100755 (executable)
--- a/src/Manager/SmackManager.cpp
+++ b/src/Manager/SmackManager.cpp
@@ -81,7 +81,11 @@ SmackManager::Install(const PackageId& packageId)
        TryReturn(pPackageId, false, "pPackageId is null.");
 
        res = Install(pPackageId.get());
-       TryReturn(res == 0, false, "Install() failed.");
+
+       if (__pContext->__isAntiVirus == true)
+       {
+               RegisterAv(pPackageId.get());
+       }
 
        return true;
 }
@@ -135,6 +139,14 @@ SmackManager::AddLabelDir(const String& label, const String& dirPath, bool rootD
        {
                res = AddLabelDir("_", pRealPath.get());
        }
+       else if ((realPath.Contains(L"/shared/data") == true) || (realPath.Contains(L"/shared/trusted") == true))
+       {
+               AddLabelSharedDir(L"", realPath);
+       }
+       else if (realPath.Contains(L"shared") == true)
+       {
+               res = AddLabelDir("*", pRealPath.get());
+       }
        else
        {
                std::unique_ptr<char[]> pPackageId(_StringConverter::CopyToCharArrayN(label));
@@ -146,7 +158,6 @@ SmackManager::AddLabelDir(const String& label, const String& dirPath, bool rootD
        return true;
 }
 
-#if 0
 bool
 SmackManager::AddLabelSharedDir(const PackageId& packageId, const String& dirPath)
 {
@@ -233,9 +244,7 @@ SmackManager::AddLabelSharedDir(const PackageId& packageId, const String& dirPat
 
        return true;
 }
-#endif
 
-#if 0
 bool
 SmackManager::AddSharedDirReaders(const String& label)
 {
@@ -330,7 +339,6 @@ CATCH:
 
        return res;
 }
-#endif
 
 bool
 SmackManager::AddFriend(const Tizen::App::PackageId& packageId1, const Tizen::App::PackageId& packageId2)
@@ -419,97 +427,6 @@ SmackManager::RevokePermissions(const PackageId& packageId)
 }
 
 bool
-SmackManager::SetupPath(const PackageId& packageId, const String& dirPath, SmackDirType type, const String& label)
-{
-       int res = 0;
-       String realPath;
-
-       std::unique_ptr<char[]> pPackageId(_StringConverter::CopyToCharArrayN(packageId));
-       TryReturn(pPackageId, false, "pPackageId is null.");
-
-       std::unique_ptr<char[]> pPath(_StringConverter::CopyToCharArrayN(dirPath));
-       TryReturn(pPath, false, "pPath is null.");
-
-       if (InstallerUtil::IsSymlink(dirPath) == true)
-       {
-               res = SetupPath(pPackageId.get(), pPath.get(), (int) SMACK_DIR_TYPE_ANY_LABEL, "_");
-               InstallerUtil::GetRealPath(dirPath, realPath);
-       }
-       else
-       {
-               realPath = dirPath;
-       }
-
-       std::unique_ptr<char[]> pRealPath(_StringConverter::CopyToCharArrayN(realPath));
-       TryReturn(pRealPath, false, "pRealPath is null.");
-
-       if (type == SMACK_DIR_TYPE_GROUP_RW)
-       {
-               TryReturn(__pContext, false, "__pContext is null.");
-
-               String groupId;
-
-               if (__pContext->__isVerificationMode == true)
-               {
-                       Sha1Hash hash;
-                       String base64Value;
-                       result r = E_SUCCESS;
-
-                       IListT<String *>* pAuthorCertList = __pContext->__pAuthorCertList;
-                       TryReturn(pAuthorCertList, false, "pAuthorCertList is null.");
-
-                       String* pEntity = null;
-                       r = pAuthorCertList->GetAt(0, pEntity);
-                       TryReturn(!IsFailed(r), false, "pAuthorCertList->GetAt() is failed.");
-                       TryReturn(pEntity, false, "pEntity is null.");
-
-                       std::unique_ptr<ByteBuffer> pEncodedData(StringUtil::DecodeBase64StringN(*pEntity));
-                       TryReturn(pEncodedData, false, "pEncodedData is null.");
-
-                       std::unique_ptr<ByteBuffer> pHashValue(hash.GetHashN(*pEncodedData.get()));
-                       TryReturn(pHashValue, false, "pHashValue is null.");
-
-                       r = StringUtil::EncodeToBase64String(*pHashValue, base64Value);
-                       TryReturn(!IsFailed(r), false, "EncodeToBase64String() is failed.");
-
-                       // in smack, '/' is not allowed for label.
-                       r = base64Value.Replace(L"/", L"#");
-                       TryReturn(!IsFailed(r), false, "base64Value.Replace() is failed.");
-
-                       std::unique_ptr<char[]> pHashEncodedValue(_StringConverter::CopyToCharArrayN(base64Value));
-                       TryReturn(pHashEncodedValue, false, "pHashEncodedValue is null.");
-
-                       groupId = pHashEncodedValue.get();
-                       AppLog("pHashEncodedValue = [%s]", pHashEncodedValue.get());
-               }
-               else
-               {
-                       groupId = __pContext->__packageId;
-               }
-
-               std::unique_ptr<char[]> pGroupId(_StringConverter::CopyToCharArrayN(groupId));
-               TryReturn(pGroupId, false, "pGroupId is null.");
-
-               res = SetupPath(pPackageId.get(), pRealPath.get(), (int) type, pGroupId.get());
-       }
-       else if (type == SMACK_DIR_TYPE_ANY_LABEL)
-       {
-               TryReturn(label.IsEmpty() == false, false, "label is empty.");
-
-               std::unique_ptr<char[]> pAnyLabel(_StringConverter::CopyToCharArrayN(label));
-               TryReturn(pAnyLabel, false, "pAnyLabel is null.");
-
-               res = SetupPath(pPackageId.get(), pRealPath.get(), (int) type, pAnyLabel.get());
-       }
-       else
-       {
-               res = SetupPath(pPackageId.get(), pRealPath.get(), (int) type);
-       }
-
-       return true;
-}
-
-bool
 SmackManager::IsSmackEnable()
 {
        result r;
@@ -633,7 +550,6 @@ SmackManager::AddLabelDir(const char* pLabel, const char* pDirPath)
        return 0;
 }
 
-#if 0
 int
 SmackManager::AddLabelSharedDir(const char* pLabel, const char* pSharedLabel, const char* pDirPath)
 {
@@ -666,9 +582,7 @@ SmackManager::AddLabelSharedDir(const char* pLabel, const char* pSharedLabel, co
 
        return 0;
 }
-#endif
 
-#if 0
 int
 SmackManager::AddSharedDirReaders(const char* pSharedLabel, const char** ppAppList)
 {
@@ -701,7 +615,6 @@ SmackManager::AddSharedDirReaders(const char* pSharedLabel, const char** ppAppLi
 
        return 0;
 }
-#endif
 
 int
 SmackManager::AddFriend(const char* pPackageId1, const char* pPackageId2)
@@ -803,45 +716,37 @@ SmackManager::RevokePermissions(const char* pPackageId)
 }
 
 int
-SmackManager::SetupPath(const char* pPackageId, const char* pDirPath, int appPathType, const char* pGroupId)
+SmackManager::RegisterAv(const char* pPackageId)
 {
        int ret = 0;
        void* pHandle = null;
        char* pErrorMsg = null;
-       int (*app_setup_path)(const char*, const char*, int, ...) = null;
+       int (*app_register_av)(const char*) = null;
 
        pHandle = dlopen("libprivilege-control.so.0", RTLD_LAZY | RTLD_GLOBAL);
        if (!pHandle)
        {
-               AppLog("dlopen() failed. [%s]", dlerror());
+               AppLog("RegisterAv(): dlopen() failed. [%s]", dlerror());
                return -1;
        }
 
-       app_setup_path = reinterpret_cast <int (*)(const char*, const char*, int, ...)>(dlsym(pHandle, "app_setup_path"));
+       app_register_av = reinterpret_cast <int (*)(const char*)>(dlsym(pHandle, "app_register_av"));
        pErrorMsg = dlerror();
-       if ((pErrorMsg != null) || (app_setup_path == null))
+       if ((pErrorMsg != null) || (app_register_av == null))
        {
-               AppLog("dlsym() failed. [%s]", pErrorMsg);
+               AppLog("RegisterAv(): dlsym() failed. [%s]", pErrorMsg);
                dlclose(pHandle);
                return -1;
        }
 
-       if (pGroupId == null)
-       {
-               AppLog("[smack] app_setup_path(%s, %s, %d)", pPackageId, pDirPath, appPathType);
-               ret = app_setup_path(pPackageId, pDirPath, appPathType);
-               AppLog("[smack] app_setup_path(), result = [%d]", ret);
-       }
-       else
-       {
-               AppLog("[smack] app_setup_path(%s, %s, %d, %s)", pPackageId, pDirPath, appPathType, pGroupId);
-               ret = app_setup_path(pPackageId, pDirPath, appPathType, pGroupId);
-               AppLog("[smack] app_setup_path(), result = [%d]", ret);
-       }
+       AppLog("[smack] app_register_av(%s)", pPackageId);
+       ret = app_register_av(pPackageId);
+       AppLog("[smack] app_register_av(%s), result = [%d]", pPackageId, ret);
 
        dlclose(pHandle);
 
        return ret;
+
 }
 
 ArrayList*

diff --git a/src/Manager/SmackManager.h b/src/Manager/SmackManager.h
index 9009f3d..2a3f7e3 100755 (executable)
--- a/src/Manager/SmackManager.h
+++ b/src/Manager/SmackManager.h
@@ -38,15 +38,13 @@ public:
        bool Uninstall(const Tizen::App::PackageId& packageId);
 
        bool AddLabelDir(const Tizen::Base::String& label, const Tizen::Base::String& dirPath, bool rootDirectory = false);
-       //bool AddLabelSharedDir(const Tizen::App::PackageId& packageId, const Tizen::Base::String& dirPath);
-       //bool AddSharedDirReaders(const Tizen::Base::String& label);
+       bool AddLabelSharedDir(const Tizen::App::PackageId& packageId, const Tizen::Base::String& dirPath);
+       bool AddSharedDirReaders(const Tizen::Base::String& label);
        bool AddFriend(const Tizen::App::PackageId& packageId1, const Tizen::App::PackageId& packageId2);
 
        bool EnablePermissions(const Tizen::App::PackageId& packageId);
        bool RevokePermissions(const Tizen::App::PackageId& packageId);
 
-       bool SetupPath(const Tizen::App::PackageId& packageId, const Tizen::Base::String& dirPath, SmackDirType type, const Tizen::Base::String& label = L"");
-
 private:
        bool IsSmackEnable();
 
@@ -54,14 +52,14 @@ private:
        int Uninstall(const char* pPackageId);
 
        int AddLabelDir(const char* pLabel, const char* pDirPath);
-       //int AddLabelSharedDir(const char* pLabel, const char* pSharedLabel, const char* pDirPath);
-       //int AddSharedDirReaders(const char* pSharedLabel, const char** ppAppList);
+       int AddLabelSharedDir(const char* pLabel, const char* pSharedLabel, const char* pDirPath);
+       int AddSharedDirReaders(const char* pSharedLabel, const char** ppAppList);
        int AddFriend(const char* pPackageId1, const char* pPackageId2);
 
        int EnablePermissions(const char* pPackageId, int appType, const char** ppPermissions, bool persistent);
        int RevokePermissions(const char* pPackageId);
 
-       int SetupPath(const char* pPackageId, const char* pDirPath, int appPathType, const char* pGroupId = null);
+       int RegisterAv(const char* pPackageId);
 
        Tizen::Base::Collection::ArrayList* GetPreloadedAppListN() const;
 

diff --git a/src/Util/InstallerUtil.cpp b/src/Util/InstallerUtil.cpp
index 82df062..7be47c6 100755 (executable)
--- a/src/Util/InstallerUtil.cpp
+++ b/src/Util/InstallerUtil.cpp
@@ -259,7 +259,8 @@ InstallerUtil::CreateSymlink(const String& oldPath, const String& newPath)
        TryReturn(err == 0, false, "symlink() is failed(%s), oldpath=[%s], newpath=[%s]", strerror(errno), pOldPath.get(), pNewPath.get());
 
        SmackManager smackManager;
-       smackManager.AddLabelDir(L"_", newPath);
+       String label("_");
+       smackManager.AddLabelDir(label, newPath);
 
        AppLog("CreateSymlink(): [%ls] -> [%ls]", newPath.GetPointer(), oldPath.GetPointer());
 

diff --git a/src/XmlHandler/ManifestHandler.cpp b/src/XmlHandler/ManifestHandler.cpp
index e5966e0..34a4ef2 100755 (executable)
--- a/src/XmlHandler/ManifestHandler.cpp
+++ b/src/XmlHandler/ManifestHandler.cpp
@@ -1325,6 +1325,11 @@ ManifestHandler::OnCategoryValue(const char* pCharacters)
        {
                __pAppData->__feature = CATEGORY_TYPE_IME;
        }
+       else if (strcasecmp(pCharacters, TIZEN_CATEGORY_ANTIVIRUS) == 0)
+       {
+               AppLog("ANTIVIRUS Package is detected.");
+               __pContext->__isAntiVirus = true;
+       }
 
        return true;
 }