View | Details | Raw Unified | Return to bug 257886
Collapse All | Expand All

(-)b/bin/ls/ls.c (-2 / +5 lines)
Lines 165-170 char *enter_bold; /* ANSI sequence to set color to bold mode */ Link Here
165
165
166
static int rval;
166
static int rval;
167
167
168
#ifdef COLORLS
168
static bool
169
static bool
169
do_color_from_env(void)
170
do_color_from_env(void)
170
{
171
{
Lines 187-192 do_color_from_env(void) Link Here
187
	return (doit &&
188
	return (doit &&
188
	    (isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE")));
189
	    (isatty(STDOUT_FILENO) || getenv("CLICOLOR_FORCE")));
189
}
190
}
191
#endif
190
192
191
static bool
193
static bool
192
do_color(void)
194
do_color(void)
Lines 197-204 do_color(void) Link Here
197
		return (false);
199
		return (false);
198
	else if (colorflag == COLORFLAG_ALWAYS)
200
	else if (colorflag == COLORFLAG_ALWAYS)
199
		return (true);
201
		return (true);
200
#endif
201
	return (do_color_from_env());
202
	return (do_color_from_env());
203
#else
204
	return (false);
205
#endif
202
}
206
}
203
207
204
#ifdef COLORLS
208
#ifdef COLORLS
205
- 

Return to bug 257886