* [PATCH] xfsprogs: xfs_quota command error message improvement
@ 2020-06-18 14:45 Bill O'Donnell
2020-06-18 15:14 ` Darrick J. Wong
0 siblings, 1 reply; 2+ messages in thread
From: Bill O'Donnell @ 2020-06-18 14:45 UTC (permalink / raw)
To: linux-xfs
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@redhat.com>
---
quota/state.c | 33 +++++++++++++++++++++++++++------
1 file changed, 27 insertions(+), 6 deletions(-)
diff --git a/quota/state.c b/quota/state.c
index 8f9718f1..90406251 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,15 @@ 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 +364,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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] xfsprogs: xfs_quota command error message improvement
2020-06-18 14:45 [PATCH] xfsprogs: xfs_quota command error message improvement Bill O'Donnell
@ 2020-06-18 15:14 ` Darrick J. Wong
0 siblings, 0 replies; 2+ messages in thread
From: Darrick J. Wong @ 2020-06-18 15:14 UTC (permalink / raw)
To: Bill O'Donnell; +Cc: linux-xfs
On Thu, Jun 18, 2020 at 09:45:49AM -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@redhat.com>
> ---
> quota/state.c | 33 +++++++++++++++++++++++++++------
> 1 file changed, 27 insertions(+), 6 deletions(-)
>
> diff --git a/quota/state.c b/quota/state.c
> index 8f9718f1..90406251 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");
All of the strings you've added ought to be wrapped in _() so that they
can be added to the internationalization catalog, e.g.
fprintf(stderr, _("Quota enforcement already enabled.\n"));
Please capitalize the sentences too. :)
--D
> + 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,15 @@ 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 +364,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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-18 15:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-18 14:45 [PATCH] xfsprogs: xfs_quota command error message improvement Bill O'Donnell
2020-06-18 15:14 ` Darrick J. Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox