[PATCH v2 1/2] commands: ls: explicitly check for directories with S_ISDIR

[Sascha Hauer]

On Thu, Jun 02, 2022 at 09:59:15PM +0200, Ahmad Fatoum wrote:
> S_ISDIR(mode) is implemented as (mode & S_IFMT) == S_IFDIR, which
> accounts for file modes setting multiple bits. So far, this was not the
> case, but upcoming S_IFBLK equals (S_IFCHR | S_IFDIR), which would fail
> the existing checks, so prepare for that by fixing them.
> 
> No functional change. There are no other instances of this elsewhere in
> the code base.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
> ---

Applied, thanks

Sascha

> v1 -> v2:
>   - new patch
> ---
>  commands/ls.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/commands/ls.c b/commands/ls.c
> index bedf2e1c4288..1192aed971cf 100644
> --- a/commands/ls.c
> +++ b/commands/ls.c
> @@ -63,10 +63,10 @@ int ls(const char *path, ulong flags)
>  	if (stat(path, &s))
>  		return -errno;
>  
> -	if (flags & LS_SHOWARG && s.st_mode & S_IFDIR)
> +	if (flags & LS_SHOWARG && S_ISDIR(s.st_mode))
>  		printf("%s:\n", path);
>  
> -	if (!(s.st_mode & S_IFDIR)) {
> +	if (!S_ISDIR(s.st_mode)) {
>  		ls_one(path, path);
>  		return 0;
>  	}
> @@ -112,7 +112,7 @@ int ls(const char *path, ulong flags)
>  			continue;
>  		}
>  
> -		if (s.st_mode & S_IFDIR)
> +		if (S_ISDIR(s.st_mode))
>  			ls(tmp, flags);
>  	}
>  
> @@ -171,7 +171,7 @@ static int do_ls(int argc, char *argv[])
>  			continue;
>  		}
>  
> -		if (!(s.st_mode & S_IFDIR)) {
> +		if (!S_ISDIR(s.st_mode)) {
>  			if (flags & LS_COLUMN)
>  				string_list_add_sorted(&sl, argv[o]);
>  			else
> @@ -197,7 +197,7 @@ static int do_ls(int argc, char *argv[])
>  			continue;
>  		}
>  
> -		if (s.st_mode & S_IFDIR) {
> +		if (S_ISDIR(s.st_mode)) {
>  			ret = ls(argv[o], flags);
>  			if (ret) {
>  				perror("ls");
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |