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

more robust tests for input/output equality

Browse Source
This commit is contained in:
Frédéric Mangano-Tarumi 2018-12-02 10:45:36 -05:00
parent 5860902084
commit 289391a9df
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/cli.cc
View File

@ -15,7 +15,7 @@
#include <getopt.h>
#include <limits.h>
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
using namespace std::literals::string_literals;
@ -249,21 +249,6 @@ static ot::status process(ot::ogg_reader& reader, ot::ogg_writer* writer, const
return ot::st::ok;
}
/**
* Check if two filepaths point to the same file, after path canonicalization.
* The path "-" is treated specially, meaning stdin for path_in and stdout for path_out.
*/
static bool same_file(const std::string& path_in, const std::string& path_out)
{
if (path_in == "-" || path_out == "-")
return false;
char canon_in[PATH_MAX+1], canon_out[PATH_MAX+1];
if (realpath(path_in.c_str(), canon_in) && realpath(path_out.c_str(), canon_out)) {
return (strcmp(canon_in, canon_out) == 0);
}
return false;
}
ot::status ot::run(const ot::options& opt)
{
if (opt.print_help) {
@ -272,9 +257,27 @@ ot::status ot::run(const ot::options& opt)
}
std::string path_out = opt.in_place ? opt.path_in + opt.in_place : opt.path_out;
if (!path_out.empty() && same_file(opt.path_in, path_out))
return {ot::st::fatal_error, "Input and output files are the same"};
if (!path_out.empty() && path_out != "-") {
struct stat input_info;
if (opt.path_in != "-" && stat(opt.path_in.c_str(), &input_info) == -1)
return {ot::st::fatal_error,
"Could not identify '" + opt.path_in + "': " + strerror(errno)};
struct stat output_info;
if (stat(opt.path_out.c_str(), &output_info) == 0) {
if (opt.path_in != "-" &&
input_info.st_dev == output_info.st_dev &&
input_info.st_ino == output_info.st_ino)
return {ot::st::fatal_error,
"Input and output cannot be the same file. "
"Use --in-place instead."};
if (!opt.overwrite)
return {ot::st::fatal_error,
"'" + path_out + "' already exists. Use -y to overwrite."};
} else if (errno != ENOENT) {
return {ot::st::fatal_error,
"Could not identify '" + opt.path_in + "': " + strerror(errno)};
}
}
ot::file input;
if (opt.path_in == "-") {
@ -290,9 +293,6 @@ ot::status ot::run(const ot::options& opt)
if (path_out == "-") {
output.reset(stdout);
} else if (!path_out.empty()) {
if (!opt.overwrite && access(path_out.c_str(), F_OK) == 0)
return {ot::st::fatal_error,
"'" + path_out + "' already exists (use -y to overwrite)"};
output = fopen(path_out.c_str(), "w");
if (output == nullptr)
return {ot::st::standard_error,

4
t/opustags.t
View File

@ -96,12 +96,12 @@ is(md5('out.opus'), '111a483596ac32352fbce4d14d16abd2', 'the copy is faithful');
# empty out.opus
{ my $fh; open($fh, '>', 'out.opus') and close($fh) or die }
is_deeply(opustags(qw(gobble.opus -o out.opus)), ['', <<'EOF', 256], 'refuse to override');
error: 'out.opus' already exists (use -y to overwrite)
error: 'out.opus' already exists. Use -y to overwrite.
EOF
is(md5('out.opus'), 'd41d8cd98f00b204e9800998ecf8427e', 'the output wasn\'t written');
is_deeply(opustags(qw(out.opus -o out.opus)), ['', <<'EOF', 256], 'output and input can\'t be the same');
error: Input and output files are the same
error: Input and output cannot be the same file. Use --in-place instead.
EOF
is_deeply(opustags(qw(gobble.opus -o out.opus --overwrite)), ['', '', 0], 'overwrite');