devmand call the cleanup method before doing an exit.
Call the cleanup mehtod before doing an exit to prevent stale pid files.
This commit is contained in:
parent
ed993cd557
commit
101b99bc77
1 changed files with 5 additions and 2 deletions
|
@ -510,6 +510,7 @@ static enum dev_type determine_type (char *path)
|
||||||
|
|
||||||
if (mypath == NULL) {
|
if (mypath == NULL) {
|
||||||
fprintf(stderr, "ERROR: out of mem\n");
|
fprintf(stderr, "ERROR: out of mem\n");
|
||||||
|
cleanup();
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -862,7 +863,6 @@ static void main_loop()
|
||||||
char ev_path[128];
|
char ev_path[128];
|
||||||
char buf[256];
|
char buf[256];
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
FILE* fd;
|
FILE* fd;
|
||||||
len = strlen(args.path);
|
len = strlen(args.path);
|
||||||
|
|
||||||
|
@ -872,6 +872,7 @@ static void main_loop()
|
||||||
|
|
||||||
if (len > 128 - 7 /*len of "events" */) {
|
if (len > 128 - 7 /*len of "events" */) {
|
||||||
fprintf(stderr, "pathname to long\n");
|
fprintf(stderr, "pathname to long\n");
|
||||||
|
cleanup();
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -885,7 +886,9 @@ static void main_loop()
|
||||||
|
|
||||||
fd = fopen(ev_path, "r");
|
fd = fopen(ev_path, "r");
|
||||||
if (fd == NULL) {
|
if (fd == NULL) {
|
||||||
fprintf(stderr, "ERROR: could not open event file...\n");
|
fprintf(stderr,"devmand error: could not open event "
|
||||||
|
"file %s bailing out\n", ev_path);
|
||||||
|
cleanup();
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue