GUAC-236: Acquire read lock on input files for guacenc. Refuse to encode in-progress recordings.
This commit is contained in:
parent
0361dd2392
commit
9d43e22592
@ -30,10 +30,10 @@
|
|||||||
#include <guacamole/parser.h>
|
#include <guacamole/parser.h>
|
||||||
#include <guacamole/socket.h>
|
#include <guacamole/socket.h>
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <fcntl.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
@ -93,6 +93,32 @@ int guacenc_encode(const char* path, const char* out_path, const char* codec,
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Lock entire input file for reading by the current process */
|
||||||
|
struct flock file_lock = {
|
||||||
|
.l_type = F_RDLCK,
|
||||||
|
.l_whence = SEEK_SET,
|
||||||
|
.l_start = 0,
|
||||||
|
.l_len = 0,
|
||||||
|
.l_pid = getpid()
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Abort if file cannot be locked for reading */
|
||||||
|
if (fcntl(fd, F_SETLK, &file_lock) == -1) {
|
||||||
|
|
||||||
|
/* Warn if lock cannot be acquired */
|
||||||
|
if (errno == EACCES || errno == EAGAIN)
|
||||||
|
guacenc_log(GUAC_LOG_WARNING, "Refusing to encode in-progress "
|
||||||
|
"recording \"%s\".", path);
|
||||||
|
|
||||||
|
/* Log an error if locking fails in an unexpected way */
|
||||||
|
else
|
||||||
|
guacenc_log(GUAC_LOG_ERROR, "Cannot lock \"%s\" for reading: %s",
|
||||||
|
path, strerror(errno));
|
||||||
|
|
||||||
|
close(fd);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
/* Allocate display for encoding process */
|
/* Allocate display for encoding process */
|
||||||
guacenc_display* display = guacenc_display_alloc(out_path, codec,
|
guacenc_display* display = guacenc_display_alloc(out_path, codec,
|
||||||
width, height, bitrate);
|
width, height, bitrate);
|
||||||
|
Loading…
Reference in New Issue
Block a user