src/npc.c

@@ -30,8 +30,11 @@ int usage(char *s) {
 
 int main(int argc, char *argv[]) {
 	int c;
-	char showend = 0; /* print a dollar sign before each newline */
+	char showend;
-	char showtab = 0; /* prints tab characters in caret notation */
+	char showtab;
+
+	showend = 0;
+	showtab = 0;
 
 	if (argc > 0) {
 		while ((c = getopt(argc, argv, "et")) != -1) {
@@ -49,7 +52,7 @@ int main(int argc, char *argv[]) {
 		if ((c & 0x80) != 0) { fputs("M-", stdout); }
 
 		switch (c ^ 0x80) { /* 0b 1000 0000 */ 
-			case 0x7f: fputs("^?", stdout); break; /* delete character */
+			case 0x7f: fputs("^?", stdout); break;
 			case '\n': if (showend) { putc('$', stdout); }
 			default:
 				if (c >= ' ' || c == '\n' || (!showtab && c == '\t')) {

src/str.c

@@ -50,32 +50,26 @@ int main(int argc, char *argv[]){
 	int r;
 
 	if(argc >= 3){
-		for (ctype = 0; ctype < (sizeof ctypes) / (sizeof *ctypes); ++ctype) {
+		for(ctype = 0; ctype < (sizeof ctypes) / (sizeof *ctypes);
-			if(strcmp(argv[1], ctypes[ctype].name) == 0) {
+				++ctype)
+			if(strcmp(argv[1], ctypes[ctype].name) == 0)
 				goto pass;
 	}
-		}
-	}
 
-	fprintf(
+	fprintf(stderr, "Usage: %s type string...\n",
-		stderr,
+		argv[0] == NULL ? program_name : argv[0]);
-		"Usage: %s type string...\n",
-		argv[0] == NULL ? program_name : argv[0]
-	);
 
 	return EX_USAGE;
 
-pass:	for (argv += 2, r = 1; *argv != NULL; ++argv) {
+pass:	for(argv += 2, r = 1; *argv != NULL; ++argv)
-		for (i = 0; argv[0][i] != '\0'; ++i) {
+		for(i = 0; argv[0][i] != '\0'; ++i)
 			/* First checks if argv[0][i] is valid ASCII; ctypes(3)
 			 * don't handle non-ASCII.
 			 * This is bad. */
-			if(
+			if((unsigned char)argv[0][i] < 0x80 && !ctypes[ctype].f(argv[0][i]))
-				(unsigned char)argv[0][i] < 0x80 && !ctypes[ctype].f(argv[0][i])
+				return 1;
-			) { return 1; }
+			else
-			else { r = 0; }
+				r = 0;
-		}
-	}
 
 	return r;
 }

src/strcmp.c

@@ -37,10 +37,8 @@ int main(int argc, char *argv[]) {
 
 	for (; *argv[1] != '\0'; ++argv[1]) {
 		for (i = 2; i < argc; ++i) {
-			/* a former string has a greater byte value */
 			if (*argv[i-1] > *argv[i]) {
 				return 1;
-			/* a latter string has a greater byte value */
 			} else if (*argv[i-1] < *argv[i]++) {
 				return -1; /* actually 255 */
 			}