tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) Irix strips "/dev/tty" from [uw]tmp entries (other systems only

Browse Source 
strip "/dev/"). Fix loginrec.c based on patch from Alain St-Denis
   <Alain.St-Denis@ec.gc.ca>
This commit is contained in:
Damien Miller 2000-09-30 21:34:44 +11:00
parent 51155a70e7
commit f5a81473a9
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
loginrec.c
View File

@ -161,7 +161,7 @@
#include "xmalloc.h" #include "xmalloc.h"
#include "loginrec.h" #include "loginrec.h"
RCSID("$Id: loginrec.c,v 1.25 2000/09/23 03:12:25 djm Exp $"); RCSID("$Id: loginrec.c,v 1.26 2000/09/30 10:34:44 djm Exp $");
/** /**
** prototypes for helper functions in this file ** prototypes for helper functions in this file
@ -494,9 +494,9 @@ char *
line_fullname(char *dst, const char *src, int dstsize) line_fullname(char *dst, const char *src, int dstsize)
{ {
memset(dst, '\0', dstsize); memset(dst, '\0', dstsize);
if ((strncmp(src, "/dev/", 5) == 0) || (dstsize < (strlen(src) + 5))) if ((strncmp(src, "/dev/", 5) == 0) || (dstsize < (strlen(src) + 5))) {
strlcpy(dst, src, dstsize); strlcpy(dst, src, dstsize);
else { } else {
strlcpy(dst, "/dev/", dstsize); strlcpy(dst, "/dev/", dstsize);
strlcat(dst, src, dstsize); strlcat(dst, src, dstsize);
} }
@ -508,8 +508,13 @@ char *
line_stripname(char *dst, const char *src, int dstsize) line_stripname(char *dst, const char *src, int dstsize)
{ {
memset(dst, '\0', dstsize); memset(dst, '\0', dstsize);
#ifdef sgi
if (strncmp(src, "/dev/tty", 8) == 0)
strlcpy(dst, src + 8, dstsize);
#else
if (strncmp(src, "/dev/", 5) == 0) if (strncmp(src, "/dev/", 5) == 0)
strlcpy(dst, &src[5], dstsize); strlcpy(dst, src + 5, dstsize);
#endif
else else
strlcpy(dst, src, dstsize); strlcpy(dst, src, dstsize);
return dst; return dst;
@ -529,8 +534,13 @@ line_abbrevname(char *dst, const char *src, int dstsize)
memset(dst, '\0', dstsize); memset(dst, '\0', dstsize);
/* Always skip prefix if present */ /* Always skip prefix if present */
#ifdef sgi
if (strncmp(src, "/dev/tty", 8) == 0)
src += 8;
#else
if (strncmp(src, "/dev/", 5) == 0) if (strncmp(src, "/dev/", 5) == 0)
src += 5; src += 5;
#endif
len = strlen(src); len = strlen(src);