cangw: fix inverse filter display when printing the configured rules

[profile/ivi/can-utils.git] / slcand.c

diff --git a/slcand.c b/slcand.c
index 0d55a11..2353c99 100644 (file)
--- a/slcand.c
+++ b/slcand.c
@@ -1,8 +1,4 @@
 /*
- *  $Id$
- */
-
-/*
  * slcand.c - userspace daemon for serial line CAN interface driver SLCAN
  *
  * Copyright (c) 2009 Robert Haddon <robert.haddon@verari.com>
@@ -36,7 +32,7 @@
  * A copy of the license is included in the section entitled "GNU
  * Free Documentation License".
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
+ * Send feedback to <linux-can@vger.kernel.org>
  *
  */
 
@@ -44,14 +40,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <syslog.h>
 #include <errno.h>
 #include <pwd.h>
 #include <signal.h>
+#include <sys/socket.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <net/if.h>
 
 /* default slcan line discipline since Kernel 2.6.25 */
@@ -63,6 +60,12 @@
 /* Change this to the user under which to run */
 #define RUN_AS_USER "root"
 
+/* The length of ttypath buffer */
+#define TTYPATH_LENGTH 64
+
+/* The length of pidfile name buffer */
+#define PIDFILE_LENGTH 64
+
 #define EXIT_SUCCESS 0
 #define EXIT_FAILURE 1
 
@@ -99,9 +102,9 @@ static void daemonize (const char *lockfile, char *tty, char *name)
        FILE * pFile;
        char const *pidprefix = "/var/run/";
        char const *pidsuffix = ".pid";
-       char *pidfile;
-       pidfile = malloc((strlen(pidprefix) +strlen(DAEMON_NAME) + strlen(tty) + strlen(pidsuffix) + 1) * sizeof(char));
-       sprintf(pidfile, "%s%s-%s%s", pidprefix, DAEMON_NAME, tty, pidsuffix);
+       char pidfile[PIDFILE_LENGTH];
+
+       snprintf(pidfile, PIDFILE_LENGTH, "%s%s-%s%s", pidprefix, DAEMON_NAME, tty, pidsuffix);
 
        /* already a daemon */
        if (getppid () == 1)
@@ -209,7 +212,7 @@ static void daemonize (const char *lockfile, char *tty, char *name)
 int main (int argc, char *argv[])
 {
        char *tty = NULL;
-       char *ttypath;
+       char ttypath[TTYPATH_LENGTH];
        char const *devprefix = "/dev/";
        char *name = NULL;
        char buf[IFNAMSIZ+1];
@@ -235,8 +238,8 @@ int main (int argc, char *argv[])
        if (pch == tty) {
                print_usage(argv[0]);
        }
-       ttypath = malloc((strlen(devprefix) + strlen(tty)) * sizeof(char));
-       sprintf (ttypath, "%s%s", devprefix, tty);
+
+       snprintf (ttypath, TTYPATH_LENGTH, "%s%s", devprefix, tty);
        syslog (LOG_INFO, "starting on TTY device %s", ttypath);
 
        /* Daemonize */