openharmony/startup_appspawn
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_appspawn synced 2024-11-27 01:00:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix api params error and code check

Browse Source
This commit is contained in:
王达 2024-03-30 10:20:23 +08:00
parent fc3c9f7ef8
commit 349f777444
4 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interfaces/innerkits/hnp/include/hnp_api.h
View File

@ -45,7 +45,7 @@ typedef enum {
*
* @return 0:success;other means failure.
*/
int NativeInstallHnp(const char *userId, const char *hnpPath, Bool isForce);
int NativeInstallHnp(const char *userId, const char *hnpPath, const char *packageName, Bool isForce);
/**
* Uninstall native software package.
@ -56,7 +56,7 @@ int NativeInstallHnp(const char *userId, const char *hnpPath, Bool isForce);
*
* @return 0:success;other means failure.
*/
int NativeUnInstallHnp(const char *userId, const char *hnpName, const char *hnpVersion);
int NativeUnInstallHnp(const char *userId, const char *hnpName, const char *hnpVersion, const char *packageName);
#ifdef __cplusplus
}

24
interfaces/innerkits/hnp/src/hnp_api.c
View File

@ -81,12 +81,12 @@ static int StartHnpProcess(char *const argv[], char *const apcEnv[])
return exitVal;
}
int NativeInstallHnp(const char *userId, const char *hnpPath, Bool isForce)
int NativeInstallHnp(const char *userId, const char *hnpPath, const char *packageName, Bool isForce)
{
char *argv[MAX_ARGV_NUM] = {0};
char *apcEnv[MAX_ENV_NUM] = {0};
if ((userId == NULL) || (hnpPath == NULL)) {
if ((userId == NULL) || (hnpPath == NULL))) {
return HNP_API_ERRNO_PARAM_INVALID;
}
@ -98,10 +98,20 @@ int NativeInstallHnp(const char *userId, const char *hnpPath, Bool isForce)
argv[HNP_INDEX_2] = (char*)userId;
argv[HNP_INDEX_3] = (char*)hnpPath;
if (packageName == NULL) {
argv[HNP_INDEX_4] = "null";
} else {
argv[HNP_INDEX_4] = (char*)packageName;
}
if (isForce == TRUE) {
argv[HNP_INDEX_5] = "-f";
}
return StartHnpProcess(argv, apcEnv);
}
int NativeUnInstallHnp(const char *userId, const char *hnpName, const char *hnpVersion)
int NativeUnInstallHnp(const char *userId, const char *hnpName, const char *hnpVersion, const char *packageName)
{
char *argv[MAX_ARGV_NUM] = {0};
char *apcEnv[MAX_ENV_NUM] = {0};
@ -118,7 +128,13 @@ int NativeUnInstallHnp(const char *userId, const char *hnpName, const char *hnpV
argv[HNP_INDEX_2] = (char*)userId;
argv[HNP_INDEX_3] = (char*)hnpName;
argv[HNP_INDEX_4] = (char*)hnpVersion;
if (packageName == NULL) {
argv[HNP_INDEX_5] = "null";
} else {
argv[HNP_INDEX_5] = (char*)packageName;
}
return StartHnpProcess(argv, apcEnv);
}

4
service/hnp/installer/src/hnp_installer.c
View File

@ -483,7 +483,7 @@ int HnpCmdInstall(int argc, char *argv[])
}
if (strcmp(argv[HNP_INDEX_4], "null") == 0) {
ret = sprintf_s(hnpDstPath.hnpBasePath, MAX_FILE_PATH_LEN, "%shnp_public/", dstPath);
ret = sprintf_s(hnpDstPath.hnpBasePath, MAX_FILE_PATH_LEN, "%shnppublic/", dstPath);
} else {
ret = sprintf_s(hnpDstPath.hnpBasePath, MAX_FILE_PATH_LEN, "%shnp/%s/", dstPath, argv[HNP_INDEX_4]);
}
@ -518,7 +518,7 @@ int HnpCmdUnInstall(int argc, char *argv[])
}
if (strcmp(argv[HNP_INDEX_5], "null") == 0) {
ret = sprintf_s(pathTmp, MAX_FILE_PATH_LEN, "hnp_public");
ret = sprintf_s(pathTmp, MAX_FILE_PATH_LEN, "hnppublic");
} else {
ret = sprintf_s(pathTmp, MAX_FILE_PATH_LEN, "hnp/%s", argv[HNP_INDEX_5]);
}

25
test/unittest/hnp_test/hnp_installer_test.cpp
View File

@ -97,7 +97,7 @@ void HnpPackWithoutBinDelete(void)
int ret;
ret = remove("hnp_out/sample.hnp");
EXPECT_EQ(ret, 0;)
EXPECT_EQ(ret, 0);
EXPECT_EQ(rmdir("hnp_sample"), 0);
EXPECT_EQ(rmdir("hnp_out"), 0);
}
@ -107,6 +107,7 @@ void HnpPackWithBin(void)
EXPECT_EQ(mkdir("hnp_sample", S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH), 0);
EXPECT_EQ(mkdir("hnp_sample/bin", S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH), 0);
FILE *fp = fopen("hnp_sample/bin/out", "wb");
EXPECT_NE(fp, nullptr);
(void)fclose(fp);
EXPECT_EQ(mkdir("hnp_out", S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH), 0);
char arg1[] = "hnpcli";
@ -163,9 +164,8 @@ void HnpPackWithCfg(void)
"{\"links\":[{\"source\":\"bin/out\",\"target\":\"outt\"},{\"source\":\"bin/out2\","
"\"target\":\"out2\"}]}}";
fp = fopen("./hnp.cfg", "w");
int whiteLen = (int)fwrite(cfg, sizeof(char), strlen(cfg) + 1, fp);
EXPECT_EQ(fwrite(cfg, sizeof(char), strlen(cfg) + 1, fp), strlen(cfg) + 1);
(void)fclose(fp);
EXPECT_EQ(whiteLen, strlen(cfg) + 1);
EXPECT_EQ(HnpCmdPack(argc, argv), 0);
}
@ -180,7 +180,8 @@ void HnpPackWithCfgDelete(void)
EXPECT_EQ(ret, 0);
ret = remove("hnp_sample/bin/out2");
EXPECT_EQ(ret, 0);
EXPECT_EQ(remove("hnp.cfg"), 0);
ret = remove("hnp.cfg");
EXPECT_EQ(ret, 0);
EXPECT_EQ(rmdir("hnp_sample/bin"), 0);
EXPECT_EQ(rmdir("hnp_sample"), 0);
EXPECT_EQ(rmdir("hnp_out"), 0);
@ -290,7 +291,7 @@ HWTEST(HnpInstallerTest, Hnp_Install_001, TestSize.Level0)
int argc = sizeof(argv) / sizeof(argv[0]);
EXPECT_EQ(HnpCmdInstall(argc, argv), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnp_public/bin/out", F_OK), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnppublic/bin/out", F_OK), 0);
}
HnpDeleteFolder(HNP_BASE_PATH);
@ -334,7 +335,7 @@ HWTEST(HnpInstallerTest, Hnp_Install_002, TestSize.Level0)
char* argv[] = {arg1, arg2, arg3, arg4, arg5, arg6};
int argc = sizeof(argv) / sizeof(argv[0]);
EXPECT_EQ(HnpCmdInstall(argc, argv), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnp_public/bin/out", F_OK), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnppublic/bin/out", F_OK), 0);
}
HnpDeleteFolder(HNP_BASE_PATH);
@ -367,7 +368,7 @@ HWTEST(HnpInstallerTest, Hnp_Install_003, TestSize.Level0)
int argc = sizeof(argv) / sizeof(argv[0]);
EXPECT_EQ(HnpCmdInstall(argc, argv), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnp_public/bin/out", F_OK), -1);
EXPECT_EQ(access(HNP_BASE_PATH"/hnppublic/bin/out", F_OK), -1);
HnpPackWithoutBinDelete();
HnpDeleteFolder(HNP_BASE_PATH);
}
@ -381,7 +382,7 @@ HWTEST(HnpInstallerTest, Hnp_Install_003, TestSize.Level0)
int argc = sizeof(argv) / sizeof(argv[0]);
EXPECT_EQ(HnpCmdInstall(argc, argv), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnp_public/bin/out", F_OK), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnppublic/bin/out", F_OK), 0);
HnpPackWithBinDelete();
}
HnpDeleteFolder(HNP_BASE_PATH);
@ -444,7 +445,7 @@ HWTEST(HnpInstallerTest, Hnp_Install_004, TestSize.Level0)
char* argv[] = {arg1, arg2, arg3, arg4, arg5, arg6};
int argc = sizeof(argv) / sizeof(argv[0]);
EXPECT_EQ(HnpCmdInstall(argc, argv), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnp_public/bin/out", F_OK), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnppublic/bin/out", F_OK), 0);
}
HnpDeleteFolder(HNP_BASE_PATH);
@ -478,8 +479,8 @@ HWTEST(HnpInstallerTest, Hnp_Install_005, TestSize.Level0)
char* argv[] = {arg1, arg2, arg3, arg4, arg5, arg6};
int argc = sizeof(argv) / sizeof(argv[0]);
EXPECT_EQ(HnpCmdInstall(argc, argv), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnp_public/bin/outt", F_OK), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnp_public/bin/out2", F_OK), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnppublic/bin/outt", F_OK), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnppublic/bin/out2", F_OK), 0);
}
HnpDeleteFolder(HNP_BASE_PATH);
@ -574,7 +575,7 @@ HWTEST(HnpInstallerTest, Hnp_Install_007, TestSize.Level0)
int argc = sizeof(argv) / sizeof(argv[0]);
EXPECT_EQ(HnpCmdInstall(argc, argv), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnp_public/bin/out", F_OK), 0);
EXPECT_EQ(access(HNP_BASE_PATH"/hnppublic/bin/out", F_OK), 0);
}
HnpDeleteFolder(HNP_BASE_PATH);