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

   strip "/dev/"). Fix loginrec.c based on patch from Alain St-Denis
   <Alain.St-Denis@ec.gc.ca>

diff --git a/loginrec.c b/loginrec.c
index 6fca9f821e82fdaf1b895a5df9ce272aad30449c..d6aa0cfc336b0378ce4d987cda77e8f931e2aefc 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -494,9 +494,9 @@ char *
 line_fullname(char *dst, const char *src, int 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);
-       else {
+       } else {
                strlcpy(dst, "/dev/", dstsize);
                strlcat(dst, src, dstsize);
        }
@@ -508,8 +508,13 @@ char *
 line_stripname(char *dst, const char *src, int 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)
-               strlcpy(dst, &src[5], dstsize);
+               strlcpy(dst, src + 5, dstsize);
+#endif
        else
                strlcpy(dst, src, dstsize);
        return dst;
@@ -529,8 +534,13 @@ line_abbrevname(char *dst, const char *src, int dstsize)
        memset(dst, '\0', dstsize);
        
        /* Always skip prefix if present */
+#ifdef sgi
+       if (strncmp(src, "/dev/tty", 8) == 0)
+               src += 8;
+#else
        if (strncmp(src, "/dev/", 5) == 0)
                src += 5;
+#endif
                
        len = strlen(src);