OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[readline] Fix compilation on MinGW

Browse Source 
S_ISLNK should not be called outside of an #ifdef.

However, this specific call is actually unnecessary, because
linkok can only be 0 if S_ISLNK is true, per the code above.

I have sent a bug report to bug-readline, though it does not show
up in the online archive yet.

2019-08-13  Christian Biesinger  <cbiesinger@google.com>

	* colors.c (_rl_print_color_indicator): Remove unnecessary
	S_ISLNK check to fix compilation on MinGW.
This commit is contained in:
Christian Biesinger 2019-08-13 14:00:58 -05:00
parent 29c9291108
commit 0111684298
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
readline/ChangeLog.gdb
View File

@ -1,3 +1,8 @@
2019-08-13 Christian Biesinger <cbiesinger@google.com>
* colors.c (_rl_print_color_indicator): Remove unnecessary
S_ISLNK check to fix compilation on MinGW.
2019-08-12 Tom Tromey <tom@tromey.com> 2019-08-12 Tom Tromey <tom@tromey.com>
* Imported readline 8.0. * Imported readline 8.0.

2
readline/colors.c
View File

@ -175,7 +175,7 @@ _rl_print_color_indicator (const char *f)
if (linkok == -1 && _rl_color_indicator[C_MISSING].string != NULL) if (linkok == -1 && _rl_color_indicator[C_MISSING].string != NULL)
colored_filetype = C_MISSING; colored_filetype = C_MISSING;
else if (linkok == 0 && S_ISLNK(mode) && _rl_color_indicator[C_ORPHAN].string != NULL) else if (linkok == 0 && _rl_color_indicator[C_ORPHAN].string != NULL)
colored_filetype = C_ORPHAN; /* dangling symlink */ colored_filetype = C_ORPHAN; /* dangling symlink */
else if(stat_ok != 0) else if(stat_ok != 0)
{ {