| Message ID | 1473953386-10242-3-git-send-email-billodo@redhat.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On 9/15/16 10:29 AM, Bill O'Donnell wrote: > This patch adjusts the formatting of the xfs_quota print and > path outputs, in order to maintain reverse compatability: > when -f flag isn't used, need to keep the output same as in > previous version. > > Signed-off-by: Bill O'Donnell <billodo@redhat.com> Last hunk ended up being a bit extraneous (unrelated whitespace changes) but *shrug* Dave could drop it on commit maybe, if not no biggie. Reviewed-by: Eric Sandeen <sandeen@redhat.com> Thanks, -Eric > --- > quota/path.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/quota/path.c b/quota/path.c > index 01ccab4..57d14f0 100644 > --- a/quota/path.c > +++ b/quota/path.c > @@ -36,13 +36,14 @@ printpath( > int c; > > if (index == 0) { > - printf(_("%sFilesystem Pathname\n"), > - number ? _(" ") : ""); > + printf(_("%s%sFilesystem Pathname\n"), > + number ? _(" ") : "", > + foreign_allowed ? _(" ") : ""); > } > - if (number) { > + if (number) > printf(_("%c%03d%c "), braces? '[':' ', index, braces? ']':' '); > - } > - printf("%s ", (path->fs_flags & FS_FOREIGN) ? "(F)" : " "); > + if (foreign_allowed) > + printf("%s", (path->fs_flags & FS_FOREIGN) ? "(F) " : " "); > printf(_("%-19s %s"), path->fs_dir, path->fs_name); > if (path->fs_flags & FS_PROJECT_PATH) { > prj = getprprid(path->fs_prid); > @@ -51,7 +52,7 @@ printpath( > printf(_(", %s"), prj->pr_name); > printf(")"); > } else if (xfsquotactl(XFS_GETQSTAT, path->fs_name, 0, 0, > - (void *)&qstat) == 0 && qstat.qs_flags) { > + (void *)&qstat) == 0 && qstat.qs_flags) { > c = 0; > printf(" ("); > if (qstat.qs_flags & XFS_QUOTA_UDQ_ENFD) >
diff --git a/quota/path.c b/quota/path.c index 01ccab4..57d14f0 100644 --- a/quota/path.c +++ b/quota/path.c @@ -36,13 +36,14 @@ printpath( int c; if (index == 0) { - printf(_("%sFilesystem Pathname\n"), - number ? _(" ") : ""); + printf(_("%s%sFilesystem Pathname\n"), + number ? _(" ") : "", + foreign_allowed ? _(" ") : ""); } - if (number) { + if (number) printf(_("%c%03d%c "), braces? '[':' ', index, braces? ']':' '); - } - printf("%s ", (path->fs_flags & FS_FOREIGN) ? "(F)" : " "); + if (foreign_allowed) + printf("%s", (path->fs_flags & FS_FOREIGN) ? "(F) " : " "); printf(_("%-19s %s"), path->fs_dir, path->fs_name); if (path->fs_flags & FS_PROJECT_PATH) { prj = getprprid(path->fs_prid); @@ -51,7 +52,7 @@ printpath( printf(_(", %s"), prj->pr_name); printf(")"); } else if (xfsquotactl(XFS_GETQSTAT, path->fs_name, 0, 0, - (void *)&qstat) == 0 && qstat.qs_flags) { + (void *)&qstat) == 0 && qstat.qs_flags) { c = 0; printf(" ("); if (qstat.qs_flags & XFS_QUOTA_UDQ_ENFD)
This patch adjusts the formatting of the xfs_quota print and path outputs, in order to maintain reverse compatability: when -f flag isn't used, need to keep the output same as in previous version. Signed-off-by: Bill O'Donnell <billodo@redhat.com> --- quota/path.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)