]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
tests: (mkfds) call close method of factory only when it is specified
authorMasatake YAMATO <yamato@redhat.com>
Fri, 23 Sep 2022 06:33:50 +0000 (15:33 +0900)
committerMasatake YAMATO <yamato@redhat.com>
Fri, 23 Sep 2022 23:38:23 +0000 (08:38 +0900)
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
tests/helpers/test_mkfds.c

index 7906569064c0efec26b880f53e29eeeb063bc070..994da2b77e39cabc91ef452b5c7aa91ae92af25a 100644 (file)
@@ -1111,8 +1111,10 @@ int main(int argc, char **argv)
                errx(EXIT_FAILURE, _("not enough file descriptors given for %s"),
                     factory->name);
 
-       for (int i = 0; i < MAX_N; i++)
+       for (int i = 0; i < MAX_N; i++) {
                fdescs[i].fd = -1;
+               fdescs[i].close = NULL;
+       }
 
        for (int i = 0; i < factory->N; i++) {
                char *str = argv[optind + i];
@@ -1151,7 +1153,7 @@ int main(int argc, char **argv)
                pause();
 
        for (int i = 0; i < factory->N + factory->EX_N; i++)
-               if (fdescs[i].fd >= 0)
+               if (fdescs[i].fd >= 0 && fdescs[i].close)
                        fdescs[i].close(fdescs[i].fd, fdescs[i].data);
 
        if (factory->free)