-#define CHECK_TERM_ENV(env,isNull,NOTERM) (isNull = ((env==0)||(*env==0)), \
- (env = (isNull ? \
- _nc_console_vt_supported() ? MS_TERMINAL: NOTERM : env) , \
- (isNull = ((env==0)||(*env==0)))))
+#define VALID_TERM_ENV(term_env, no_terminal) \
+ (term_env = (NonEmpty(term_env) \
+ ? term_env \
+ : (_nc_console_vt_supported() \
+ ? MS_TERMINAL \
+ : no_terminal)), \
+ NonEmpty(term_env))