Merge branch 'hishamhm-pull-1011'

This commit is contained in:
Nathan Scott 2020-08-20 15:18:20 +10:00
commit cca07e9bc9
1 changed files with 3 additions and 0 deletions

3
htop.c
View File

@ -116,6 +116,7 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
flags.sortKey = ColumnsPanel_fieldNameToIndex(optarg); flags.sortKey = ColumnsPanel_fieldNameToIndex(optarg);
if (flags.sortKey == -1) { if (flags.sortKey == -1) {
fprintf(stderr, "Error: invalid column \"%s\".\n", optarg); fprintf(stderr, "Error: invalid column \"%s\".\n", optarg);
exit(1);
} }
break; break;
case 'd': case 'd':
@ -124,6 +125,7 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
if (flags.delay > 100) flags.delay = 100; if (flags.delay > 100) flags.delay = 100;
} else { } else {
fprintf(stderr, "Error: invalid delay value \"%s\".\n", optarg); fprintf(stderr, "Error: invalid delay value \"%s\".\n", optarg);
exit(1);
} }
break; break;
case 'u': case 'u':
@ -139,6 +141,7 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
if (!Action_setUserOnly(optarg, &(flags.userId))) { if (!Action_setUserOnly(optarg, &(flags.userId))) {
fprintf(stderr, "Error: invalid user \"%s\".\n", optarg); fprintf(stderr, "Error: invalid user \"%s\".\n", optarg);
exit(1);
} }
break; break;
case 'C': case 'C':