sadf: Don't test for activities available in file if only the header

needs to be displayed

When "sadf -H" is used, there is no need to check that activities exist
in file. This is all the more true now as even CPU statistics (A_CPU
activity) don't necessarily exist in file.
E.g.:
sadc -S 0,36 datafile 1 2
Then "sadf -H datafile" should not display error message "Requested
activities not available in file".

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/sa_common.c b/sa_common.c
index 8e8364133098070d068b72688d64b620654d63bd..18f57afa3f2ec2726bb7f6f1f8a103c89147cf06 100644 (file)
--- a/sa_common.c
+++ b/sa_common.c
@@ -1720,7 +1720,13 @@ void check_file_actlst(int *ifd, char *dfile, struct activity *act[],
                        act[i]->options &= ~AO_SELECTED;
                }
        }
-       if (!get_activity_nr(act, AO_SELECTED, COUNT_ACTIVITIES)) {
+
+       /*
+        * None of selected activities exist in file: Abort.
+        * NB: Error is ignored if we only want to display
+        * datafile header (sadf -H).
+        */
+       if (!get_activity_nr(act, AO_SELECTED, COUNT_ACTIVITIES) && !ignore) {
                fprintf(stderr, _("Requested activities not available in file %s\n"),
                        dfile);
                close(*ifd);