[PATCH 1/2] commands/mount: Return real error code if "mount" fail

[PATCH 1/2] commands/mount: Return real error code if "mount" fail

[Alexander Shiyan]

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 commands/mount.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/commands/mount.c b/commands/mount.c
index 691bc29..8629bac 100644
--- a/commands/mount.c
+++ b/commands/mount.c
@@ -31,8 +31,7 @@
 
 static int do_mount(int argc, char *argv[])
 {
-	int opt;
-	int ret = 0, verbose = 0;
+	int opt, verbose = 0;
 	struct driver_d *drv;
 	const char *type = NULL;
 	const char *mountpoint, *dev;
@@ -113,11 +112,7 @@ static int do_mount(int argc, char *argv[])
 		mountpoint = argv[optind + 1];
 	}
 
-	if ((ret = mount(dev, type, mountpoint, fsoptions))) {
-		perror("mount");
-		return 1;
-	}
-	return 0;
+	return mount(dev, type, mountpoint, fsoptions);
 }
 
 BAREBOX_CMD_HELP_START(mount)
-- 
1.8.3.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] commands/umount: Return real error code if "umount" fail

[Alexander Shiyan]

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 commands/umount.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/commands/umount.c b/commands/umount.c
index e6de1bc..f0f9fce 100644
--- a/commands/umount.c
+++ b/commands/umount.c
@@ -23,16 +23,10 @@
 
 static int do_umount(int argc, char *argv[])
 {
-	int ret = 0;
-
 	if (argc != 2)
 		return COMMAND_ERROR_USAGE;
 
-	if ((ret = umount(argv[1]))) {
-		perror("umount");
-		return 1;
-	}
-	return 0;
+	return umount(argv[1]);
 }
 
 static const __maybe_unused char cmd_umount_help[] =
-- 
1.8.3.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] commands/mount: Return real error code if "mount" fail

[Sascha Hauer]

On Sat, Apr 26, 2014 at 02:40:09PM +0400, Alexander Shiyan wrote:
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>

Applied, thanks

Sascha

> ---
>  commands/mount.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/commands/mount.c b/commands/mount.c
> index 691bc29..8629bac 100644
> --- a/commands/mount.c
> +++ b/commands/mount.c
> @@ -31,8 +31,7 @@
>  
>  static int do_mount(int argc, char *argv[])
>  {
> -	int opt;
> -	int ret = 0, verbose = 0;
> +	int opt, verbose = 0;
>  	struct driver_d *drv;
>  	const char *type = NULL;
>  	const char *mountpoint, *dev;
> @@ -113,11 +112,7 @@ static int do_mount(int argc, char *argv[])
>  		mountpoint = argv[optind + 1];
>  	}
>  
> -	if ((ret = mount(dev, type, mountpoint, fsoptions))) {
> -		perror("mount");
> -		return 1;
> -	}
> -	return 0;
> +	return mount(dev, type, mountpoint, fsoptions);
>  }
>  
>  BAREBOX_CMD_HELP_START(mount)
> -- 
> 1.8.3.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox