xfsprogs: xfs_quota command error message improvement
PATCH 1/1 xfsprogs: xfs_quota command error message improvement
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 <[email protected]>
--- quota/state.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-)
quota/state.c +27 -6
@@ -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); }
Signature · 1 line
2.26.2
Quoted 14 lines · Bill O'Donnell
Make the error messages for rudimentary
xfs_quotacommands (off, enable, disable) more user friendly, instead of the terse sys error outputs.Signed-off-by Bill O'Donnell <[email protected]>--- quota/state.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-)quota/state.c +0
-0
quota/state.c enable_enforcement( · line 311
Quoted 8 lines
quota/state.c +3
-2@@ -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
Quoted 48 lines
quota/state.c +24
-4+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); }Signature · 1 line
2.26.2