diff mbox

e2fsprogs: misc/mke2fs.c: return error when failed to populate fs

Message ID 1395295766-10637-1-git-send-email-liezhi.yang@windriver.com
State Superseded, archived
Headers show

Commit Message

Robert Yang March 20, 2014, 6:09 a.m. UTC
We need return retval when "mke2fs -d" failed, otherwise the "$?" would
be 0 which is misleading.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 misc/mke2fs.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Zheng Liu March 22, 2014, 4:11 a.m. UTC | #1
On Thu, Mar 20, 2014 at 02:09:26PM +0800, Robert Yang wrote:
> We need return retval when "mke2fs -d" failed, otherwise the "$?" would
> be 0 which is misleading.
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  misc/mke2fs.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/misc/mke2fs.c b/misc/mke2fs.c
> index aecd5d5..f659e6f 100644
> --- a/misc/mke2fs.c
> +++ b/misc/mke2fs.c
> @@ -2990,10 +2990,11 @@ no_journal:
>  
>  		retval = populate_fs(fs, EXT2_ROOT_INO, root_dir,
>  				     EXT2_ROOT_INO);
> -		if (retval)
> +		if (retval) {
>  			fprintf(stderr, "%s",
> -				_("\nError while populating file system"));
                        ^^^
Using com_err() is sane.  After we get an error, the user can know which
error has occured.
> -		else if (!quiet)
> +				_("\nError while populating file system\n"));
> +			return retval;
                        ^^^^
Maybe exit(1) is better.  We just need to notify the user that an error
has occured.  An internal error of libext2fs should not be returned
to user.

Regards,
                                                - Zheng

> +		} else if (!quiet)
>  			printf("%s", _("done\n"));
>  	}
>  
> -- 
> 1.8.3.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Robert Yang March 27, 2014, 1:55 a.m. UTC | #2
Hello Zheng,

Thanks for your comments, V2 is comming.

// Robert

On 03/22/2014 12:11 PM, Zheng Liu wrote:
> On Thu, Mar 20, 2014 at 02:09:26PM +0800, Robert Yang wrote:
>> We need return retval when "mke2fs -d" failed, otherwise the "$?" would
>> be 0 which is misleading.
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>   misc/mke2fs.c | 7 ++++---
>>   1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/misc/mke2fs.c b/misc/mke2fs.c
>> index aecd5d5..f659e6f 100644
>> --- a/misc/mke2fs.c
>> +++ b/misc/mke2fs.c
>> @@ -2990,10 +2990,11 @@ no_journal:
>>
>>   		retval = populate_fs(fs, EXT2_ROOT_INO, root_dir,
>>   				     EXT2_ROOT_INO);
>> -		if (retval)
>> +		if (retval) {
>>   			fprintf(stderr, "%s",
>> -				_("\nError while populating file system"));
>                          ^^^
> Using com_err() is sane.  After we get an error, the user can know which
> error has occured.
>> -		else if (!quiet)
>> +				_("\nError while populating file system\n"));
>> +			return retval;
>                          ^^^^
> Maybe exit(1) is better.  We just need to notify the user that an error
> has occured.  An internal error of libext2fs should not be returned
> to user.
>
> Regards,
>                                                  - Zheng
>
>> +		} else if (!quiet)
>>   			printf("%s", _("done\n"));
>>   	}
>>
>> --
>> 1.8.3.1
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index aecd5d5..f659e6f 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -2990,10 +2990,11 @@  no_journal:
 
 		retval = populate_fs(fs, EXT2_ROOT_INO, root_dir,
 				     EXT2_ROOT_INO);
-		if (retval)
+		if (retval) {
 			fprintf(stderr, "%s",
-				_("\nError while populating file system"));
-		else if (!quiet)
+				_("\nError while populating file system\n"));
+			return retval;
+		} else if (!quiet)
 			printf("%s", _("done\n"));
 	}