stephenseo/SimpleArchiver
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases 8 Packages Wiki Activity Actions

More robust handling of bad compressor cmd
All checks were successful
Run Unit Tests / build-and-run-unit-tests (push) Successful in 4s
Details

Browse source
This commit is contained in:
Stephen Seo 2024-07-18 22:32:04 +09:00
parent 72d2db378f
commit 5f8d6b0c0b
1 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/archiver.c
View file

@ -174,6 +174,41 @@ int write_files_fn(void *data, void *ud) {
close(pipe_into_cmd[0]);
close(pipe_outof_cmd[1]);
int compressor_status;
int compressor_return_val;
int compressor_ret = waitpid(compressor_pid, &compressor_status, WNOHANG);
if (compressor_ret == compressor_pid) {
// Status is available.
if (WIFEXITED(compressor_status)) {
compressor_return_val = WEXITSTATUS(compressor_status);
if (compressor_return_val == 127) {
// Exec failed.
fprintf(stderr,
"WARNING: Exec failed (exec exit code 127)! Invalid "
"compressor cmd?\n");
return 1;
} else if (compressor_return_val == 0) {
// Immediately halted.
fprintf(stderr,
"WARNING: Exec failed (exec exit code 0)! Invalid "
"compressor cmd?\n");
return 1;
} else {
// Other status returned.
fprintf(stderr,
"WARNING: Exec failed (exec exit code %d)! Invalid "
"compressor cmd?\n",
compressor_return_val);
return 1;
}
}
} else if (compressor_ret == 0) {
// Probably still running, continue on.
} else {
// Error.
return 1;
}
// Write file to pipe, and read from other pipe.
char write_buf[1024];
char read_buf[1024];
@ -1216,13 +1251,13 @@ int simple_archiver_de_compress(int pipe_fd_in[2], int pipe_fd_out[2],
posix_spawn_file_actions_destroy(&file_actions);
close(pipe_fd_in[0]);
close(pipe_fd_out[1]);
return 3;
return 4;
} else if (posix_spawn_file_actions_addclose(&file_actions, pipe_fd_out[0]) !=
0) {
posix_spawn_file_actions_destroy(&file_actions);
close(pipe_fd_in[0]);
close(pipe_fd_out[1]);
return 3;
return 5;
}
__attribute__((cleanup(
@ -1235,7 +1270,7 @@ int simple_archiver_de_compress(int pipe_fd_in[2], int pipe_fd_out[2],
close(pipe_fd_in[0]);
close(pipe_fd_out[1]);
posix_spawn_file_actions_destroy(&file_actions);
return 4;
return 6;
}
posix_spawn_file_actions_destroy(&file_actions);