]> rtime.felk.cvut.cz Git - can-utils.git/commitdiff
slcand: accept both tty* and /dev/tty* device names
authorYegor Yefremov <yegorslists@googlemail.com>
Thu, 23 Jan 2014 08:49:23 +0000 (09:49 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 23 Jan 2014 12:46:19 +0000 (13:46 +0100)
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
slcand.c

index 69d30f7b2064472b841bb31d617b5048aa79a2f2..831e8c6166784dc9f296587712ce60e57e7b05cb 100644 (file)
--- a/slcand.c
+++ b/slcand.c
@@ -251,10 +251,11 @@ int main(int argc, char *argv[])
 
        /* Prepare the tty device name string */
        pch = strstr(tty, devprefix);
-       if (pch == tty)
-               print_usage(argv[0]);
+       if (pch != tty)
+               snprintf(ttypath, TTYPATH_LENGTH, "%s%s", devprefix, tty);
+       else
+               snprintf(ttypath, TTYPATH_LENGTH, "%s", tty);
 
-       snprintf(ttypath, TTYPATH_LENGTH, "%s%s", devprefix, tty);
        syslog(LOG_INFO, "starting on TTY device %s", ttypath);
 
        /* Daemonize */