Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check file modification time after key handler

Browse Source
This commit is contained in:
Bert Münnich 2014-01-08 20:31:50 +01:00
parent cd34aa2a6b
commit 9574150f2d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.c
View File

@ -459,6 +459,7 @@ void key_handler(const char *key, unsigned int mask)
pid_t pid; pid_t pid;
int retval, status, n = mode == MODE_IMAGE ? fileidx : tns.sel; int retval, status, n = mode == MODE_IMAGE ? fileidx : tns.sel;
char *cmd = exec[EXEC_KEY].cmd, kstr[32]; char *cmd = exec[EXEC_KEY].cmd, kstr[32];
struct stat oldstat, newstat;
if (cmd == NULL || key == NULL) if (cmd == NULL || key == NULL)
return; return;
@ -468,6 +469,8 @@ void key_handler(const char *key, unsigned int mask)
mask & Mod1Mask ? "M-" : "", mask & Mod1Mask ? "M-" : "",
mask & ShiftMask ? "S-" : "", key); mask & ShiftMask ? "S-" : "", key);
stat(files[n].path, &oldstat);
if ((pid = fork()) == 0) { if ((pid = fork()) == 0) {
execl(cmd, cmd, kstr, files[n].path, NULL); execl(cmd, cmd, kstr, files[n].path, NULL);
warn("could not exec key handler"); warn("could not exec key handler");
@ -482,6 +485,13 @@ void key_handler(const char *key, unsigned int mask)
retval = WEXITSTATUS(status); retval = WEXITSTATUS(status);
if (WIFEXITED(status) == 0 || retval != 0) if (WIFEXITED(status) == 0 || retval != 0)
warn("key handler exited with non-zero return value: %d", retval); warn("key handler exited with non-zero return value: %d", retval);
if (stat(files[n].path, &newstat) == 0 &&
memcmp(&oldstat, &newstat, sizeof(oldstat)) == 0)
{
/* file has not changed */
return;
}
if (mode == MODE_IMAGE) { if (mode == MODE_IMAGE) {
img_close(&img, true); img_close(&img, true);
load_image(fileidx); load_image(fileidx);