Skip to content

Refuse to create logfile when the name doesn't end in .spl #16

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
nresare wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refuse to create logfile when the name doesn't end in .spl #16

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
12 changes: 11 additions & 1 deletion src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ static void usage() {
fprintf(stderr, " writehash - Generate a hash file from a log file.\n");
fprintf(stderr, " createlog - Create an empty log file.\n");
fprintf(stderr, " appendlog - Append key-value pairs to an existing log file.\n");
fprintf(stderr, " help - Show this help text.\n");
fprintf(stderr, " help - Show this help text.\n\n");
fprintf(stderr, "Invoking each subcommand without arguments gives usage information\n");
}

static void usage_info() {
Expand Down Expand Up @@ -231,6 +232,11 @@ static int append(sparkey_logwriter *writer, char delimiter, FILE *input) {
return 1;
}

static int ends_with(const char *str, const char *suffix) {
size_t len_suffix = strlen(suffix);
return strncmp(str + strlen(str) - len_suffix, suffix, len_suffix) == 0;
}

int main(int argc, char * const *argv) {
if (argc < 2) {
usage();
Expand Down Expand Up @@ -321,6 +327,10 @@ int main(int argc, char * const *argv) {
}

const char *log_filename = argv[optind];
if (!ends_with(log_filename, ".spl")) {
fprintf(stderr, "Refusing to create log file '%s', does not end with '.spl'\n", log_filename);
return 1;
}
sparkey_logwriter *writer;
assert(sparkey_logwriter_create(&writer, log_filename,
compression_type, block_size));
Expand Down