Module Name: src
Committed By: rillig
Date: Sun Feb 21 15:41:04 UTC 2021
Modified Files:
src/games/cgram: cgram.c
Log Message:
cgram: indent
With manual corrections afterwards:
- indent removes empty lines between statement and declaration. This
had been a syntax error in C90, since C99 this is common style and
should be accepted by indent.
- indent didn't format the first line of main for whatever reason, did
that manually.
- indent removed the empty line above the '/////' separators. It should
have left these empty lines as-is.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/games/cgram/cgram.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/cgram/cgram.c
diff -u src/games/cgram/cgram.c:1.3 src/games/cgram/cgram.c:1.4
--- src/games/cgram/cgram.c:1.3 Sun Feb 21 13:35:37 2021
+++ src/games/cgram/cgram.c Sun Feb 21 15:41:04 2021
@@ -1,3 +1,5 @@
+/* $NetBSD */
+
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -39,40 +41,48 @@
////////////////////////////////////////////////////////////
-static char *xstrdup(const char *s) {
- char *ret;
-
- ret = malloc(strlen(s) + 1);
- if (ret == NULL) {
- errx(1, "Out of memory");
- }
- strcpy(ret, s);
- return ret;
+static char *
+xstrdup(const char *s)
+{
+ char *ret;
+
+ ret = malloc(strlen(s) + 1);
+ if (ret == NULL) {
+ errx(1, "Out of memory");
+ }
+ strcpy(ret, s);
+ return ret;
}
////////////////////////////////////////////////////////////
struct stringarray {
- char **v;
- int num;
+ char **v;
+ int num;
};
-static void stringarray_init(struct stringarray *a) {
- a->v = NULL;
- a->num = 0;
-}
-
-static void stringarray_cleanup(struct stringarray *a) {
- free(a->v);
-}
-
-static void stringarray_add(struct stringarray *a, const char *s) {
- a->v = realloc(a->v, (a->num + 1) * sizeof(a->v[0]));
- if (a->v == NULL) {
- errx(1, "Out of memory");
- }
- a->v[a->num] = xstrdup(s);
- a->num++;
+static void
+stringarray_init(struct stringarray *a)
+{
+ a->v = NULL;
+ a->num = 0;
+}
+
+static void
+stringarray_cleanup(struct stringarray *a)
+{
+ free(a->v);
+}
+
+static void
+stringarray_add(struct stringarray *a, const char *s)
+{
+ a->v = realloc(a->v, (a->num + 1) * sizeof(a->v[0]));
+ if (a->v == NULL) {
+ errx(1, "Out of memory");
+ }
+ a->v[a->num] = xstrdup(s);
+ a->num++;
}
////////////////////////////////////////////////////////////
@@ -84,265 +94,279 @@ static int scrolldown;
static unsigned curx;
static int cury;
-static void readquote(void) {
- FILE *f = popen(_PATH_FORTUNE, "r");
- if (!f) {
- err(1, "%s", _PATH_FORTUNE);
- }
-
- char buf[128], buf2[8*sizeof(buf)];
- while (fgets(buf, sizeof(buf), f)) {
- char *s = strrchr(buf, '\n');
- assert(s);
- assert(strlen(s)==1);
- *s = 0;
-
- int i,j;
- for (i=j=0; buf[i]; i++) {
- if (buf[i]=='\t') {
- buf2[j++] = ' ';
- while (j%8) buf2[j++] = ' ';
- }
- else if (buf[i]=='\b') {
- if (j>0) j--;
- }
- else {
- buf2[j++] = buf[i];
- }
- }
- 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 t = key[i-1];
- key[i-1] = key[c];
- key[c] = t;
- }
-
- for (int y=0; y<lines.num; y++) {
- for (unsigned x=0; lines.v[y][x]; x++) {
- if (islower((unsigned char)lines.v[y][x])) {
- int q = lines.v[y][x]-'a';
- lines.v[y][x] = 'a'+key[q];
- }
- if (isupper((unsigned char)lines.v[y][x])) {
- int q = lines.v[y][x]-'A';
- lines.v[y][x] = 'A'+key[q];
- }
- }
- }
-}
-
-static int substitute(int ch) {
- assert(cury>=0 && cury<lines.num);
- if (curx >= strlen(lines.v[cury])) {
- beep();
- return -1;
- }
-
- int och = lines.v[cury][curx];
- if (!isalpha((unsigned char)och)) {
- beep();
- return -1;
- }
-
- int loch = tolower((unsigned char)och);
- int uoch = toupper((unsigned char)och);
- int lch = tolower((unsigned char)ch);
- int uch = toupper((unsigned char)ch);
-
- for (int y=0; y<lines.num; y++) {
- for (unsigned x=0; lines.v[y][x]; x++) {
- if (lines.v[y][x]==loch) {
- lines.v[y][x] = lch;
- }
- else if (lines.v[y][x]==uoch) {
- lines.v[y][x] = uch;
- }
- else if (lines.v[y][x]==lch) {
- lines.v[y][x] = loch;
- }
- else if (lines.v[y][x]==uch) {
- lines.v[y][x] = uoch;
- }
- }
- }
- return 0;
+static void
+readquote(void)
+{
+ FILE *f = popen(_PATH_FORTUNE, "r");
+ if (!f) {
+ err(1, "%s", _PATH_FORTUNE);
+ }
+
+ char buf[128], buf2[8 * sizeof(buf)];
+ while (fgets(buf, sizeof(buf), f)) {
+ char *s = strrchr(buf, '\n');
+ assert(s);
+ assert(strlen(s) == 1);
+ *s = 0;
+
+ int i, j;
+ for (i = j = 0; buf[i]; i++) {
+ if (buf[i] == '\t') {
+ buf2[j++] = ' ';
+ while (j % 8)
+ buf2[j++] = ' ';
+ } else if (buf[i] == '\b') {
+ if (j > 0)
+ j--;
+ } else {
+ buf2[j++] = buf[i];
+ }
+ }
+ 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 t = key[i - 1];
+ key[i - 1] = key[c];
+ key[c] = t;
+ }
+
+ for (int y = 0; y < lines.num; y++) {
+ for (unsigned x = 0; lines.v[y][x]; x++) {
+ if (islower((unsigned char)lines.v[y][x])) {
+ int q = lines.v[y][x] - 'a';
+ lines.v[y][x] = 'a' + key[q];
+ }
+ if (isupper((unsigned char)lines.v[y][x])) {
+ int q = lines.v[y][x] - 'A';
+ lines.v[y][x] = 'A' + key[q];
+ }
+ }
+ }
+}
+
+static int
+substitute(int ch)
+{
+ assert(cury >= 0 && cury < lines.num);
+ if (curx >= strlen(lines.v[cury])) {
+ beep();
+ return -1;
+ }
+
+ int och = lines.v[cury][curx];
+ if (!isalpha((unsigned char)och)) {
+ beep();
+ return -1;
+ }
+
+ int loch = tolower((unsigned char)och);
+ int uoch = toupper((unsigned char)och);
+ int lch = tolower((unsigned char)ch);
+ int uch = toupper((unsigned char)ch);
+
+ for (int y = 0; y < lines.num; y++) {
+ for (unsigned x = 0; lines.v[y][x]; x++) {
+ if (lines.v[y][x] == loch) {
+ lines.v[y][x] = lch;
+ } else if (lines.v[y][x] == uoch) {
+ lines.v[y][x] = uch;
+ } else if (lines.v[y][x] == lch) {
+ lines.v[y][x] = loch;
+ } else if (lines.v[y][x] == uch) {
+ lines.v[y][x] = uoch;
+ }
+ }
+ }
+ return 0;
}
////////////////////////////////////////////////////////////
-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) {
- for (unsigned j=0; lines.v[i][j]; j++) {
- int ch = lines.v[i][j];
- if (ch != sollines.v[i][j] && isalpha((unsigned char)ch)) {
- won = false;
- }
- bool bold=false;
- if (hinting && ch==sollines.v[i][j] &&
- isalpha((unsigned char)ch)) {
- bold = true;
- attron(A_BOLD);
- }
- addch(lines.v[i][j]);
- if (bold) {
- attroff(A_BOLD);
- }
- }
- }
- clrtoeol();
- }
-
- move(LINES-1, 0);
- if (won) {
- addstr("*solved* ");
- }
- addstr("~ to quit, * to cheat, ^pnfb to move");
-
- move(LINES-1, 0);
-
- move(cury-scrolldown, curx);
-
- refresh();
-}
-
-static void opencurses(void) {
- initscr();
- cbreak();
- noecho();
-}
-
-static void closecurses(void) {
- endwin();
+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) {
+ for (unsigned j = 0; lines.v[i][j]; j++) {
+ int ch = lines.v[i][j];
+ if (ch != sollines.v[i][j] &&
+ isalpha((unsigned char)ch)) {
+ won = false;
+ }
+ bool bold = false;
+ if (hinting && ch == sollines.v[i][j] &&
+ isalpha((unsigned char)ch)) {
+ bold = true;
+ attron(A_BOLD);
+ }
+ addch(lines.v[i][j]);
+ if (bold) {
+ attroff(A_BOLD);
+ }
+ }
+ }
+ clrtoeol();
+ }
+
+ move(LINES - 1, 0);
+ if (won) {
+ addstr("*solved* ");
+ }
+ addstr("~ to quit, * to cheat, ^pnfb to move");
+
+ move(LINES - 1, 0);
+
+ move(cury - scrolldown, curx);
+
+ refresh();
+}
+
+static void
+opencurses(void)
+{
+ initscr();
+ cbreak();
+ noecho();
+}
+
+static void
+closecurses(void)
+{
+ endwin();
}
////////////////////////////////////////////////////////////
-static void loop(void) {
- bool done=false;
- while (!done) {
- 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]);
- }
- break;
- case 5: /* ^E */
- case KEY_END:
- curx = strlen(lines.v[cury]);
- break;
- case 6: /* ^F */
- case KEY_RIGHT:
- if (curx < strlen(lines.v[cury])) {
- curx++;
- }
- else if (cury < lines.num - 1) {
- cury++;
- curx = 0;
- }
- break;
- case 12: /* ^L */
- clear();
- break;
- case 14: /* ^N */
- case KEY_DOWN:
- if (cury < lines.num-1) {
- cury++;
- }
- if (curx > strlen(lines.v[cury])) {
- curx = 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])) {
- curx = strlen(lines.v[cury]);
- }
- if (scrolldown > cury) {
- scrolldown = cury;
- }
- break;
- case '*':
- hinting = !hinting;
- break;
- case '~':
- done = true;
- break;
- default:
- if (isalpha(ch)) {
- if (!substitute(ch)) {
- if (curx < strlen(lines.v[cury])) {
- curx++;
- }
- if (curx==strlen(lines.v[cury]) && cury < lines.num-1) {
- curx=0;
- cury++;
- }
- }
- }
- else if (curx < strlen(lines.v[cury]) && ch==lines.v[cury][curx]) {
- curx++;
- if (curx==strlen(lines.v[cury]) && cury < lines.num-1) {
- curx=0;
- cury++;
- }
- }
- else {
- beep();
- }
- break;
- }
- }
+static void
+loop(void)
+{
+ bool done = false;
+ while (!done) {
+ 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]);
+ }
+ break;
+ case 5: /* ^E */
+ case KEY_END:
+ curx = strlen(lines.v[cury]);
+ break;
+ case 6: /* ^F */
+ case KEY_RIGHT:
+ if (curx < strlen(lines.v[cury])) {
+ curx++;
+ } else if (cury < lines.num - 1) {
+ cury++;
+ curx = 0;
+ }
+ break;
+ case 12: /* ^L */
+ clear();
+ break;
+ case 14: /* ^N */
+ case KEY_DOWN:
+ if (cury < lines.num - 1) {
+ cury++;
+ }
+ if (curx > strlen(lines.v[cury])) {
+ curx = 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])) {
+ curx = strlen(lines.v[cury]);
+ }
+ if (scrolldown > cury) {
+ scrolldown = cury;
+ }
+ break;
+ case '*':
+ hinting = !hinting;
+ break;
+ case '~':
+ done = true;
+ break;
+ default:
+ if (isalpha(ch)) {
+ if (!substitute(ch)) {
+ if (curx < strlen(lines.v[cury])) {
+ curx++;
+ }
+ if (curx == strlen(lines.v[cury]) &&
+ cury < lines.num - 1) {
+ curx = 0;
+ cury++;
+ }
+ }
+ } else if (curx < strlen(lines.v[cury]) &&
+ ch == lines.v[cury][curx]) {
+ curx++;
+ if (curx == strlen(lines.v[cury]) &&
+ cury < lines.num - 1) {
+ curx = 0;
+ cury++;
+ }
+ } else {
+ beep();
+ }
+ break;
+ }
+ }
}
////////////////////////////////////////////////////////////
-int main(void) {
- stringarray_init(&lines);
- stringarray_init(&sollines);
- srandom(time(NULL));
- readquote();
- encode();
- opencurses();
-
- keypad(stdscr, TRUE);
- loop();
-
- closecurses();
- stringarray_cleanup(&sollines);
- stringarray_cleanup(&lines);
- return 0;
+int
+main(void)
+{
+
+ stringarray_init(&lines);
+ stringarray_init(&sollines);
+ srandom(time(NULL));
+ readquote();
+ encode();
+ opencurses();
+
+ keypad(stdscr, TRUE);
+ loop();
+
+ closecurses();
+ stringarray_cleanup(&sollines);
+ stringarray_cleanup(&lines);
}
