diff options
| -rw-r--r-- | bin/csh/csh.h | 4 | ||||
| -rw-r--r-- | bin/csh/extern.h | 3 | ||||
| -rw-r--r-- | bin/csh/str.c | 19 |
3 files changed, 4 insertions, 22 deletions
diff --git a/bin/csh/csh.h b/bin/csh/csh.h index 4ec357dc518..b25d127733c 100644 --- a/bin/csh/csh.h +++ b/bin/csh/csh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.h,v 1.9 2003/01/08 06:54:16 deraadt Exp $ */ +/* $OpenBSD: csh.h,v 1.10 2003/04/08 01:46:53 deraadt Exp $ */ /* $NetBSD: csh.h,v 1.9 1995/03/21 09:02:40 cgd Exp $ */ /*- @@ -489,7 +489,6 @@ Char HISTSUB; /* auto-substitute character */ #ifndef SHORT_STRINGS #define Strchr(a, b) strchr(a, b) #define Strrchr(a, b) strrchr(a, b) -#define Strcat(a, b) strcat(a, b) #define Strlcat(a, b, l) strlcat(a, b, l) #define Strncat(a, b, c) strncat(a, b, c) #define Strcpy(a, b) strcpy(a, b) @@ -511,7 +510,6 @@ Char HISTSUB; /* auto-substitute character */ #else #define Strchr(a, b) s_strchr(a, b) #define Strrchr(a, b) s_strrchr(a, b) -#define Strcat(a, b) s_strcat(a, b) #define Strlcat(a, b, l) s_strlcat(a, b, l) #define Strncat(a, b, c) s_strncat(a, b, c) #define Strcpy(a, b) s_strcpy(a, b) diff --git a/bin/csh/extern.h b/bin/csh/extern.h index f5b7f7d4a48..9fc3121e0b0 100644 --- a/bin/csh/extern.h +++ b/bin/csh/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.6 2003/01/08 06:54:16 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.7 2003/04/08 01:46:53 deraadt Exp $ */ /* $NetBSD: extern.h,v 1.8 1996/10/31 23:50:54 christos Exp $ */ /*- @@ -318,7 +318,6 @@ void showall(Char **, struct command *); #ifdef SHORT_STRINGS Char *s_strchr(Char *, int); Char *s_strrchr(Char *, int); -Char *s_strcat(Char *, Char *); #ifdef NOTUSED Char *s_strncat(Char *, Char *, size_t); #endif diff --git a/bin/csh/str.c b/bin/csh/str.c index bab76c9c89a..911d635e60d 100644 --- a/bin/csh/str.c +++ b/bin/csh/str.c @@ -1,4 +1,4 @@ -/* $OpenBSD: str.c,v 1.7 2003/01/08 06:54:16 deraadt Exp $ */ +/* $OpenBSD: str.c,v 1.8 2003/04/08 01:46:53 deraadt Exp $ */ /* $NetBSD: str.c,v 1.6 1995/03/21 09:03:24 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)str.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: str.c,v 1.7 2003/01/08 06:54:16 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: str.c,v 1.8 2003/04/08 01:46:53 deraadt Exp $"; #endif #endif /* not lint */ @@ -255,21 +255,6 @@ s_strncpy(dst, src, n) return (sdst); } -Char * -s_strcat(dst, src) - register Char *dst, *src; -{ - register short *sdst; - - sdst = dst; - while (*dst++) - continue; - --dst; - while ((*dst++ = *src++) != '\0') - continue; - return (sdst); -} - #ifdef NOTUSED Char * s_strncat(dst, src, n) |