Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7eda1213 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Improve top(1) compatibility and interactive usefulness." am: 4386b890 am: 2944e585 

am: 4f147265

* commit '4f147265':
  Improve top(1) compatibility and interactive usefulness.
parents 49c73d9f 4f147265

toolbox/top.c

+3 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int top_main(int argc, char *argv[]) { 
            fprintf(stderr, "Invalid argument \"%s\" for option -s.\n", argv[i]);

            exit(EXIT_FAILURE);

        }

        if (!strcmp(argv[i], "-t")) { threads = 1; continue; }

        if (!strcmp(argv[i], "-H") || !strcmp(argv[i], "-t")) { threads = 1; continue; }

        if (!strcmp(argv[i], "-h")) {

            usage(argv[0]);

            exit(EXIT_SUCCESS);
@@ -187,6 +187,7 @@ int top_main(int argc, char *argv[]) { 
        read_procs();

        print_procs();

        free_old_procs();

        fflush(stdout);

    }



    return 0;
@@ -566,7 +567,7 @@ static void usage(char *cmd) { 
                    "    -n num  Updates to show before exiting.\n"

                    "    -d num  Seconds to wait between updates.\n"

                    "    -s col  Column to sort by (cpu,vss,rss,thr).\n"

                    "    -t      Show threads instead of processes.\n"

                    "    -H      Show threads instead of processes.\n"

                    "    -h      Display this help screen.\n",

        cmd);

}