Re: [PATCH 1/2] mountpoint: refactor exit path

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Oct 10, 2011 at 07:14:15PM -0400, Dave Reisner wrote:
>  	if (dev_devno)
>  		rc = print_devno(spec, &st);

 print_devno() returns -1 on error. Fixed.

> @@ -161,20 +161,23 @@ int main(int argc, char **argv)
>  
>  		if (!S_ISDIR(st.st_mode)) {
>  			if (!quiet)
> -				errx(EXIT_FAILURE, _("%s: not a directory"), spec);
> -			return EXIT_FAILURE;
> +				warnx(_("%s: not a directory"), spec);
> +			goto finish;
>  		}
>  		src = dir_to_device(spec);
>  		if (src == (dev_t)-1) {
>  			if (!quiet)
>  				printf(_("%s is not a mountpoint\n"), spec);
> -			return EXIT_FAILURE;
> +			goto finish;
>  		}
>  		if (fs_devno)
>  			printf("%u:%u\n", major(src), minor(src));
> -		else if (!quiet)
> +		else if (!quiet) {
>  			printf(_("%s is a mountpoint\n"), spec);
> +			rc = EXIT_SUCCESS;

 Fixed. (see Berny's email)

 Applied, thanks.

    Karel

-- 
 Karel Zak  <kzak@xxxxxxxxxx>
 http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux