Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

canlogserver: Fix termination after signal #423

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

canlogserver: Fix termination after signal #423

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions canlogserver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,15 @@ int main(int argc, char **argv)
perror("accept");
exit(1);
}
else if ((errno == EINTR) && !running) {
Comment on lines 308 to +309
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}
else if ((errno == EINTR) && !running) {
} else if ((errno == EINTR) && !running) {

marckleinebudde marked this conversation as resolved.
Show resolved Hide resolved
close(socki);
if (signal_num) {
return 128 + signal_num;
}
else {
return 1;
}
Comment on lines +311 to +316
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (signal_num) {
return 128 + signal_num;
}
else {
return 1;
}
if (signal_num)
return 128 + signal_num;
else
return 1;

marckleinebudde marked this conversation as resolved.
Show resolved Hide resolved
}
}

for (i=0; i<currmax; i++) {
Expand Down