Skip to content

properly attach '.woff2' to filenames without suffix #97

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

Open
rcanavan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

properly attach '.woff2' to filenames without suffix #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/woff2_compress.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@ int main(int argc, char **argv) {
}

string filename(argv[1]);
string outfilename = filename.substr(0, filename.find_last_of(".")) + ".woff2";
int lastdot;
string outfilename;
if ((lastdot = filename.find_last_of(".")) > filename.find_last_of("/")) {
outfilename = filename.substr(0, lastdot) + ".woff2";
} else {
outfilename = filename + ".woff2";
}

fprintf(stdout, "Processing %s => %s\n",
filename.c_str(), outfilename.c_str());
string input = woff2::GetFileContent(filename);
Expand Down
8 changes: 7 additions & 1 deletion src/woff2_decompress.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ int main(int argc, char **argv) {
}

string filename(argv[1]);
string outfilename = filename.substr(0, filename.find_last_of(".")) + ".ttf";
int lastdot;
string outfilename;
if ((lastdot = filename.find_last_of(".")) > filename.find_last_of("/")) {
outfilename = filename.substr(0, lastdot) + ".woff2";
} else {
outfilename = filename + ".woff2";
}

// Note: update woff2_dec_fuzzer_new_entry.cc if this pattern changes.
string input = woff2::GetFileContent(filename);
Expand Down
6 changes: 3 additions & 3 deletions src/woff2_info.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ int main(int argc, char **argv) {
}

string filename(argv[1]);
string outfilename = filename.substr(0, filename.find_last_of(".")) + ".woff2";
fprintf(stdout, "Processing %s => %s\n",
filename.c_str(), outfilename.c_str());

fprintf(stdout, "Processing %s\n",
filename.c_str());
string input = woff2::GetFileContent(filename);

woff2::Buffer file(reinterpret_cast<const uint8_t*>(input.data()),
Expand Down