Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dfilemaker: exit on unrecognized option and remove duplicate longopts struct #610

Merged
merged 2 commits into from
Nov 26, 2024
Merged

dfilemaker: exit on unrecognized option and remove duplicate longopts struct #610

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
999ecff
dfilemaker: fail and stop execution on unrecognized option
ofaaland Nov 25, 2024
eb57445
dfilemaker: remove duplicate longopts struct
ofaaland Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions src/dfilemaker/dfilemaker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ static struct option long_options[] = {
{"ratio", 1, 0, 'r'},
{"size", 1, 0, 's'},
{"width", 1, 0, 'w'},
{"version", 0, 0, 'v'},
{"verbose", 0, 0, 'v'},
{"help", 0, 0, 'h'},
{0, 0, 0, 0}
};
Expand All @@ -574,7 +574,7 @@ static void print_usage(void)
printf(" -r, --ratio=*min*-*max* - ratio of files to directories as a percent (not implemented)\n");
printf(" -s, --size=*min*-*max* - file size, integers min and max followed by MB or GB\n");
printf(" -w, --width=*min*-*max* - directory width, integers min and max (not implemented)\n");
printf(" -v, --verbose - print version number\n");
printf(" -v, --verbose - increase verbosity of output; default is INFO\n");
printf(" -h, --help - print usage\n");
printf("\n");
printf("For more information see https://mpifileutils.readthedocs.io.\n");
Expand Down Expand Up @@ -655,18 +655,6 @@ int main(int narg, char** arg)
int depmin=0,depmax=0;
int nmin=0,nmax=0;
int widmin=0,widmax=0;
static struct option long_options[] = {
{"seed", 1, 0, 'i'},
{"fill", 1, 0, 'f'},
{"depth", 1, 0, 'd'},
{"nitems", 1, 0, 'n'},
{"ratio", 1, 0, 'r'},
{"size", 1, 0, 's'},
{"width", 1, 0, 'w'},
{"version", 0, 0, 'v'},
{"help", 0, 0, 'h'},
{0, 0, 0, 0}
};

/*--------------------------
* initialize mfu and MPI
Expand Down Expand Up @@ -770,7 +758,13 @@ int main(int narg, char** arg)
exit(0);
break;
default:
break;
/* unrecognized option */
if (rank == 0) {
print_usage();
}
mfu_finalize();
MPI_Finalize();
exit(1);
}
}

Expand Down