diff --git a/include/chsrc.h b/include/chsrc.h index cd58e80f..93ace72b 100644 --- a/include/chsrc.h +++ b/include/chsrc.h @@ -779,8 +779,11 @@ chsrc_ensure_root () if (0!=atoi(euid)) goto not_root; else return; } + + char *msg = NULL; not_root: - char *msg = CliOpt_InEnglish ? "Use sudo before the command or switch to root to ensure the necessary permissions" : "请在命令前使用 sudo 或切换为root用户来保证必要的权限"; + msg = CliOpt_InEnglish ? "Use sudo before the command or switch to root to ensure the necessary permissions" + : "请在命令前使用 sudo 或切换为root用户来保证必要的权限"; chsrc_error (msg); exit (Exit_UserCause); } diff --git a/include/xy.h b/include/xy.h index 23e1f417..0d72b26c 100644 --- a/include/xy.h +++ b/include/xy.h @@ -300,9 +300,11 @@ _xy_str_to_terminal_style (int style, const char *str) color_fmt_str = "\e[9m%s\e[0m"; break; } + + size_t len = 0; new_str: // -2 把中间%s减掉 - size_t len = strlen (color_fmt_str) - 2; + len = strlen (color_fmt_str) - 2; char *buf = malloc (strlen (str) + len + 1); sprintf (buf, color_fmt_str, str); return buf;