mirror/opustags
1
0
Fork 0
mirror of https://github.com/fmang/opustags.git synced 2025-01-16 05:03:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

finish moving the argv checks to cli

Browse Source
This commit is contained in:
Frédéric Mangano-Tarumi 2018-11-11 11:35:05 -05:00
parent 326ae74afa
commit b9dbaf1049
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cli.cc
View File

@ -120,7 +120,7 @@ ot::status ot::process_options(int argc, char** argv, ot::options& opt)
return status::exit_now;
}
if (optind != argc - 1) {
fputs("invalid arguments\n", stderr);
fputs("exactly one input file must be specified\n", stderr);
return status::bad_arguments;
}
opt.path_in = argv[optind];
@ -128,6 +128,18 @@ ot::status ot::process_options(int argc, char** argv, ot::options& opt)
fputs("input's file path cannot be empty\n", stderr);
return status::bad_arguments;
}
if (opt.inplace != nullptr && !opt.path_out.empty()) {
fputs("cannot combine --in-place and --output\n", stderr);
return status::bad_arguments;
}
if (opt.path_in == "-" && opt.set_all) {
fputs("can't open stdin for input when -S is specified\n", stderr);
return status::bad_arguments;
}
if (opt.path_in == "-" && opt.inplace) {
fputs("cannot modify stdin in-place\n", stderr);
return status::bad_arguments;
}
return status::ok;
}

22
src/opustags.cc
View File

@ -29,10 +29,6 @@ static void print_tags(ot::opus_tags &tags)
static int run(ot::options& opt)
{
if (opt.inplace != nullptr && !opt.path_out.empty()) {
fputs("cannot combine --in-place and --output\n", stderr);
return EXIT_FAILURE;
}
if (!opt.path_out.empty() && opt.path_in != "-" && opt.path_out != "-") {
char canon_in[PATH_MAX+1], canon_out[PATH_MAX+1];
if (realpath(opt.path_in.c_str(), canon_in) && realpath(opt.path_out.c_str(), canon_out)) {
@ -45,21 +41,13 @@ static int run(ot::options& opt)
ot::ogg_reader reader;
ot::ogg_writer writer;
if (opt.path_in == "-") {
if (opt.set_all) {
fputs("can't open stdin for input when -S is specified\n", stderr);
return EXIT_FAILURE;
}
if (opt.inplace) {
fputs("cannot modify stdin in-place\n", stderr);
return EXIT_FAILURE;
}
reader.file = stdin;
}
else
} else {
reader.file = fopen(opt.path_in.c_str(), "r");
if(!reader.file){
perror("fopen");
return EXIT_FAILURE;
if (reader.file == nullptr) {
perror("fopen");
return EXIT_FAILURE;
}
}
writer.file = NULL;
if (opt.inplace != nullptr)