xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

log: enable log output only on linux

This commit is contained in:
kailixu 2024-12-03 14:52:35 +08:00
parent c92b01309a
commit c8df537dbf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/dnode/mgmt/exe/dmMain.c
View File

@ -240,7 +240,7 @@ static int32_t dmParseArgs(int32_t argc, char const *argv[]) {
} }
} else if (strcmp(argv[i], "-k") == 0) { } else if (strcmp(argv[i], "-k") == 0) {
global.generateGrant = true; global.generateGrant = true;
#ifndef WINDOWS #if defined(LINUX)
} else if (strcmp(argv[i], "-o") == 0 || strcmp(argv[i], "--log-output") == 0 || } else if (strcmp(argv[i], "-o") == 0 || strcmp(argv[i], "--log-output") == 0 ||
strncmp(argv[i], "--log-output=", 13) == 0) { strncmp(argv[i], "--log-output=", 13) == 0) {
if ((i < argc - 1) || ((i == argc - 1) && strncmp(argv[i], "--log-output=", 13) == 0)) { if ((i < argc - 1) || ((i == argc - 1) && strncmp(argv[i], "--log-output=", 13) == 0)) {
@ -343,7 +343,7 @@ static void dmPrintHelp() {
printf("%s%s%s%s\n", indent, "-e,", indent, DM_ENV_CMD); printf("%s%s%s%s\n", indent, "-e,", indent, DM_ENV_CMD);
printf("%s%s%s%s\n", indent, "-E,", indent, DM_ENV_FILE); printf("%s%s%s%s\n", indent, "-E,", indent, DM_ENV_FILE);
printf("%s%s%s%s\n", indent, "-k,", indent, DM_MACHINE_CODE); printf("%s%s%s%s\n", indent, "-k,", indent, DM_MACHINE_CODE);
#ifndef WINDOWS #if defined(LINUX)
printf("%s%s%s%s\n", indent, "-o, --log-output=OUTPUT", indent, DM_LOG_OUTPUT); printf("%s%s%s%s\n", indent, "-o, --log-output=OUTPUT", indent, DM_LOG_OUTPUT);
#endif #endif
printf("%s%s%s%s\n", indent, "-y,", indent, DM_SET_ENCRYPTKEY); printf("%s%s%s%s\n", indent, "-y,", indent, DM_SET_ENCRYPTKEY);

6
tools/shell/src/shellArguments.c
View File

@ -79,7 +79,7 @@ void shellPrintHelp() {
printf("%s%s%s%s\r\n", indent, "-l,", indent, SHELL_PKT_LEN); printf("%s%s%s%s\r\n", indent, "-l,", indent, SHELL_PKT_LEN);
printf("%s%s%s%s\r\n", indent, "-n,", indent, SHELL_NET_ROLE); printf("%s%s%s%s\r\n", indent, "-n,", indent, SHELL_NET_ROLE);
printf("%s%s%s%s\r\n", indent, "-N,", indent, SHELL_PKT_NUM); printf("%s%s%s%s\r\n", indent, "-N,", indent, SHELL_PKT_NUM);
#ifndef WINDOWS #if defined(LINUX)
printf("%s%s%s%s\r\n", indent, "-o,", indent, SHELL_LOG_OUTPUT); printf("%s%s%s%s\r\n", indent, "-o,", indent, SHELL_LOG_OUTPUT);
#endif #endif
printf("%s%s%s%s\r\n", indent, "-p,", indent, SHELL_PASSWORD); printf("%s%s%s%s\r\n", indent, "-p,", indent, SHELL_PASSWORD);
@ -142,7 +142,7 @@ static struct argp_option shellOptions[] = {
#endif #endif
{"pktnum", 'N', "PKTNUM", 0, SHELL_PKT_NUM}, {"pktnum", 'N', "PKTNUM", 0, SHELL_PKT_NUM},
{"bimode", 'B', 0, 0, SHELL_BI_MODE}, {"bimode", 'B', 0, 0, SHELL_BI_MODE},
#ifndef WINDOWS #if defined(LINUX)
{"log-output", 'o', "OUTPUT", 0, SHELL_LOG_OUTPUT}, {"log-output", 'o', "OUTPUT", 0, SHELL_LOG_OUTPUT},
#endif #endif
{0}, {0},
@ -233,7 +233,7 @@ static int32_t shellParseSingleOpt(int32_t key, char *arg) {
case 'N': case 'N':
pArgs->pktNum = atoi(arg); pArgs->pktNum = atoi(arg);
break; break;
#ifndef WINDOWS #if defined(LINUX)
case 'o': case 'o':
if (strlen(arg) >= PATH_MAX) { if (strlen(arg) >= PATH_MAX) {
printf("failed to set log output since length overflow, max length is %d\n", PATH_MAX); printf("failed to set log output since length overflow, max length is %d\n", PATH_MAX);