sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slcand: fix whitespace issues and unify coding style 

Fixed coding style inspired by Linux checkpatch.pl
Additionally removed a comment in the write() result check in the 'if (speed)'
statement to make sure the write() is not optimized away as the executed code
was empty.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/1/head
Oliver Hartkopp 2013-09-15 21:54:37 +02:00
parent 94006e996d
commit 35d2bc1381
1 changed files with 106 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
slcand.c
View File

@ -87,14 +87,15 @@ void print_usage(char *prg)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
static int slcand_running = 0; static int slcand_running;
static int exit_code = 0; static int exit_code;
static char ttypath[TTYPATH_LENGTH]; static char ttypath[TTYPATH_LENGTH];
static char pidfile[PIDFILE_LENGTH]; static char pidfile[PIDFILE_LENGTH];
static void child_handler(int signum) static void child_handler(int signum)
{ {
switch (signum) { switch (signum) {
case SIGUSR1: case SIGUSR1:
/* exit parent */ /* exit parent */
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
@ -117,6 +118,7 @@ static void child_handler (int signum)
static int look_up_uart_speed(long int s) static int look_up_uart_speed(long int s)
{ {
switch (s) { switch (s) {
case 9600: case 9600:
return B9600; return B9600;
case 19200: case 19200:
@ -186,8 +188,8 @@ static pid_t daemonize (const char *lockfile, char *tty, char *name)
return 0; return 0;
/* Create the lock file as the current user */ /* Create the lock file as the current user */
if (lockfile && lockfile[0]) if (lockfile && lockfile[0]) {
{
lfp = open(lockfile, O_RDWR | O_CREAT, 0640); lfp = open(lockfile, O_RDWR | O_CREAT, 0640);
if (lfp < 0) if (lfp < 0)
{ {
@ -198,12 +200,12 @@ static pid_t daemonize (const char *lockfile, char *tty, char *name)
} }
/* Drop user if there is one, and we were run as root */ /* Drop user if there is one, and we were run as root */
if (getuid () == 0 || geteuid () == 0) if (getuid() == 0 || geteuid() == 0) {
{
struct passwd *pw = getpwnam(RUN_AS_USER); struct passwd *pw = getpwnam(RUN_AS_USER);
if (pw) if (pw)
{ {
//syslog (LOG_NOTICE, "setting user to " RUN_AS_USER); /* syslog(LOG_NOTICE, "setting user to " RUN_AS_USER); */
setuid(pw->pw_uid); setuid(pw->pw_uid);
} }
} }
@ -217,16 +219,14 @@ static pid_t daemonize (const char *lockfile, char *tty, char *name)
/* Fork off the parent process */ /* Fork off the parent process */
pid = fork(); pid = fork();
if (pid < 0) if (pid < 0) {
{
syslog(LOG_ERR, "unable to fork daemon, code=%d (%s)", syslog(LOG_ERR, "unable to fork daemon, code=%d (%s)",
errno, strerror(errno)); errno, strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* If we got a good PID, then we can exit the parent process. */
if (pid > 0)
{
/* If we got a good PID, then we can exit the parent process. */
if (pid > 0) {
/* Wait for confirmation from the child via SIGTERM or SIGCHLD, or /* Wait for confirmation from the child via SIGTERM or SIGCHLD, or
for five seconds to elapse (SIGALRM). pause() should not return. */ for five seconds to elapse (SIGALRM). pause() should not return. */
alarm(5); alarm(5);
@ -251,16 +251,14 @@ static pid_t daemonize (const char *lockfile, char *tty, char *name)
/* Create a new SID for the child process */ /* Create a new SID for the child process */
sid = setsid(); sid = setsid();
if (sid < 0) if (sid < 0) {
{
syslog(LOG_ERR, "unable to create a new session, code %d (%s)", syslog(LOG_ERR, "unable to create a new session, code %d (%s)",
errno, strerror(errno)); errno, strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
pFile = fopen(pidfile, "w"); pFile = fopen(pidfile, "w");
if (NULL == pFile) if (NULL == pFile) {
{
syslog(LOG_ERR, "unable to create pid file %s, code=%d (%s)", syslog(LOG_ERR, "unable to create pid file %s, code=%d (%s)",
pidfile, errno, strerror(errno)); pidfile, errno, strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -270,8 +268,7 @@ static pid_t daemonize (const char *lockfile, char *tty, char *name)
/* Change the current working directory. This prevents the current /* Change the current working directory. This prevents the current
directory from being locked; hence not being able to remove it. */ directory from being locked; hence not being able to remove it. */
if ((chdir ("/")) < 0) if (chdir("/") < 0) {
{
syslog(LOG_ERR, "unable to change directory to %s, code %d (%s)", syslog(LOG_ERR, "unable to change directory to %s, code %d (%s)",
"/", errno, strerror(errno)); "/", errno, strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -283,7 +280,7 @@ static pid_t daemonize (const char *lockfile, char *tty, char *name)
dummyFile = freopen("/dev/null", "w", stderr); dummyFile = freopen("/dev/null", "w", stderr);
/* Tell the parent process that we are A-okay */ /* Tell the parent process that we are A-okay */
//kill (parent, SIGUSR1); /* kill(parent, SIGUSR1); */
return parent; return parent;
} }
@ -307,6 +304,9 @@ int main (int argc, char *argv[])
char *btr = NULL; char *btr = NULL;
int run_as_daemon = 1; int run_as_daemon = 1;
pid_t parent_pid = 0; pid_t parent_pid = 0;
char *pch;
int ldisc = LDISC_N_SLCAN;
int fd;
ttypath[0] = '\0'; ttypath[0] = '\0';
@ -358,25 +358,22 @@ int main (int argc, char *argv[])
/* Parse serial device name and optional can interface name */ /* Parse serial device name and optional can interface name */
tty = argv[optind]; tty = argv[optind];
if(NULL == tty) { if (NULL == tty)
print_usage(argv[0]); print_usage(argv[0]);
}
name = argv[optind + 1]; name = argv[optind + 1];
/* Prepare the tty device name string */ /* Prepare the tty device name string */
char * pch;
pch = strstr(tty, devprefix); pch = strstr(tty, devprefix);
if (pch == tty) { if (pch == tty)
print_usage(argv[0]); print_usage(argv[0]);
}
snprintf(ttypath, TTYPATH_LENGTH, "%s%s", devprefix, tty); snprintf(ttypath, TTYPATH_LENGTH, "%s%s", devprefix, tty);
syslog(LOG_INFO, "starting on TTY device %s", ttypath); syslog(LOG_INFO, "starting on TTY device %s", ttypath);
/* Daemonize */ /* Daemonize */
if(run_as_daemon) { if (run_as_daemon)
parent_pid = daemonize("/var/lock/" DAEMON_NAME, tty, name); parent_pid = daemonize("/var/lock/" DAEMON_NAME, tty, name);
}
else { else {
/* Trap signals that we expect to receive */ /* Trap signals that we expect to receive */
signal(SIGINT, child_handler); signal(SIGINT, child_handler);
@ -387,10 +384,8 @@ int main (int argc, char *argv[])
slcand_running = 1; slcand_running = 1;
/* Now we are a daemon -- do the work for which we were paid */ /* Now we are a daemon -- do the work for which we were paid */
int fd; fd = open(ttypath, O_RDWR | O_NONBLOCK | O_NOCTTY);
int ldisc = LDISC_N_SLCAN; if (fd < 0) {
if ((fd = open (ttypath, O_RDWR | O_NONBLOCK | O_NOCTTY )) < 0) {
syslog(LOG_NOTICE, "failed to open TTY device %s\n", ttypath); syslog(LOG_NOTICE, "failed to open TTY device %s\n", ttypath);
perror(ttypath); perror(ttypath);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -412,15 +407,12 @@ int main (int argc, char *argv[])
cfsetospeed(&tios, look_up_uart_speed(uart_speed)); cfsetospeed(&tios, look_up_uart_speed(uart_speed));
/* apply changes */ /* apply changes */
if(tcsetattr(fd, TCSADRAIN, &tios) < 0) { if (tcsetattr(fd, TCSADRAIN, &tios) < 0)
syslog(LOG_NOTICE, "Cannot set attributes for device \"%s\": %s!\n", ttypath, strerror(errno)); syslog(LOG_NOTICE, "Cannot set attributes for device \"%s\": %s!\n", ttypath, strerror(errno));
}
if (speed) { if (speed) {
sprintf(buf, "C\rS%s\r", speed); sprintf(buf, "C\rS%s\r", speed);
if(write(fd, buf, strlen(buf)) < 0) { write(fd, buf, strlen(buf));
//syslog (LO, "failed to get attributes for TTY device %s: %s\n", ttypath, strerror(errno));
}
} }
if (btr) { if (btr) {
@ -456,6 +448,7 @@ int main (int argc, char *argv[])
if (name) { if (name) {
struct ifreq ifr; struct ifreq ifr;
int s = socket(PF_INET, SOCK_DGRAM, 0); int s = socket(PF_INET, SOCK_DGRAM, 0);
if (s < 0) if (s < 0)
perror("socket for interface rename"); perror("socket for interface rename");
else { else {
@ -472,14 +465,12 @@ int main (int argc, char *argv[])
close(s); close(s);
} }
} }
if(parent_pid > 0) { if (parent_pid > 0)
kill(parent_pid, SIGUSR1); kill(parent_pid, SIGUSR1);
}
/* The Big Loop */ /* The Big Loop */
while (slcand_running) { while (slcand_running)
sleep(1); /* wait 1 second */ sleep(1); /* wait 1 second */
}
/* Reset line discipline */ /* Reset line discipline */
syslog(LOG_INFO, "stopping on TTY device %s", ttypath); syslog(LOG_INFO, "stopping on TTY device %s", ttypath);
@ -499,14 +490,12 @@ int main (int argc, char *argv[])
cfsetospeed(&tios, old_ospeed); cfsetospeed(&tios, old_ospeed);
/* apply changes */ /* apply changes */
if(tcsetattr(fd, TCSADRAIN, &tios) < 0) { if (tcsetattr(fd, TCSADRAIN, &tios) < 0)
syslog(LOG_NOTICE, "Cannot set attributes for device \"%s\": %s!\n", ttypath, strerror(errno)); syslog(LOG_NOTICE, "Cannot set attributes for device \"%s\": %s!\n", ttypath, strerror(errno));
}
/* Remove pidfile */ /* Remove pidfile */
if(run_as_daemon) { if (run_as_daemon)
unlink(pidfile); unlink(pidfile);
}
/* Finish up */ /* Finish up */
syslog(LOG_NOTICE, "terminated on %s", ttypath); syslog(LOG_NOTICE, "terminated on %s", ttypath);