 @@ -1,14 +1,14 @@
-/* $NetBSD */
+/* $NetBSD: cgram.c,v 1.9 2021/02/21 17:16:00 rillig Exp $ */
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by David A. Holland.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -80,27 +80,27 @@ ch_islower(char ch)
 	return islower((unsigned char)ch);
+}
 static bool
 ch_isupper(char ch)
+{
 	return isupper((unsigned char)ch);
+}
 ////////////////////////////////////////////////////////////
 struct stringarray {
 	char **v;
-	int num;
+	size_t num;
 };
 static void
 stringarray_init(struct stringarray *a)
+{
 	a->v = NULL;
 	a->num = 0;
+}
 static void
 stringarray_cleanup(struct stringarray *a)
+{
 	free(a->v);
 @@ -113,27 +113,27 @@ stringarray_add(struct stringarray *a, c
 	if (a->v == NULL) {
 		errx(1, "Out of memory");
+	}
 	a->v[a->num] = xstrdup(s);
 	a->num++;
+}
 ////////////////////////////////////////////////////////////
 static struct stringarray lines;
 static struct stringarray sollines;
 static bool hinting;
 static int scrolldown;
-static unsigned curx;
+static int curx;
 static int cury;
 static void
 readquote(void)
+{
 	FILE *f = popen(_PATH_FORTUNE, "r");
 	if (f == NULL) {
 		err(1, "%s", _PATH_FORTUNE);
+	}
 	char buf[128], buf2[8 * sizeof(buf)];
 	while (fgets(buf, sizeof buf, f) != NULL) {
 		char *s = strrchr(buf, '\n');
 @@ -157,96 +157,93 @@ readquote(void)
 		buf2[j] = '\0';
 		stringarray_add(&lines, buf2);
 		stringarray_add(&sollines, buf2);
+	}
 	pclose(f);
+}
 static void
 encode(void)
+{
 	int key[26];
 	for (int i = 0; i < 26; i++)
 		key[i] = i;
 	for (int i = 26; i > 1; i--) {
-		int c = random() % i;
+		int c = (int)(random() % i);
 		int t = key[i - 1];
 		key[i - 1] = key[c];
 		key[c] = t;
+	}
-	for (int y = 0; y < lines.num; y++) {
+	for (int y = 0; y < (int)lines.num; y++) {
-		for (unsigned x = 0; lines.v[y][x] != '\0'; x++) {
+		for (char *p = lines.v[y]; *p != '\0'; p++) {
-			if (ch_islower(lines.v[y][x])) {
+			if (ch_islower(*p))
-				int q = lines.v[y][x] - 'a';
+				*p = (char)('a' + key[*p - 'a']);
-				lines.v[y][x] = 'a' + key[q];
+			if (ch_isupper(*p))
 				*p = (char)('A' + key[*p - 'A']);
 			if (ch_isupper(lines.v[y][x])) {
 				int q = lines.v[y][x] - 'A';
 				lines.v[y][x] = 'A' + key[q];
+		}
+	}
+}
 static bool
-substitute(int ch)
+substitute(char ch)
+{
-	assert(cury >= 0 && cury < lines.num);
+	assert(cury >= 0 && cury < (int)lines.num);
-	if (curx >= strlen(lines.v[cury])) {
+	if (curx >= (int)strlen(lines.v[cury])) {
 		beep();
 		return false;
+	}
 	char och = lines.v[cury][curx];
 	if (!ch_isalpha(och)) {
 		beep();
 		return false;
+	}
 	char loch = ch_tolower(och);
 	char uoch = ch_toupper(och);
 	char lch = ch_tolower(ch);
 	char uch = ch_toupper(ch);
-	for (int y = 0; y < lines.num; y++) {
+	for (int y = 0; y < (int)lines.num; y++) {
-		for (unsigned x = 0; lines.v[y][x] != '\0'; x++) {
+		for (char *p = lines.v[y]; *p != '\0'; p++) {
-			if (lines.v[y][x] == loch) {
+			if (*p == loch)
-				lines.v[y][x] = lch;
+				*p = lch;
-			} else if (lines.v[y][x] == uoch) {
+			else if (*p == uoch)
-				lines.v[y][x] = uch;
+				*p = uch;
-			} else if (lines.v[y][x] == lch) {
+			else if (*p == lch)
-				lines.v[y][x] = loch;
+				*p = loch;
-			} else if (lines.v[y][x] == uch) {
+			else if (*p == uch)
-				lines.v[y][x] = uoch;
+				*p = uoch;
+		}
+	}
 	return true;
+}
 ////////////////////////////////////////////////////////////
 static void
 redraw(void)
+{
 	erase();
 	bool won = true;
 	for (int i = 0; i < LINES - 1; i++) {
 		move(i, 0);
 		int ln = i + scrolldown;
-		if (ln < lines.num) {
+		if (ln < (int)lines.num) {
 			for (unsigned j = 0; lines.v[i][j] != '\0'; j++) {
 				char ch = lines.v[i][j];
 				if (ch != sollines.v[i][j] && ch_isalpha(ch)) {
 					won = false;
+				}
 				bool bold = false;
 				if (hinting && ch == sollines.v[i][j] &&
 				    ch_isalpha(ch)) {
 					bold = true;
 					attron(A_BOLD);
+				}
 				addch(lines.v[i][j]);
 				if (bold) {
 @@ -294,110 +291,110 @@ loop(void)
 		redraw();
 		int ch = getch();
 		switch (ch) {
 		case 1:		/* ^A */
 		case KEY_HOME:
 			curx = 0;
 			break;
 		case 2:		/* ^B */
 		case KEY_LEFT:
 			if (curx > 0) {
 				curx--;
 			} else if (cury > 0) {
 				cury--;
-				curx = strlen(lines.v[cury]);
+				curx = (int)strlen(lines.v[cury]);
+			}
 			break;
 		case 5:		/* ^E */
 		case KEY_END:
-			curx = strlen(lines.v[cury]);
+			curx = (int)strlen(lines.v[cury]);
 			break;
 		case 6:		/* ^F */
 		case KEY_RIGHT:
-			if (curx < strlen(lines.v[cury])) {
+			if (curx < (int)strlen(lines.v[cury])) {
 				curx++;
-			} else if (cury < lines.num - 1) {
+			} else if (cury < (int)lines.num - 1) {
 				cury++;
 				curx = 0;
+			}
 			break;
 		case 12:	/* ^L */
 			clear();
 			break;
 		case 14:	/* ^N */
 		case KEY_DOWN:
-			if (cury < lines.num - 1) {
+			if (cury < (int)lines.num - 1) {
 				cury++;
+			}
-			if (curx > strlen(lines.v[cury])) {
+			if (curx > (int)strlen(lines.v[cury])) {
-				curx = strlen(lines.v[cury]);
+				curx = (int)strlen(lines.v[cury]);
+			}
 			if (scrolldown < cury - (LINES - 2)) {
 				scrolldown = cury - (LINES - 2);
+			}
 			break;
 		case 16:	/* ^P */
 		case KEY_UP:
 			if (cury > 0) {
 				cury--;
+			}
-			if (curx > strlen(lines.v[cury])) {
+			if (curx > (int)strlen(lines.v[cury])) {
-				curx = strlen(lines.v[cury]);
+				curx = (int)strlen(lines.v[cury]);
+			}
 			if (scrolldown > cury) {
 				scrolldown = cury;
+			}
 			break;
 		case '*':
 			hinting = !hinting;
 			break;
 		case '~':
 			done = true;
 			break;
 		default:
-			if (isascii(ch) && isalpha(ch)) {
+			if (isascii(ch) && ch_isalpha((char)ch)) {
-				if (substitute(ch)) {
+				if (substitute((char)ch)) {
-					if (curx < strlen(lines.v[cury])) {
+					if (curx < (int)strlen(lines.v[cury])) {
 						curx++;
+					}
-					if (curx == strlen(lines.v[cury]) &&
+					if (curx == (int)strlen(lines.v[cury]) &&
-					    cury < lines.num - 1) {
+					    cury < (int)lines.num - 1) {
 						curx = 0;
 						cury++;
+					}
+				}
-			} else if (curx < strlen(lines.v[cury]) &&
+			} else if (curx < (int)strlen(lines.v[cury]) &&
 			    ch == lines.v[cury][curx]) {
 				curx++;
-				if (curx == strlen(lines.v[cury]) &&
+				if (curx == (int)strlen(lines.v[cury]) &&
-				    cury < lines.num - 1) {
+				    cury < (int)lines.num - 1) {
 					curx = 0;
 					cury++;
+				}
 			} else {
 				beep();
+			}
 			break;
+		}
+	}
+}
 ////////////////////////////////////////////////////////////
 int
 main(void)
+{
 	stringarray_init(&lines);
 	stringarray_init(&sollines);
-	srandom(time(NULL));
+	srandom((unsigned int)time(NULL));
 	readquote();
 	encode();
 	opencurses();
 	keypad(stdscr, true);
 	loop();
 	closecurses();
 	stringarray_cleanup(&sollines);
 	stringarray_cleanup(&lines);
+}

 @@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2021/02/21 16:05:44 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2021/02/21 17:16:00 rillig Exp $
 PROG=		cgram
 DPADD=		${LIBCURSES} ${LIBTERMINFO}
 LDADD=		-lcurses -lterminfo
 SRCS=		cgram.c
 MAN=		cgram.6
 HIDEGAME=	hidegame
 LINTFLAGS+=	-T
 WARNS=		6
 .include <bsd.prog.mk>