Merge branch 'output-all' of https://github.com/t-8ch/util-linux

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 1c19d608b4e05faf2c3d4062531d706d8c2a4a19..80263d3d73ca83f05ca25da66f061a63701b9575 100644 (file)
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -1492,10 +1492,11 @@ int main(int argc, char *argv[])
                        outarg = optarg;
                        break;
                case FINDMNT_OPT_OUTPUT_ALL:
-                       for (ncolumns = 0; ncolumns < ARRAY_SIZE(infos); ncolumns++) {
-                               if (is_tabdiff_column(ncolumns))
+                       ncolumns = 0;
+                       for (int i = 0; i < ARRAY_SIZE(infos); i++) {
+                               if (is_tabdiff_column(i))
                                        continue;
-                               columns[ncolumns] = ncolumns;
+                               columns[ncolumns++] = i;
                        }
                        break;
                case 'O':