From 60fe67f93b009329f944333e478bb70ef951d4bf Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Thu, 28 Apr 2005 16:36:32 +0000 Subject: [PATCH] (putf): %t: the regular and streamspty case are functionally equivalent, so merge them, this also makes it work better on machines that puts their devices in a subdirectory to /dev git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15003 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/telnet/telnetd/utility.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/appl/telnet/telnetd/utility.c b/appl/telnet/telnetd/utility.c index 6ad8053d9..036e28960 100644 --- a/appl/telnet/telnetd/utility.c +++ b/appl/telnet/telnetd/utility.c @@ -431,11 +431,7 @@ putchr(int cc) *putlocation++ = cc; } -/* - * This is split on two lines so that SCCS will not see the M - * between two % signs and expand it... - */ -static char fmtstr[] = { "%l:%M" "%P on %A, %d %B %Y" }; +static char fmtstr[] = { "%l:%M%P on %A, %d %B %Y" }; void putf(char *cp, char *where) { @@ -470,12 +466,7 @@ void putf(char *cp, char *where) switch (*++cp) { case 't': -#ifdef STREAMSPTY - /* names are like /dev/pts/2 -- we want pts/2 */ slash = strchr(line+1, '/'); -#else - slash = strrchr(line, '/'); -#endif if (slash == (char *) 0) putstr(line); else