Commit 2c324414 authored by Matthias Andree's avatar Matthias Andree

Exit with error if the lock file cannot be read.

svn path=/trunk/; revision=4374
parent 6fae1ebc
......@@ -249,6 +249,7 @@ fetchmail 6.3.0 (not yet released officially):
configuration file. Matthias Andree
* Bury on_exit officially - the necessary code had been missing from 6.0.0,
6.2.0, 6.2.5. Matthias Andree
* Exit with error if the lock file cannot be read. Matthias Andree
# INTERNAL CHANGES
* Switched to automake. Matthias Andree.
......
......@@ -73,9 +73,11 @@ int lock_state(void)
int args = fscanf(lockfp, "%d %d", &pid, &st);
bkgd = (args == 2);
if (ferror(lockfp))
if (ferror(lockfp)) {
fprintf(stderr, GT_("fetchmail: error reading lockfile \"%s\": %s\n"),
lockfile, strerror(errno));
exit(PS_EXCLUDE);
}
if (args == 0 || kill(pid, 0) == -1) {
fprintf(stderr,GT_("fetchmail: removing stale lockfile\n"));
......@@ -86,9 +88,11 @@ int lock_state(void)
fclose(lockfp); /* not checking should be safe, file mode was "r" */
} else {
pid = 0;
if (errno != ENOENT)
if (errno != ENOENT) {
fprintf(stderr, GT_("fetchmail: error opening lockfile \"%s\": %s\n"),
lockfile, strerror(errno));
exit(PS_EXCLUDE);
}
}
return(bkgd ? -pid : pid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment