Merge branch 'experimental'

Author: fsaadatmand

chapter05/5-19.c

@@ -60,7 +60,7 @@ int needsParens()
 void undcl(void)
 {
 	int type;
-	char temp[MAXTOKEN];
+	char temp[MAXLEN];
 
 	while ((type = gettoken()) != '\n')
 		if (type == PARENS || type == BRACKETS)

chapter07/7-6.c

@@ -34,6 +34,7 @@ void openfile(const char *filename, File *file)
 		exit(EXIT_FAILURE);
 	}
 	strcpy(file->name, filename);
+	*file->line = '\0';
 	file->lineno = 0;
 }
 

chapter07/7-7.c

@@ -4,24 +4,24 @@
  * the standard input. Should the file name be printed when a matching line is
  * found?
  *
- * Answer: of course!
- *
  * By Faisal Saadatmand
  */
 
+ /* Answer: only when files are named as arguments */
+
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
-#define MAXLINE 1000
+#define MAXLEN 1000
 
 /* globals */
-char *progName;
+char *prog;  /* program name */
 
 /* functions */
 int getLine(char *, size_t, FILE *);
 FILE* loadFile(char *);
-int findPattern(FILE *, char *, char *, int, int);
+int findPattern(FILE *, const char *, const char *, const int, const int);
 
 /* getLine: read line, return length - file pointer version */
 int getLine(char *line, size_t max, FILE *fp)
@@ -35,38 +35,44 @@ FILE* loadFile(char *fileName)
 {
 	FILE* fp;
 	if (!(fp = fopen(fileName, "r"))) {
-		fprintf(stderr, "%s: can't open %s\n", progName, fileName);
+		fprintf(stderr, "%s: can't open %s\n", prog, fileName);
 		exit(EXIT_FAILURE);
 	}
 	return fp;
 }
 
-int findPattern(FILE *fp, char *fileName, char *pattern, int except, int number)
+int findPattern(FILE *fp, const char *fileName, const char *pattern,
+		const int except, const int number)
 {
-	char line[MAXLINE];
-	long int lineno, found = 0;
+	char line[MAXLEN];
+	long lineno;
+	int found;
 
-	for (lineno = 1; getLine(line, MAXLINE, fp) > 0; lineno++)
+	lineno = found = 0;
+	while (getLine(line, MAXLEN, fp) > 0) {
+		++lineno;
 		if ((strstr(line, pattern) != NULL) != except) {
 			if (fileName)
-				printf("%s:", fileName);
+				fprintf(stdout, "%s:", fileName);
 			if (number)
-				printf ("%ld:", lineno);
-			printf("%s", line);
-			found++;
+				fprintf (stdout, "%ld:", lineno);
+			fprintf(stdout, "%s", line);
+			++found;
 		}
+	}
 	return found;
 }
 
 /* find: print lines that match pattern from 1s arg */
 int main(int argc, char *argv[])
 {
-	int c, except = 0, number = 0, found = 0;
-	char *pattern = NULL;
-	FILE *file = NULL;
+	int c, except, number, found;
+	char *pattern;
+	FILE *file;
 
-	progName = argv[0];
-	while (--argc > 0 && (*++argv)[0] == '-')    /* check for flags */
+	prog = argv[0];
+	except = number = found = 0;
+	while (--argc > 0 && (*++argv)[0] == '-')  /* check for flags */
 		while ((c = *++argv[0]))
 			switch (c) {
 			case 'x':
@@ -76,20 +82,19 @@ int main(int argc, char *argv[])
 				number = 1;
 				break;
 			default:
-				printf("%s: illegal option %c\n", progName, c);
+				fprintf(stderr, "%s: illegal option %c\n", prog, c);
 				argc = 0;
 				found = -1;
 				break;
 			}
-
-	pattern = *argv;                   /* save a pointer to the pattern */
+	pattern = *argv++;          /* save a pointer to the pattern */
 	if (argc < 1)
-		printf("Usage: %s -x -n pattern\n", progName);
-	else if (argc == 1)                /* input from stdin */
+		fprintf(stderr, "Usage: %s [-xn] PATTERN [FILE...]\n", prog);
+	else if (argc == 1)         /* input from stdin */
 		found += findPattern(stdin, NULL, pattern, except, number);
-	else                               /* input from file or set of files */
+	else                        /* input from file or set of files */
 		while (argc-- > 1) {
-			file = loadFile(*++argv);
+			file = loadFile(*argv++);
 			found += findPattern(file, *argv, pattern, except, number);
 			fclose(file);
 		}

chapter08/8-1.c

@@ -2,10 +2,12 @@
  * Exercise 8-1. Rewrite the program cat from Chapter 7 using read, write, open
  * and close instead of their standard library equivalents. Perform experiments
  * to determine the relative speeds of the two version.
- * Note: this version of cat is faster.
+ *
  * By Faisal Saadatmand
  */
 
+ /* Note: this version of cat is faster */
+
 #include <unistd.h>                    /* for read and write */
 #include <fcntl.h>                     /* for open and close */
 #include <stdio.h>                     /* also needed for BUFSIZ */

chapter08/8-2.c

@@ -1,6 +1,7 @@
 /*
  * Exercise 8-2. Rewrite fopen and _fillbuf with fields instead of explicit bit
  * operations. Compare code size and execution speed.
+ *
  * By Faisal Saadatmand
  */
 

chapter08/8-8.c

@@ -195,8 +195,8 @@ int main(void)
 		printf("*** Add array's memory block to free list ***\n");
 		nblocks++;
 		for (p = &base, i = 1; i <= nblocks; p = p->s.ptr, i++)
-			printf("block %i (address: %p size: %u ptr: %p)\n"
-					, i, p, p->s.size, p->s.ptr);
+			printf("block %i (address: %p size: %u ptr: %p)\n", i, (void *) p,
+					p->s.size, (void *) p->s.ptr);
 		printf("\n");
 	}
 
@@ -206,8 +206,8 @@ int main(void)
 	else {
 		printf("*** allocate freed memory with knr_malloc ***\n");
 		for (p = &base, i = 1; i <= nblocks; p = p->s.ptr, i++)
-			printf("block %i (address: %p size: %u ptr: %p)\n"
-					, i, p, p->s.size, p->s.ptr);
+			printf("block %i (address: %p size: %u ptr: %p)\n", i, (void *) p,
+					p->s.size, (void *) p->s.ptr);
 		printf("\n");
 	}