diff --git a/src/framework/core.c b/src/framework/core.c index 2b343a6..d548b2c 100644 --- a/src/framework/core.c +++ b/src/framework/core.c @@ -133,8 +133,8 @@ ProgStatus = .leader_selected_index = -1, .chgtype = ChgType_Auto, .chsrc_run_faas = false, - .user_agent = NULL; -}; + .user_agent = NULL +} /* Global Program Store */ @@ -643,11 +643,11 @@ measure_speed_for_url (void *url) /** * @note 我们用 —L,因为部分链接会跳转到其他地方,比如: RubyChina, npmmirror */ - char *curl_cmd = #xy_strcat (8, "curl -qsL ", ipv6, + char *curl_cmd = xy_strcat (8, "curl -qsL ", ipv6, " -o ", os_devnull, " -w \"%{http_code} %{speed_download}\" -m", time_sec, " -A ", ProgStatus.user_agent, " ", url); - + // chsrc_info (xy_2strjoin ("测速命令 ", curl_cmd)); char *curl_buf = xy_run (curl_cmd, 0); return curl_buf; diff --git a/src/recipe/lang/Java.c b/src/recipe/lang/Java.c index c374948..5394193 100644 --- a/src/recipe/lang/Java.c +++ b/src/recipe/lang/Java.c @@ -72,7 +72,7 @@ pl_java_find_maven_config () { char *maven_home_line = xy_run_iter ("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_2strjoin (maven_home, "/conf/settings.xml")); + char *maven_config = xy_normalize_path (xy_2strcat (maven_home, "/conf/settings.xml")); return maven_config; } else @@ -91,7 +91,7 @@ pl_java_find_maven_daemon_config () { char *maven_home_line = xy_run_iter ("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_2strjoin (maven_home, "/conf/settings.xml")); + char *maven_config = xy_normalize_path (xy_2strcat (maven_home, "/conf/settings.xml")); return maven_config; } else @@ -110,12 +110,12 @@ pl_java_getsrc (char *option) if (maven_exist) { char *maven_config = pl_java_find_maven_config (); - chsrc_note2 (xy_2strcat ("请查看 ", maven_config)); + chsrc_note2 (xy_strcat ("请查看 ", maven_config)); } if(maven_daemon_exist) { char *maven_config = pl_java_find_maven_daemon_config (); - chsrc_note2 (xy_2strcat ("请查看 ", maven_config)); + chsrc_note2 (xy_strcat ("请查看 ", maven_config)); } } @@ -151,7 +151,7 @@ pl_java_setsrc (char *option) file = xy_str_gsub (file, "@name@", source.mirror->name); file = xy_str_gsub (file, "@url@", source.url); char *maven_config = pl_java_find_maven_daemon_config (); - chsrc_note2 (xy_strjoin (3, "请在 maven 配置文件 ", maven_config, " 中添加:")); + chsrc_note2 (xy_strcat (3, "请在 maven 配置文件 ", maven_config, " 中添加:")); println (file); } diff --git a/src/recipe/lang/Ruby/Ruby.c b/src/recipe/lang/Ruby/Ruby.c index 074201f..5f23bff 100644 --- a/src/recipe/lang/Ruby/Ruby.c +++ b/src/recipe/lang/Ruby/Ruby.c @@ -59,7 +59,7 @@ pl_ruby_remove_gem_source (const char *source) cmd = xy_2strcat ("gem sources -r ", source); chsrc_run (cmd, RunOpt_Default); } - return false + return false; } /**