unifdef BUILTIN (unused), NLS (always set), SHORT_STRINGS (always set)

and remove a few unused defines; no binary changes; ok tedu@ zhuk@

13 files changed, 15 insertions, 221 deletions

diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index c4c132d6de1..cc2a2c24a80 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2015/06/17 03:48:21 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.13 2015/10/26 15:01:15 naddy Exp $
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -6,10 +6,9 @@
 # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
 
 PROG=	csh
-DFLAGS=-DBUILTIN -DNLS -DSHORT_STRINGS
 #CFLAGS+=-g
 #CFLAGS+=-Wall
-CFLAGS+=-I${.CURDIR} -I. ${DFLAGS}
+CFLAGS+=-I${.CURDIR} -I.
 SRCS=	alloc.c char.c const.c csh.c dir.c dol.c error.c exec.c exp.c file.c \
 	func.c glob.c hist.c init.c lex.c misc.c parse.c proc.c \
 	sem.c set.c str.c time.c
diff --git a/bin/csh/char.c b/bin/csh/char.c
index a97fa35737f..0972214ad0e 100644
--- a/bin/csh/char.c
+++ b/bin/csh/char.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: char.c,v 1.4 2009/10/27 23:59:21 deraadt Exp $	*/
+/*	$OpenBSD: char.c,v 1.5 2015/10/26 15:01:15 naddy Exp $	*/
 /*	$NetBSD: char.c,v 1.6 1995/03/21 09:02:26 cgd Exp $	*/
 
 /*-
@@ -129,7 +129,6 @@ unsigned short _cmap[256] = {
 /*	|		}		~		del	*/
 	_META|_CMD,	0,		0,		_CTR,
 
-#if defined(SHORT_STRINGS) && !defined(KANJI)
 /****************************************************************/
 /* 128 - 255 The below is supposedly ISO 8859/1			*/
 /****************************************************************/
@@ -228,79 +227,4 @@ unsigned short _cmap[256] = {
 
 /*	udiaeresis	yacute		thorn		ydiaeresis	*/
 	_LET|_LOW,	_LET|_LOW,	_LET|_LOW,	_LET|_LOW,
-#endif /* SHORT_STRINGS && !KANJI */
 };
-
-#ifndef NLS
-/* _cmap_lower, _cmap_upper for ISO 8859/1 */
-
-unsigned char _cmap_lower[256] = {
-	0000,	0001,	0002,	0003,	0004,	0005,	0006,	0007,
-	0010,	0011,	0012,	0013,	0014,	0015,	0016,	0017,
-	0020,	0021,	0022,	0023,	0024,	0025,	0026,	0027,
-	0030,	0031,	0032,	0033,	0034,	0035,	0036,	0037,
-	0040,	0041,	0042,	0043,	0044,	0045,	0046,	0047,
-	0050,	0051,	0052,	0053,	0054,	0055,	0056,	0057,
-	0060,	0061,	0062,	0063,	0064,	0065,	0066,	0067,
-	0070,	0071,	0072,	0073,	0074,	0075,	0076,	0077,
-	0100,	0141,	0142,	0143,	0144,	0145,	0146,	0147,
-	0150,	0151,	0152,	0153,	0154,	0155,	0156,	0157,
-	0160,	0161,	0162,	0163,	0164,	0165,	0166,	0167,
-	0170,	0171,	0172,	0133,	0134,	0135,	0136,	0137,
-	0140,	0141,	0142,	0143,	0144,	0145,	0146,	0147,
-	0150,	0151,	0152,	0153,	0154,	0155,	0156,	0157,
-	0160,	0161,	0162,	0163,	0164,	0165,	0166,	0167,
-	0170,	0171,	0172,	0173,	0174,	0175,	0176,	0177,
-	0200,	0201,	0202,	0203,	0204,	0205,	0206,	0207,
-	0210,	0211,	0212,	0213,	0214,	0215,	0216,	0217,
-	0220,	0221,	0222,	0223,	0224,	0225,	0226,	0227,
-	0230,	0231,	0232,	0233,	0234,	0235,	0236,	0237,
-	0240,	0241,	0242,	0243,	0244,	0245,	0246,	0247,
-	0250,	0251,	0252,	0253,	0254,	0255,	0256,	0257,
-	0260,	0261,	0262,	0263,	0264,	0265,	0266,	0267,
-	0270,	0271,	0272,	0273,	0274,	0275,	0276,	0277,
-	0340,	0341,	0342,	0343,	0344,	0345,	0346,	0347,
-	0350,	0351,	0352,	0353,	0354,	0355,	0356,	0357,
-	0360,	0361,	0362,	0363,	0364,	0365,	0366,	0327,
-	0370,	0371,	0372,	0373,	0374,	0375,	0376,	0337,
-	0340,	0341,	0342,	0343,	0344,	0345,	0346,	0347,
-	0350,	0351,	0352,	0353,	0354,	0355,	0356,	0357,
-	0360,	0361,	0362,	0363,	0364,	0365,	0366,	0367,
-	0370,	0371,	0372,	0373,	0374,	0375,	0376,	0377,
-};
-
-unsigned char _cmap_upper[256] = {
-	0000,	0001,	0002,	0003,	0004,	0005,	0006,	0007,
-	0010,	0011,	0012,	0013,	0014,	0015,	0016,	0017,
-	0020,	0021,	0022,	0023,	0024,	0025,	0026,	0027,
-	0030,	0031,	0032,	0033,	0034,	0035,	0036,	0037,
-	0040,	0041,	0042,	0043,	0044,	0045,	0046,	0047,
-	0050,	0051,	0052,	0053,	0054,	0055,	0056,	0057,
-	0060,	0061,	0062,	0063,	0064,	0065,	0066,	0067,
-	0070,	0071,	0072,	0073,	0074,	0075,	0076,	0077,
-	0100,	0101,	0102,	0103,	0104,	0105,	0106,	0107,
-	0110,	0111,	0112,	0113,	0114,	0115,	0116,	0117,
-	0120,	0121,	0122,	0123,	0124,	0125,	0126,	0127,
-	0130,	0131,	0132,	0133,	0134,	0135,	0136,	0137,
-	0140,	0101,	0102,	0103,	0104,	0105,	0106,	0107,
-	0110,	0111,	0112,	0113,	0114,	0115,	0116,	0117,
-	0120,	0121,	0122,	0123,	0124,	0125,	0126,	0127,
-	0130,	0131,	0132,	0173,	0174,	0175,	0176,	0177,
-	0200,	0201,	0202,	0203,	0204,	0205,	0206,	0207,
-	0210,	0211,	0212,	0213,	0214,	0215,	0216,	0217,
-	0220,	0221,	0222,	0223,	0224,	0225,	0226,	0227,
-	0230,	0231,	0232,	0233,	0234,	0235,	0236,	0237,
-	0240,	0241,	0242,	0243,	0244,	0245,	0246,	0247,
-	0250,	0251,	0252,	0253,	0254,	0255,	0256,	0257,
-	0260,	0261,	0262,	0263,	0264,	0265,	0266,	0267,
-	0270,	0271,	0272,	0273,	0274,	0275,	0276,	0277,
-	0300,	0301,	0302,	0303,	0304,	0305,	0306,	0307,
-	0310,	0311,	0312,	0313,	0314,	0315,	0316,	0317,
-	0320,	0321,	0322,	0323,	0324,	0325,	0326,	0327,
-	0330,	0331,	0332,	0333,	0334,	0335,	0336,	0337,
-	0300,	0301,	0302,	0303,	0304,	0305,	0306,	0307,
-	0310,	0311,	0312,	0313,	0314,	0315,	0316,	0317,
-	0320,	0321,	0322,	0323,	0324,	0325,	0326,	0367,
-	0330,	0331,	0332,	0333,	0334,	0335,	0336,	0377,
-};
-#endif /* NLS */
diff --git a/bin/csh/char.h b/bin/csh/char.h
index dcfad3ea953..c8164f24f3e 100644
--- a/bin/csh/char.h
+++ b/bin/csh/char.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: char.h,v 1.4 2003/06/02 23:32:06 millert Exp $	*/
+/*	$OpenBSD: char.h,v 1.5 2015/10/26 15:01:15 naddy Exp $	*/
 /*	$NetBSD: char.h,v 1.6 1995/03/21 09:02:29 cgd Exp $	*/
 
 /*-
@@ -36,11 +36,6 @@
 
 extern unsigned short _cmap[];
 
-#ifndef NLS
-extern unsigned char _cmap_lower[], _cmap_upper[];
-
-#endif
-
 #define	_QF	0x0001		/* '" (Forward quotes) */
 #define	_QB	0x0002		/* ` (Backquote) */
 #define	_SP	0x0004		/* space and tab */
@@ -61,14 +56,10 @@ extern unsigned char _cmap_lower[], _cmap_upper[];
 	(((c) & QUOTE) ? 0 : (_cmap[(unsigned char)(c)] & (bits)))
 
 #define isglob(c)	cmap(c, _GLOB)
-#define isspc(c)	cmap(c, _SP)
-#define ismeta(c)	cmap(c, _META)
-#define iscmdmeta(c)	cmap(c, _CMD)
 #define letter(c)	(((c) & QUOTE) ? 0 : \
 			 (isalpha((unsigned char) (c)) || (c) == '_'))
 #define alnum(c)	(((c) & QUOTE) ? 0 : \
 			 (isalnum((unsigned char) (c)) || (c) == '_'))
-#ifdef NLS
 #define Isspace(c)	(((c) & QUOTE) ? 0 : isspace((unsigned char) (c)))
 #define Isdigit(c)	(((c) & QUOTE) ? 0 : isdigit((unsigned char) (c)))
 #define Isalpha(c)	(((c) & QUOTE) ? 0 : isalpha((unsigned char) (c)))
@@ -80,16 +71,3 @@ extern unsigned char _cmap_lower[], _cmap_upper[];
 #define Isalnum(c)	(((c) & QUOTE) ? 0 : isalnum((unsigned char) (c)))
 #define Iscntrl(c) 	(((c) & QUOTE) ? 0 : iscntrl((unsigned char) (c)))
 #define Isprint(c) 	(((c) & QUOTE) ? 0 : isprint((unsigned char) (c)))
-#else
-#define Isspace(c)	cmap(c, _SP|_NL)
-#define Isdigit(c)	cmap(c, _DIG)
-#define Isalpha(c)	(cmap(c,_LET) && !(((c) & META) && AsciiOnly))
-#define Islower(c)	(cmap(c,_LOW) && !(((c) & META) && AsciiOnly))
-#define Isupper(c)	(cmap(c, _UP) && !(((c) & META) && AsciiOnly))
-#define Tolower(c)  (_cmap_lower[(unsigned char)(c)])
-#define Toupper(c)  (_cmap_upper[(unsigned char)(c)])
-#define Isxdigit(c)	cmap(c, _XD)
-#define Isalnum(c)	(cmap(c, _DIG|_LET) && !(((c) & META) && AsciiOnly))
-#define Iscntrl(c)  (cmap(c,_CTR) && !(((c) & META) && AsciiOnly))
-#define Isprint(c)  (!cmap(c,_CTR) && !(((c) & META) && AsciiOnly))
-#endif
diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index 621aa52f8ed..e04983c699e 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: csh.c,v 1.30 2015/10/22 12:09:03 deraadt Exp $	*/
+/*	$OpenBSD: csh.c,v 1.31 2015/10/26 15:01:15 naddy Exp $	*/
 /*	$NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $	*/
 
 /*-
@@ -156,7 +156,7 @@ main(int argc, char *argv[])
 	(void) time(&chktim);
 
     AsciiOnly = 1;
-#ifdef NLS
+
     (void) setlocale(LC_ALL, "");
 
     if (pledge("stdio rpath wpath cpath fattr getpw proc exec tty",
@@ -170,9 +170,6 @@ main(int argc, char *argv[])
 	    continue;
 	AsciiOnly = k > 0377;
     }
-#else
-    AsciiOnly = getenv("LANG") == NULL && getenv("LC_CTYPE") == NULL;
-#endif				/* NLS */
 
     /*
      * Move the descriptors to safe places. The variable didfds is 0 while we
diff --git a/bin/csh/csh.h b/bin/csh/csh.h
index 9dc7faef5d4..ff9bb8fb69c 100644
--- a/bin/csh/csh.h
+++ b/bin/csh/csh.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: csh.h,v 1.22 2015/06/17 03:48:21 deraadt Exp $	*/
+/*	$OpenBSD: csh.h,v 1.23 2015/10/26 15:01:15 naddy Exp $	*/
 /*	$NetBSD: csh.h,v 1.9 1995/03/21 09:02:40 cgd Exp $	*/
 
 /*-
@@ -57,15 +57,9 @@
 #define	xexit(n)	done(n)
 #endif
 
-#ifdef SHORT_STRINGS
 typedef short Char;
 
 #define SAVE(a) (Strsave(str2short(a)))
-#else
-typedef char Char;
-
-#define SAVE(a) (strsave(a))
-#endif
 
 /*
  * Make sure a variable is not stored in register a by taking its address
@@ -196,15 +190,8 @@ sig_t parterm;			/* Parents terminate catch */
  */
 #define	META		0200
 #define	ASCII		0177
-#ifdef SHORT_STRINGS
-#define	CHAR		0377
 #define	QUOTE 		0100000U /* 16nth char bit used for 'ing */
 #define	TRIM		0077777	/* Mask to strip quote bit */
-#else
-#define	CHAR		0177
-#define	QUOTE 		0200	/* Eighth char bit used for 'ing */
-#define	TRIM		0177	/* Mask to strip quote bit */
-#endif
 
 int     AsciiOnly;		/* If set only 7 bits is expected in characters */
 
@@ -475,25 +462,6 @@ Char    HISTSUB;		/* auto-substitute character */
 /*
  * strings.h:
  */
-#ifndef SHORT_STRINGS
-#define Strchr(a, b)		strchr(a, b)
-#define Strrchr(a, b)		strrchr(a, b)
-#define Strlcat(a, b, l)	strlcat(a, b, l)
-#define Strlcpy(a, b, l)	strlcpy(a, b, l)
-#define Strlen(a)		strlen(a)
-#define Strcmp(a, b)		strcmp(a, b)
-#define Strncmp(a, b, c)	strncmp(a, b, c)
-
-#define Strspl(a, b)		strspl(a, b)
-#define Strsave(a)		strsave(a)
-#define Strend(a)		strend(a)
-#define Strstr(a, b)		strstr(a, b)
-
-#define str2short(a) 		(a)
-#define blk2short(a) 		saveblk(a)
-#define short2blk(a) 		saveblk(a)
-#define short2str(a) 		strip(a)
-#else
 #define Strchr(a, b)		s_strchr(a, b)
 #define Strrchr(a, b) 		s_strrchr(a, b)
 #define Strlcat(a, b, l)	s_strlcat(a, b, l)
@@ -506,7 +474,6 @@ Char    HISTSUB;		/* auto-substitute character */
 #define Strsave(a)		s_strsave(a)
 #define Strend(a)		s_strend(a)
 #define Strstr(a, b)		s_strstr(a, b)
-#endif
 
 /*
  * setname is a macro to save space (see sh.err.c)
diff --git a/bin/csh/exp.c b/bin/csh/exp.c
index 66fd55fd63d..e36f05d45b4 100644
--- a/bin/csh/exp.c
+++ b/bin/csh/exp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exp.c,v 1.12 2015/02/08 06:09:50 tedu Exp $	*/
+/*	$OpenBSD: exp.c,v 1.13 2015/10/26 15:01:15 naddy Exp $	*/
 /*	$NetBSD: exp.c,v 1.6 1995/03/21 09:02:51 cgd Exp $	*/
 
 /*-
@@ -35,9 +35,6 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <unistd.h>
-#ifndef SHORT_STRINGS
-#include <string.h>
-#endif /* SHORT_STRINGS */
 #include <stdarg.h>
 
 #include "csh.h"
diff --git a/bin/csh/extern.h b/bin/csh/extern.h
index 320aa9f88f9..384711d5d9f 100644
--- a/bin/csh/extern.h
+++ b/bin/csh/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.21 2015/06/17 03:48:21 deraadt Exp $	*/
+/*	$OpenBSD: extern.h,v 1.22 2015/10/26 15:01:15 naddy Exp $	*/
 /*	$NetBSD: extern.h,v 1.8 1996/10/31 23:50:54 christos Exp $	*/
 
 /*-
@@ -210,10 +210,6 @@ char	 *strsave(char *);
 char	 *strspl(char *, char *);
 void	  udvar(Char *);
 
-#ifndef	SHORT_STRINGS
-char	 *strend(char *);
-#endif
-
 /*
  * parse.c
  */
@@ -298,7 +294,6 @@ void *	Calloc(size_t, size_t);
 /*
  * str.c:
  */
-#ifdef SHORT_STRINGS
 size_t	  s_strlcpy(Char *, const Char *, size_t);
 size_t	  s_strlcat(Char *, const Char *, size_t);
 Char	 *s_strchr(Char *, int);
@@ -314,6 +309,5 @@ Char	 *str2short(char *);
 Char	**blk2short(char **);
 char	 *short2str(Char *);
 char	**short2blk(Char **);
-#endif /* SHORT_STRINGS */
 char	 *short2qstr(Char *);
 char	 *vis_str(Char *);
diff --git a/bin/csh/file.c b/bin/csh/file.c
index e297d589db6..49cb46701ae 100644
--- a/bin/csh/file.c
+++ b/bin/csh/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.21 2015/06/17 03:48:21 deraadt Exp $	*/
+/*	$OpenBSD: file.c,v 1.22 2015/10/26 15:01:15 naddy Exp $	*/
 /*	$NetBSD: file.c,v 1.11 1996/11/08 19:34:37 christos Exp $	*/
 
 /*-
@@ -40,9 +40,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
-#ifndef SHORT_STRINGS
-#include <string.h>
-#endif /* SHORT_STRINGS */
 #include <stdarg.h>
 
 #include "csh.h"
diff --git a/bin/csh/func.c b/bin/csh/func.c
index e04439f0db2..fb3c41f1e62 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: func.c,v 1.29 2015/09/27 05:25:00 guenther Exp $       */
+/*    $OpenBSD: func.c,v 1.30 2015/10/26 15:01:15 naddy Exp $       */
 /*    $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $       */
 
 /*-
@@ -918,16 +918,12 @@ dosetenv(Char **v, struct command *t)
 	dohash(NULL, NULL);
     }
     else if (eq(vp, STRLANG) || eq(vp, STRLC_CTYPE)) {
-#ifdef NLS
 	int     k;
 
 	(void) setlocale(LC_ALL, "");
 	for (k = 0200; k <= 0377 && !Isprint(k); k++)
 		continue;
 	AsciiOnly = k > 0377;
-#else
-	AsciiOnly = 0;
-#endif				/* NLS */
     }
     xfree(lp);
 }
@@ -964,17 +960,12 @@ dounsetenv(Char **v, struct command *t)
 		    continue;
 		maxi = 1;
 		if (eq(name, STRLANG) || eq(name, STRLC_CTYPE)) {
-#ifdef NLS
 		    int     k;
 
 		    (void) setlocale(LC_ALL, "");
 		    for (k = 0200; k <= 0377 && !Isprint(k); k++)
 			continue;
 		    AsciiOnly = k > 0377;
-#else
-		    AsciiOnly = getenv("LANG") == NULL &&
-			getenv("LC_CTYPE") == NULL;
-#endif				/* NLS */
 		}
 		/*
 		 * Delete name, and start again cause the environment changes
diff --git a/bin/csh/glob.c b/bin/csh/glob.c
index 426d8c1773f..7b4b54716a4 100644
--- a/bin/csh/glob.c
+++ b/bin/csh/glob.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: glob.c,v 1.18 2015/06/17 03:48:21 deraadt Exp $	*/
+/*	$OpenBSD: glob.c,v 1.19 2015/10/26 15:01:15 naddy Exp $	*/
 /*	$NetBSD: glob.c,v 1.10 1995/03/21 09:03:01 cgd Exp $	*/
 
 /*-
@@ -878,9 +878,7 @@ Gcat(Char *s1, Char *s2)
 int
 sortscmp(const void *a, const void *b)
 {
-#if defined(NLS) && !defined(NOSTRCOLL)
     char    buf[2048];
-#endif
 
     if (!a)			/* check for NULL */
 	return (b ? 1 : 0);
@@ -892,10 +890,6 @@ sortscmp(const void *a, const void *b)
     if (!*(Char **)b)
 	return (-1);
 
-#if defined(NLS) && !defined(NOSTRCOLL)
     (void) strlcpy(buf, short2str(*(Char **)a), sizeof buf);
     return ((int) strcoll(buf, short2str(*(Char **)b)));
-#else
-    return ((int) Strcmp(*(Char **)a, *(Char **)b));
-#endif
 }
diff --git a/bin/csh/misc.c b/bin/csh/misc.c
index 6b55b7133ba..3e932a9d68c 100644
--- a/bin/csh/misc.c
+++ b/bin/csh/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.15 2015/02/08 06:09:50 tedu Exp $	*/
+/*	$OpenBSD: misc.c,v 1.16 2015/10/26 15:01:15 naddy Exp $	*/
 /*	$NetBSD: misc.c,v 1.6 1995/03/21 09:03:09 cgd Exp $	*/
 
 /*-
@@ -157,31 +157,6 @@ strstr(char *s, char *t)
 
 #endif /* NOTUSED */
 
-#ifndef SHORT_STRINGS
-char   *
-strspl(char *cp, char *dp)
-{
-    char   *ep;
-    char *p, *q;
-
-    if (!cp)
-	cp = "";
-    if (!dp)
-	dp = "";
-    for (p = cp; *p++;)
-	continue;
-    for (q = dp; *q++;)
-	continue;
-    ep = xreallocarray(NULL, ((p - cp) + (q - dp) - 1), sizeof(char));
-    for (p = ep, q = cp; *p++ = *q++;)
-	continue;
-    for (p--, q = dp; *p++ = *q++;)
-	continue;
-    return (ep);
-}
-
-#endif
-
 Char  **
 blkspl(Char **up, Char **vp)
 {
@@ -323,19 +298,6 @@ copyblk(Char **v)
     return (blkcpy(nv, v));
 }
 
-#ifndef SHORT_STRINGS
-char   *
-strend(char *cp)
-{
-    if (!cp)
-	return (cp);
-    while (*cp)
-	cp++;
-    return (cp);
-}
-
-#endif /* SHORT_STRINGS */
-
 Char   *
 strip(Char *cp)
 {
diff --git a/bin/csh/set.c b/bin/csh/set.c
index 1477dd0646b..16177a75fac 100644
--- a/bin/csh/set.c
+++ b/bin/csh/set.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: set.c,v 1.16 2015/09/29 20:10:41 guenther Exp $	*/
+/*	$OpenBSD: set.c,v 1.17 2015/10/26 15:01:15 naddy Exp $	*/
 /*	$NetBSD: set.c,v 1.8 1995/03/21 18:35:52 mycroft Exp $	*/
 
 /*-
@@ -32,9 +32,6 @@
 
 #include <sys/types.h>
 #include <stdlib.h>
-#ifndef SHORT_STRINGS
-#include <string.h>
-#endif /* SHORT_STRINGS */
 #include <stdarg.h>
 
 #include "csh.h"
diff --git a/bin/csh/str.c b/bin/csh/str.c
index f5d908c910e..77d0cd37eef 100644
--- a/bin/csh/str.c
+++ b/bin/csh/str.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: str.c,v 1.16 2014/10/16 19:43:31 deraadt Exp $	*/
+/*	$OpenBSD: str.c,v 1.17 2015/10/26 15:01:15 naddy Exp $	*/
 /*	$NetBSD: str.c,v 1.6 1995/03/21 09:03:24 cgd Exp $	*/
 
 /*-
@@ -44,8 +44,6 @@
 #include "csh.h"
 #include "extern.h"
 
-#ifdef SHORT_STRINGS
-
 Char  **
 blk2short(char **src)
 {
@@ -341,7 +339,6 @@ s_strstr(Char *s, Char *t)
     } while (*s++ != '\0');
     return (NULL);
 }
-#endif				/* SHORT_STRINGS */
 
 char   *
 short2qstr(Char *src)