On Mon, Jun 22, 2020 at 08:13:19AM -0500, Bill O'Donnell wrote:
> Make the error messages for rudimentary xfs_quota commands
> (off, enable, disable) more user friendly, instead of the
> terse sys error outputs.
>
> Signed-off-by: Bill O'Donnell <billodo@xxxxxxxxxx>
Yay, another sharp edge smoothed down,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
>
> v2: enable internationalization and capitalize new message strings.
>
> quota/state.c | 34 ++++++++++++++++++++++++++++------
> 1 file changed, 28 insertions(+), 6 deletions(-)
>
> diff --git a/quota/state.c b/quota/state.c
> index 8f9718f1..7c9fe517 100644
> --- a/quota/state.c
> +++ b/quota/state.c
> @@ -306,8 +306,15 @@ enable_enforcement(
> return;
> }
> dir = mount->fs_name;
> - if (xfsquotactl(XFS_QUOTAON, dir, type, 0, (void *)&qflags) < 0)
> - perror("XFS_QUOTAON");
> + if (xfsquotactl(XFS_QUOTAON, dir, type, 0, (void *)&qflags) < 0) {
> + if (errno == EEXIST)
> + fprintf(stderr, _("Quota enforcement already enabled.\n"));
> + else if (errno == EINVAL)
> + fprintf(stderr,
> + _("Can't enable when quotas are off.\n"));
> + else
> + perror("XFS_QUOTAON");
> + }
> else if (flags & VERBOSE_FLAG)
> state_quotafile_mount(stdout, type, mount, flags);
> }
> @@ -328,8 +335,16 @@ disable_enforcement(
> return;
> }
> dir = mount->fs_name;
> - if (xfsquotactl(XFS_QUOTAOFF, dir, type, 0, (void *)&qflags) < 0)
> - perror("XFS_QUOTAOFF");
> + if (xfsquotactl(XFS_QUOTAOFF, dir, type, 0, (void *)&qflags) < 0) {
> + if (errno == EEXIST)
> + fprintf(stderr,
> + _("Quota enforcement already disabled.\n"));
> + else if (errno == EINVAL)
> + fprintf(stderr,
> + _("Can't disable when quotas are off.\n"));
> + else
> + perror("XFS_QUOTAOFF");
> + }
> else if (flags & VERBOSE_FLAG)
> state_quotafile_mount(stdout, type, mount, flags);
> }
> @@ -350,8 +365,15 @@ quotaoff(
> return;
> }
> dir = mount->fs_name;
> - if (xfsquotactl(XFS_QUOTAOFF, dir, type, 0, (void *)&qflags) < 0)
> - perror("XFS_QUOTAOFF");
> + if (xfsquotactl(XFS_QUOTAOFF, dir, type, 0, (void *)&qflags) < 0) {
> + if (errno == EEXIST)
> + fprintf(stderr, _("Quota already off.\n"));
> + else if (errno == EINVAL)
> + fprintf(stderr,
> + _("Can't disable when quotas are off.\n"));
> + else
> + perror("XFS_QUOTAOFF");
> + }
> else if (flags & VERBOSE_FLAG)
> state_quotafile_mount(stdout, type, mount, flags);
> }
> --
> 2.26.2
>
