octoleo
/
lsyncd
mirror of https://github.com/octoleo/lsyncd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disambiguate fork/exec failure with rsync failure. 

Use a different exit code to rsync to know that execv of rsync failed.
This commit is contained in:
Junichi Uekawa 2008-11-05 11:37:26 +00:00
parent 47b38c3711
commit 63417731b7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lsyncd.c
View File

@ -179,6 +179,7 @@ enum lsyncd_exit_code
LSYNCD_EXECRSYNCFAIL = 3, /* rsync execution somehow failed */
LSYNCD_NOTENOUGHARGUMENTS = 4, /* Not enough command-line arguments were given to lsyncd invocation */
LSYNCD_TOOMANYDIRECTORYEXCLUDES = 5, /* Too many excludes files were specified */
LSYNCD_INTERNALFAIL = 255, /* Internal exit code to denote that execv failed */
};
@ -408,7 +409,7 @@ bool rsync(char const * src, const char * dest, bool recursive)
printlogf(LOG_ERROR, "Failed executing [%s]", rsync_binary);
exit(LSYNCD_EXECRSYNCFAIL);
exit(LSYNCD_INTERNALFAIL);
}
for (i=0; i<argc; ++i) {
@ -418,7 +419,10 @@ bool rsync(char const * src, const char * dest, bool recursive)
waitpid(pid, &status, 0);
assert(WIFEXITED(status));
if (WEXITSTATUS(status)){
if (WEXITSTATUS(status)==LSYNCD_INTERNALFAIL){
printlogf(LOG_ERROR, "Fork exit code of %i, execv failure", WEXITSTATUS(status));
return false;
} else if (WEXITSTATUS(status)) {
printlogf(LOG_NORMAL, "Forked rsync process returned non-zero return code: %i", WEXITSTATUS(status));
return false;
}