systemctl: fix counting in list-units output

https://bugzilla.redhat.com/show_bug.cgi?id=643502

diff --git a/src/systemctl.c b/src/systemctl.c
index 555c171b0e4831a0bca47be23c482645fe360292..a03769034b7d8bfcd732bef8c37f869ea29c4d7c 100644 (file)
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -265,7 +265,7 @@ static bool output_show_job(const struct unit_info *u) {
 }
 
 static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
 }
 
 static void output_units_list(const struct unit_info *unit_infos, unsigned c) {

-        unsigned active_len, sub_len, job_len;
+        unsigned active_len, sub_len, job_len, n_shown = 0;

         const struct unit_info *u;
 
         active_len = sizeof("ACTIVE")-1;
         const struct unit_info *u;
 
         active_len = sizeof("ACTIVE")-1;


@@ -300,6 +300,8 @@ static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
                 if (!output_show_job(u))
                         continue;
 
                 if (!output_show_job(u))
                         continue;
 

+                n_shown++;
+

                 if (!streq(u->load_state, "loaded") &&
                     !streq(u->load_state, "banned")) {
                         on_loaded = ansi_highlight(true);
                 if (!streq(u->load_state, "loaded") &&
                     !streq(u->load_state, "banned")) {
                         on_loaded = ansi_highlight(true);


@@ -352,9 +354,9 @@ static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
                        "JOB    = Pending job for the unit.\n");
 
                 if (arg_all)
                        "JOB    = Pending job for the unit.\n");
 
                 if (arg_all)

-                        printf("\n%u units listed.\n", c);
+                        printf("\n%u units listed.\n", n_shown);

                 else
                 else

-                        printf("\n%u units listed. Pass --all to see inactive units, too.\n", c);
+                        printf("\n%u units listed. Pass --all to see inactive units, too.\n", n_shown);

         }
 }
 
         }
 }