diff --git a/src/framework/core.c b/src/framework/core.c index d548b2c..f3f2979 100644 --- a/src/framework/core.c +++ b/src/framework/core.c @@ -81,6 +81,7 @@ static bool in_measure_mode(){return ProgMode.MeasureMode;} static bool in_ipv6_mode(){return ProgMode.Ipv6Mode;} static bool in_dry_run_mode(){return ProgMode.DryRunMode;} + /** * Target Group mode (相反则称为 standalone mode) * @@ -133,8 +134,8 @@ ProgStatus = .leader_selected_index = -1, .chgtype = ChgType_Auto, .chsrc_run_faas = false, - .user_agent = NULL -} + .user_agent = NULL, +}; /* Global Program Store */ diff --git a/src/recipe/lang/Java.c b/src/recipe/lang/Java.c index 5394193..c019ed6 100644 --- a/src/recipe/lang/Java.c +++ b/src/recipe/lang/Java.c @@ -70,7 +70,7 @@ pl_java_find_maven_config () int status = xy_run_capture ("mvn -v", &output); if (0==status) { - char *maven_home_line = xy_run_iter ("mvn -v", 0, pl_java_find_maven_home); + char *maven_home_line = xy_run_iter_lines ("mvn -v", 0, pl_java_find_maven_home); char *maven_home = xy_str_delete_prefix (maven_home_line, "Maven home: "); char *maven_config = xy_normalize_path (xy_2strcat (maven_home, "/conf/settings.xml")); return maven_config; @@ -89,7 +89,7 @@ pl_java_find_maven_daemon_config () int status = xy_run_capture ("mvnd -v", &output); if (0==status) { - char *maven_home_line = xy_run_iter ("mvnd -v", 0, pl_java_find_maven_home); + char *maven_home_line = xy_run_iter_lines ("mvnd -v", 0, pl_java_find_maven_home); char *maven_home = xy_str_delete_prefix (maven_home_line, "Maven home: "); char *maven_config = xy_normalize_path (xy_2strcat (maven_home, "/conf/settings.xml")); return maven_config; @@ -110,12 +110,12 @@ pl_java_getsrc (char *option) if (maven_exist) { char *maven_config = pl_java_find_maven_config (); - chsrc_note2 (xy_strcat ("请查看 ", maven_config)); + chsrc_note2 (xy_2strcat ("请查看 ", maven_config)); } if(maven_daemon_exist) { char *maven_config = pl_java_find_maven_daemon_config (); - chsrc_note2 (xy_strcat ("请查看 ", maven_config)); + chsrc_note2 (xy_2strcat ("请查看 ", maven_config)); } }