xfs_quota: allow name lookup when reporting from ID range

Add a new "-l" (lookup) argument to the "report" command, to
enable id->name lookups when doing a report across a lower/upper
ID range as specified by the -L / -U report options.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/man/man8/xfs_quota.8 b/man/man8/xfs_quota.8
index 9b555e97873a16e8fc29a688315206117f1eb3e4..3bee14508e0334d37d3d86d6449e116a28d60ec6 100644 (file)
--- a/man/man8/xfs_quota.8
+++ b/man/man8/xfs_quota.8
@@ -335,7 +335,7 @@ file.
 ] [
 .B \-bir
 ] [
-.B \-ahntLNU
+.B \-ahntlLNU
 ] [
 .B \-f
 .I file
@@ -363,7 +363,11 @@ option outputs the numeric ID instead of the name. The
 .B \-L
 and
 .B \-U
-options specify lower and upper ID bounds to report on. The
+options specify lower and upper ID bounds to report on.  If upper/lower
+bounds are specified, then by default only the IDs will be displayed
+in output; with the
+.B \-l
+option, a lookup will be performed to translate these IDs to names. The
 .B \-N
 option reports information without the header line. The
 .B \-t

diff --git a/quota/report.c b/quota/report.c
index 55e44c52b1392ddb0f63ae861eacadb1b9651c99..c77b24f1f143f7f0e2ea67dc8e8848a0d4522a78 100644 (file)
--- a/quota/report.c
+++ b/quota/report.c
@@ -45,7 +45,7 @@ dump_help(void)
 static void
 report_help(void)
 {
-       report_cmd.args = _("[-bir] [-gpu] [-ahntLNU] [-f file]");
+       report_cmd.args = _("[-bir] [-gpu] [-ahntlLNU] [-f file]");
        report_cmd.oneline = _("report filesystem quota information");
        printf(_(
 "\n"
@@ -63,6 +63,7 @@ report_help(void)
 " -t -- terse output format, hides rows which are all zero\n"
 " -L -- lower ID bound to report on\n"
 " -U -- upper ID bound to report on\n"
+" -l -- look up names for IDs in lower-upper range\n"
 " -g -- report group usage and quota information\n"
 " -p -- report project usage and quota information\n"
 " -u -- report user usage and quota information\n"
@@ -322,10 +323,26 @@ report_mount(
        if (!(flags & NO_HEADER_FLAG))
                report_header(fp, form, type, mount, flags);
 
-       if ((name == NULL) || (flags & NO_LOOKUP_FLAG))
+       if (flags & NO_LOOKUP_FLAG) {
                fprintf(fp, "#%-10u", id);
-       else
+       } else {
+               if (name == NULL) {
+                       if (type == XFS_USER_QUOTA) {
+                               struct passwd   *u = getpwuid(id);
+                               if (u)
+                                       name = u->pw_name;
+                       } else if (type == XFS_GROUP_QUOTA) {
+                               struct group    *g = getgrgid(id);
+                               if (g)
+                                       name = g->gr_name;
+                       } else if (type == XFS_PROJ_QUOTA) {
+                               fs_project_t    *p = getprprid(id);
+                               if (p)
+                                       name = p->pr_name;
+                       }
+               }
                fprintf(fp, "%-10s", name);
+       }
 
        if (form & XFS_BLOCK_QUOTA) {
                qflags = (flags & HUMAN_FLAG);
@@ -545,9 +562,10 @@ report_f(
        FILE            *fp = NULL;
        char            *fname = NULL;
        uint            lower = 0, upper = 0;
+       bool            lookup = false;
        int             c, flags = 0, type = 0, form = 0;
 
-       while ((c = getopt(argc, argv, "abf:ghiL:NnprtuU:")) != EOF) {
+       while ((c = getopt(argc, argv, "abdf:ghilL:NnprtuU:")) != EOF) {
                switch (c) {
                case 'f':
                        fname = optarg;
@@ -587,9 +605,14 @@ report_f(
                        break;
                case 'L':
                        lower = (uint)atoi(optarg);
+                       flags |= NO_LOOKUP_FLAG;
                        break;
                case 'U':
                        upper = (uint)atoi(optarg);
+                       flags |= NO_LOOKUP_FLAG;
+                       break;
+               case 'l':
+                       lookup = true;
                        break;
                default:
                        return command_usage(&report_cmd);
@@ -602,6 +625,9 @@ report_f(
        if (!type)
                type = XFS_USER_QUOTA | XFS_GROUP_QUOTA | XFS_PROJ_QUOTA;
 
+       if (lookup)
+               flags &= ~NO_LOOKUP_FLAG;
+
        if ((fp = fopen_write_secure(fname)) == NULL)
                return 0;