wall(1) - Fix for unix98 ptys

* Wall didn't know about unix98 ptys, so it errored out about too many
  slashes in the terminal name, as pts/X, still contains a slash.

Obtained-from: FreeBSD

diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 7830836..6dc81f5 100644 (file)
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -64,14 +64,18 @@ ttymsg(struct iovec *iov, int iovcnt, const char *line, int tmout)
        int cnt, fd;
        static char device[PATH_MAX] = _PATH_DEV;
        static char errbuf[1024];
+       char *p;
        int forked;
 
        forked = 0;
        if (iovcnt > (int)(sizeof(localiov) / sizeof(localiov[0])))
                return ("too many iov's (change code in wall/ttymsg.c)");
 
-       strlcpy(device + sizeof(_PATH_DEV) - 1, line, sizeof(device));
-       if (strchr(device + sizeof(_PATH_DEV) - 1, '/')) {
+       p = device + sizeof(_PATH_DEV) - 1;
+       strlcpy(p, line, sizeof(device));
+       if (!strncmp(p, "pts/", 4))
+               p += 4;
+       if (strchr(p, '/') != NULL) {
                /* A slash is an attempt to break security... */
                (void) snprintf(errbuf, sizeof(errbuf),
                    "Too many '/' in \"%s\"", device);