knf and other cleanup; ok otto

1 files changed, 305 insertions, 302 deletions

diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c
index a4cd46bc28b..ecea07e9c7b 100644
--- a/usr.bin/patch/inp.c
+++ b/usr.bin/patch/inp.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: inp.c,v 1.11 2003/07/18 02:00:09 deraadt Exp $	*/
+/* $OpenBSD: inp.c,v 1.12 2003/07/21 14:00:41 deraadt Exp $	 */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: inp.c,v 1.11 2003/07/18 02:00:09 deraadt Exp $";
-#endif /* not lint */
+static char     rcsid[] = "$OpenBSD: inp.c,v 1.12 2003/07/21 14:00:41 deraadt Exp $";
+#endif				/* not lint */
 
 #include "EXTERN.h"
 #include "common.h"
@@ -11,362 +11,365 @@ static char rcsid[] = "$OpenBSD: inp.c,v 1.11 2003/07/18 02:00:09 deraadt Exp $"
 #include "INTERN.h"
 #include "inp.h"
 
-extern bool check_only;
+extern bool     check_only;
 
 /* Input-file-with-indexable-lines abstract type */
 
-static off_t i_size;			/* size of the input file */
-static char *i_womp;			/* plan a buffer for entire file */
-static char **i_ptr;			/* pointers to lines in i_womp */
+static off_t	i_size;		/* size of the input file */
+static char	*i_womp;	/* plan a buffer for entire file */
+static char	**i_ptr;	/* pointers to lines in i_womp */
 
-static int tifd = -1;			/* plan b virtual string array */
-static char *tibuf[2];			/* plan b buffers */
-static LINENUM tiline[2] = {-1, -1};	/* 1st line in each buffer */
-static LINENUM lines_per_buf;		/* how many lines per buffer */
-static int tireclen;			/* length of records in tmp file */
+static int	tifd = -1;	/* plan b virtual string array */
+static char	*tibuf[2];	/* plan b buffers */
+static LINENUM	tiline[2] = {-1, -1};	/* 1st line in each buffer */
+static LINENUM	lines_per_buf;	/* how many lines per buffer */
+static int	tireclen;	/* length of records in tmp file */
 
-void re_input(void);
+void		re_input(void);
 
 /* New patch--prepare to edit another file. */
 
 void
 re_input(void)
 {
-    if (using_plan_a) {
-	i_size = 0;
+	if (using_plan_a) {
+		i_size = 0;
 #ifndef lint
-	if (i_ptr != Null(char**))
-	    free((char *)i_ptr);
+		if (i_ptr != Null(char **))
+			free((char *) i_ptr);
 #endif
-	if (i_womp != Nullch)
-	    free(i_womp);
-	i_womp = Nullch;
-	i_ptr = Null(char **);
-    }
-    else {
-	using_plan_a = TRUE;		/* maybe the next one is smaller */
-	close(tifd);
-	tifd = -1;
-	free(tibuf[0]);
-	free(tibuf[1]);
-	tibuf[0] = tibuf[1] = Nullch;
-	tiline[0] = tiline[1] = -1;
-	tireclen = 0;
-    }
+		if (i_womp != Nullch)
+			free(i_womp);
+		i_womp = Nullch;
+		i_ptr = Null(char **);
+	} else {
+		using_plan_a = TRUE;	/* maybe the next one is smaller */
+		close(tifd);
+		tifd = -1;
+		free(tibuf[0]);
+		free(tibuf[1]);
+		tibuf[0] = tibuf[1] = Nullch;
+		tiline[0] = tiline[1] = -1;
+		tireclen = 0;
+	}
 }
 
 /* Constuct the line index, somehow or other. */
 
 void
-scan_input(filename)
-char *filename;
+scan_input(char *filename)
 {
-    if (!plan_a(filename))
-	plan_b(filename);
-    if (verbose) {
-	say("Patching file %s using Plan %s...\n", filename,
-	  (using_plan_a ? "A" : "B") );
-    }
+	if (!plan_a(filename))
+		plan_b(filename);
+	if (verbose) {
+		say("Patching file %s using Plan %s...\n", filename,
+		    (using_plan_a ? "A" : "B"));
+	}
 }
 
 /* Try keeping everything in memory. */
 
 bool
-plan_a(filename)
-char *filename;
+plan_a(char *filename)
 {
-    int ifd, statfailed;
-    char *s;
-    LINENUM iline;
-    char lbuf[MAXLINELEN];
+	int	ifd, statfailed;
+	char	*s, lbuf[MAXLINELEN];
+	LINENUM	iline;
 
-    if (!filename || *filename == '\0')
-	return FALSE;
+	if (!filename || *filename == '\0')
+		return FALSE;
 
-    statfailed = stat(filename, &filestat);
-    if (statfailed && ok_to_create_file) {
-	if (verbose)
-	    say("(Creating file %s...)\n",filename);
-	    /* in check_patch case, we still display `Creating file' even
-	       though we're not. The rule is that -C should be as similar
-	       to normal patch behavior as possible
-	     */
-	if (check_only)
-	    return TRUE;
-	makedirs(filename, TRUE);
-	close(creat(filename, 0666));
 	statfailed = stat(filename, &filestat);
-    }
-    if (statfailed && check_only)
-        fatal("%s not found, -C mode, can't probe further\n", filename);
-    /* For nonexistent or read-only files, look for RCS or SCCS versions.  */
-    if (statfailed
-	/* No one can write to it.  */
-	|| (filestat.st_mode & 0222) == 0
-	/* I can't write to it.  */
-	|| ((filestat.st_mode & 0022) == 0 && filestat.st_uid != myuid)) {
-	struct stat cstat;
-	char *cs = Nullch;
-	char *filebase, *filedir;
-
-	filebase = basename(filename);
-	filedir = dirname(filename);
-
-	/* Leave room in lbuf for the diff command.  */
-	s = lbuf + 20;
-
-#define try(f, a1, a2, a3) (snprintf(s, sizeof lbuf - 20, f, a1, a2, a3), stat(s, &cstat) == 0)
-	if (   try("%s/RCS/%s%s", filedir, filebase, RCSSUFFIX)
-	    || try("%s/RCS/%s%s", filedir, filebase,         "")
-	    || try(    "%s/%s%s", filedir, filebase, RCSSUFFIX)) {
-	    snprintf(buf, sizeof buf, CHECKOUT, filename);
-	    snprintf(lbuf, sizeof lbuf, RCSDIFF, filename);
-	    cs = "RCS";
-	} else if (   try("%s/SCCS/%s%s", filedir, SCCSPREFIX, filebase)
-		   || try(     "%s/%s%s", filedir, SCCSPREFIX, filebase)) {
-	    snprintf(buf, sizeof buf, GET, s);
-	    snprintf(lbuf, sizeof lbuf, SCCSDIFF, s, filename);
-	    cs = "SCCS";
-	} else if (statfailed)
-	    fatal("can't find %s\n", filename);
-	/* else we can't write to it but it's not under a version
-	   control system, so just proceed.  */
-	if (cs) {
-	    if (!statfailed) {
-		if ((filestat.st_mode & 0222) != 0)
-		    /* The owner can write to it.  */
-		    fatal("file %s seems to be locked by somebody else under %s\n",
-			   filename, cs);
-		/* It might be checked out unlocked.  See if it's safe to
-		   check out the default version locked.  */
+	if (statfailed && ok_to_create_file) {
 		if (verbose)
-		    say("Comparing file %s to default %s version...\n",
-			 filename, cs);
-		if (system(lbuf))
-		    fatal("can't check out file %s: differs from default %s version\n",
-			   filename, cs);
-	    }
-	    if (verbose)
-		say("Checking out file %s from %s...\n", filename, cs);
-	    if (system(buf) || stat(filename, &filestat))
-		fatal("can't check out file %s from %s\n", filename, cs);
+			say("(Creating file %s...)\n", filename);
+
+		/*
+		 * in check_patch case, we still display `Creating file' even
+		 * though we're not. The rule is that -C should be as similar
+		 * to normal patch behavior as possible
+		 */
+		if (check_only)
+			return TRUE;
+		makedirs(filename, TRUE);
+		close(creat(filename, 0666));
+		statfailed = stat(filename, &filestat);
+	}
+	if (statfailed && check_only)
+		fatal("%s not found, -C mode, can't probe further\n", filename);
+	/* For nonexistent or read-only files, look for RCS or SCCS versions.  */
+	if (statfailed ||
+	    /* No one can write to it.  */
+	    (filestat.st_mode & 0222) == 0 ||
+	    /* I can't write to it.  */
+	    ((filestat.st_mode & 0022) == 0 && filestat.st_uid != myuid)) {
+		char	*cs = Nullch, *filebase, *filedir;
+		struct stat	cstat;
+
+		filebase = basename(filename);
+		filedir = dirname(filename);
+
+		/* Leave room in lbuf for the diff command.  */
+		s = lbuf + 20;
+
+#define try(f, a1, a2, a3) \
+	(snprintf(s, sizeof lbuf - 20, f, a1, a2, a3), stat(s, &cstat) == 0)
+
+		if (try("%s/RCS/%s%s", filedir, filebase, RCSSUFFIX) ||
+		    try("%s/RCS/%s%s", filedir, filebase, "") ||
+		    try("%s/%s%s", filedir, filebase, RCSSUFFIX)) {
+			snprintf(buf, sizeof buf, CHECKOUT, filename);
+			snprintf(lbuf, sizeof lbuf, RCSDIFF, filename);
+			cs = "RCS";
+		} else if (try("%s/SCCS/%s%s", filedir, SCCSPREFIX, filebase) ||
+		    try("%s/%s%s", filedir, SCCSPREFIX, filebase)) {
+			snprintf(buf, sizeof buf, GET, s);
+			snprintf(lbuf, sizeof lbuf, SCCSDIFF, s, filename);
+			cs = "SCCS";
+		} else if (statfailed)
+			fatal("can't find %s\n", filename);
+		/*
+		 * else we can't write to it but it's not under a version
+		 * control system, so just proceed.
+		 */
+		if (cs) {
+			if (!statfailed) {
+				if ((filestat.st_mode & 0222) != 0)
+					/* The owner can write to it.  */
+					fatal("file %s seems to be locked "
+					    "by somebody else under %s\n",
+					    filename, cs);
+				/*
+				 * It might be checked out unlocked.  See if
+				 * it's safe to check out the default version
+				 * locked.
+				 */
+				if (verbose)
+					say("Comparing file %s to default "
+					    "%s version...\n",
+					    filename, cs);
+				if (system(lbuf))
+					fatal("can't check out file %s: "
+					    "differs from default %s version\n",
+					    filename, cs);
+			}
+			if (verbose)
+				say("Checking out file %s from %s...\n",
+				    filename, cs);
+			if (system(buf) || stat(filename, &filestat))
+				fatal("can't check out file %s from %s\n",
+				    filename, cs);
+		}
+	}
+	filemode = filestat.st_mode;
+	if (!S_ISREG(filemode))
+		fatal("%s is not a normal file--can't patch\n", filename);
+	i_size = filestat.st_size;
+	if (out_of_mem) {
+		set_hunkmax();	/* make sure dynamic arrays are allocated */
+		out_of_mem = FALSE;
+		return FALSE;	/* force plan b because plan a bombed */
 	}
-    }
-    filemode = filestat.st_mode;
-    if (!S_ISREG(filemode))
-	fatal("%s is not a normal file--can't patch\n", filename);
-    i_size = filestat.st_size;
-    if (out_of_mem) {
-	set_hunkmax();		/* make sure dynamic arrays are allocated */
-	out_of_mem = FALSE;
-	return FALSE;			/* force plan b because plan a bombed */
-    }
 #ifdef lint
-    i_womp = Nullch;
+	i_womp = Nullch;
 #else
-    i_womp = malloc((MEM)(i_size+2));	/* lint says this may alloc less than */
-					/* i_size, but that's okay, I think. */
+	i_womp = malloc((MEM) (i_size + 2));	/* lint says this may alloc
+						 * less than */
+	/* i_size, but that's okay, I think. */
 #endif
-    if (i_womp == Nullch)
-	return FALSE;
-    if ((ifd = open(filename, O_RDONLY)) < 0)
-	pfatal("can't open file %s", filename);
+	if (i_womp == Nullch)
+		return FALSE;
+	if ((ifd = open(filename, O_RDONLY)) < 0)
+		pfatal("can't open file %s", filename);
 #ifndef lint
-    if (read(ifd, i_womp, (size_t)i_size) != i_size) {
-	close(ifd);	/* probably means i_size > 15 or 16 bits worth */
-	free(i_womp);	/* at this point it doesn't matter if i_womp was */
-	return FALSE;	/*   undersized. */
-    }
+	if (read(ifd, i_womp, (size_t) i_size) != i_size) {
+		close(ifd);	/* probably means i_size > 15 or 16 bits worth */
+		free(i_womp);	/* at this point it doesn't matter if i_womp was */
+		return FALSE;	/* undersized. */
+	}
 #endif
-    close(ifd);
-    if (i_size && i_womp[i_size-1] != '\n')
-	i_womp[i_size++] = '\n';
-    i_womp[i_size] = '\0';
-
-    /* count the lines in the buffer so we know how many pointers we need */
-
-    iline = 0;
-    for (s=i_womp; *s; s++) {
-	if (*s == '\n')
-	    iline++;
-    }
+	close(ifd);
+	if (i_size && i_womp[i_size - 1] != '\n')
+		i_womp[i_size++] = '\n';
+	i_womp[i_size] = '\0';
+
+	/* count the lines in the buffer so we know how many pointers we need */
+
+	iline = 0;
+	for (s = i_womp; *s; s++) {
+		if (*s == '\n')
+			iline++;
+	}
 #ifdef lint
-    i_ptr = Null(char**);
+	i_ptr = Null(char **);
 #else
-    i_ptr = (char **)malloc((MEM)((iline + 2) * sizeof(char *)));
+	i_ptr = (char **) malloc((MEM) ((iline + 2) * sizeof(char *)));
 #endif
-    if (i_ptr == Null(char **)) {	/* shucks, it was a near thing */
-	free((char *)i_womp);
-	return FALSE;
-    }
-
-    /* now scan the buffer and build pointer array */
-
-    iline = 1;
-    i_ptr[iline] = i_womp;
-    for (s=i_womp; *s; s++) {
-	if (*s == '\n')
-	    i_ptr[++iline] = s+1;	/* these are NOT null terminated */
-    }
-    input_lines = iline - 1;
-
-    /* now check for revision, if any */
-
-    if (revision != Nullch) {
-	if (!rev_in_string(i_womp)) {
-	    if (force) {
-		if (verbose)
-		    say(
-"Warning: this file doesn't appear to be the %s version--patching anyway.\n",
-			revision);
-	    }
-	    else if (batch) {
-		fatal(
-"this file doesn't appear to be the %s version--aborting.\n", revision);
-	    }
-	    else {
-		ask(
-"This file doesn't appear to be the %s version--patch anyway? [n] ",
-		    revision);
-	    if (*buf != 'y')
-		fatal("aborted\n");
-	    }
+	if (i_ptr == Null(char **)) {	/* shucks, it was a near thing */
+		free((char *) i_womp);
+		return FALSE;
+	}
+	/* now scan the buffer and build pointer array */
+
+	iline = 1;
+	i_ptr[iline] = i_womp;
+	for (s = i_womp; *s; s++) {
+		if (*s == '\n')
+			i_ptr[++iline] = s + 1;	/* these are NOT null
+						 * terminated */
+	}
+	input_lines = iline - 1;
+
+	/* now check for revision, if any */
+
+	if (revision != Nullch) {
+		if (!rev_in_string(i_womp)) {
+			if (force) {
+				if (verbose)
+					say("Warning: this file doesn't appear "
+					    "to be the %s version--patching anyway.\n",
+					    revision);
+			} else if (batch) {
+				fatal("this file doesn't appear to be the "
+				    "%s version--aborting.\n",
+				    revision);
+			} else {
+				ask("This file doesn't appear to be the "
+				    "%s version--patch anyway? [n] ",
+				    revision);
+				if (*buf != 'y')
+					fatal("aborted\n");
+			}
+		} else if (verbose)
+			say("Good.  This file appears to be the %s version.\n",
+			    revision);
 	}
-	else if (verbose)
-	    say("Good.  This file appears to be the %s version.\n",
-		revision);
-    }
-    return TRUE;			/* plan a will work */
+	return TRUE;		/* plan a will work */
 }
 
 /* Keep (virtually) nothing in memory. */
 
 void
-plan_b(filename)
-char *filename;
+plan_b(char *filename)
 {
-    FILE *ifp;
-    int i = 0;
-    int maxlen = 1;
-    bool found_revision = (revision == Nullch);
-
-    using_plan_a = FALSE;
-    if ((ifp = fopen(filename, "r")) == Nullfp)
-	pfatal("can't open file %s", filename);
-    (void) unlink(TMPINNAME);
-    if ((tifd = open(TMPINNAME, O_EXCL|O_CREAT|O_WRONLY, 0666)) < 0)
-	pfatal("can't open file %s", TMPINNAME);
-    while (fgets(buf, sizeof buf, ifp) != Nullch) {
-	if (revision != Nullch && !found_revision && rev_in_string(buf))
-	    found_revision = TRUE;
-	if ((i = strlen(buf)) > maxlen)
-	    maxlen = i;			/* find longest line */
-    }
-    if (revision != Nullch) {
-	if (!found_revision) {
-	    if (force) {
-		if (verbose)
-		    say(
-"Warning: this file doesn't appear to be the %s version--patching anyway.\n",
-			revision);
-	    }
-	    else if (batch) {
-		fatal(
-"this file doesn't appear to be the %s version--aborting.\n", revision);
-	    }
-	    else {
-		ask(
-"This file doesn't appear to be the %s version--patch anyway? [n] ",
-		    revision);
-		if (*buf != 'y')
-		    fatal("aborted\n");
-	    }
+	FILE	*ifp;
+	int	i = 0, maxlen = 1;
+	bool	found_revision = (revision == Nullch);
+
+	using_plan_a = FALSE;
+	if ((ifp = fopen(filename, "r")) == Nullfp)
+		pfatal("can't open file %s", filename);
+	(void) unlink(TMPINNAME);
+	if ((tifd = open(TMPINNAME, O_EXCL | O_CREAT | O_WRONLY, 0666)) < 0)
+		pfatal("can't open file %s", TMPINNAME);
+	while (fgets(buf, sizeof buf, ifp) != Nullch) {
+		if (revision != Nullch && !found_revision && rev_in_string(buf))
+			found_revision = TRUE;
+		if ((i = strlen(buf)) > maxlen)
+			maxlen = i;	/* find longest line */
+	}
+	if (revision != Nullch) {
+		if (!found_revision) {
+			if (force) {
+				if (verbose)
+					say("Warning: this file doesn't appear "
+					    "to be the %s version--patching anyway.\n",
+					    revision);
+			} else if (batch) {
+				fatal("this file doesn't appear to be the "
+				    "%s version--aborting.\n",
+				    revision);
+			} else {
+				ask("This file doesn't appear to be the %s "
+				    "version--patch anyway? [n] ",
+				    revision);
+				if (*buf != 'y')
+					fatal("aborted\n");
+			}
+		} else if (verbose)
+			say("Good.  This file appears to be the %s version.\n",
+			    revision);
 	}
-	else if (verbose)
-	    say("Good.  This file appears to be the %s version.\n",
-		revision);
-    }
-    fseek(ifp, 0L, 0);		/* rewind file */
-    lines_per_buf = BUFFERSIZE / maxlen;
-    tireclen = maxlen;
-    tibuf[0] = malloc((MEM)(BUFFERSIZE + 1));
-    if (tibuf[0] == Nullch)
-	fatal("out of memory\n");
-    tibuf[1] = malloc((MEM)(BUFFERSIZE + 1));
-    if (tibuf[1] == Nullch)
-	fatal("out of memory\n");
-    for (i=1; ; i++) {
-	if (! (i % lines_per_buf))	/* new block */
-	    if (write(tifd, tibuf[0], BUFFERSIZE) < BUFFERSIZE)
-		pfatal("can't write temp file");
-	if (fgets(tibuf[0] + maxlen * (i%lines_per_buf), maxlen + 1, ifp)
-	  == Nullch) {
-	    input_lines = i - 1;
-	    if (i % lines_per_buf)
-		if (write(tifd, tibuf[0], BUFFERSIZE) < BUFFERSIZE)
-		    pfatal("can't write temp file");
-	    break;
+	fseek(ifp, 0L, 0);	/* rewind file */
+	lines_per_buf = BUFFERSIZE / maxlen;
+	tireclen = maxlen;
+	tibuf[0] = malloc((MEM) (BUFFERSIZE + 1));
+	if (tibuf[0] == Nullch)
+		fatal("out of memory\n");
+	tibuf[1] = malloc((MEM) (BUFFERSIZE + 1));
+	if (tibuf[1] == Nullch)
+		fatal("out of memory\n");
+	for (i = 1;; i++) {
+		if (!(i % lines_per_buf))	/* new block */
+			if (write(tifd, tibuf[0], BUFFERSIZE) < BUFFERSIZE)
+				pfatal("can't write temp file");
+		if (fgets(tibuf[0] + maxlen * (i % lines_per_buf),
+		    maxlen + 1, ifp) == Nullch) {
+			input_lines = i - 1;
+			if (i % lines_per_buf)
+				if (write(tifd, tibuf[0], BUFFERSIZE) < BUFFERSIZE)
+					pfatal("can't write temp file");
+			break;
+		}
 	}
-    }
-    fclose(ifp);
-    close(tifd);
-    if ((tifd = open(TMPINNAME, O_RDONLY)) < 0) {
-	pfatal("can't reopen file %s", TMPINNAME);
-    }
+	fclose(ifp);
+	close(tifd);
+	if ((tifd = open(TMPINNAME, O_RDONLY)) < 0)
+		pfatal("can't reopen file %s", TMPINNAME);
 }
 
-/* Fetch a line from the input file, \n terminated, not necessarily \0. */
-
+/*
+ * Fetch a line from the input file, \n terminated, not necessarily \0.
+ */
 char *
-ifetch(line,whichbuf)
-LINENUM line;
-int whichbuf;				/* ignored when file in memory */
+ifetch(LINENUM line, int whichbuf)
 {
-    if (line < 1 || line > input_lines) {
-	say("No such line %ld in input file, ignoring\n", line);
-	return NULL;
-    }
-    if (using_plan_a)
-	return i_ptr[line];
-    else {
-	LINENUM offline = line % lines_per_buf;
-	LINENUM baseline = line - offline;
-
-	if (tiline[0] == baseline)
-	    whichbuf = 0;
-	else if (tiline[1] == baseline)
-	    whichbuf = 1;
+	if (line < 1 || line > input_lines) {
+		say("No such line %ld in input file, ignoring\n", line);
+		return NULL;
+	}
+	if (using_plan_a)
+		return i_ptr[line];
 	else {
-	    tiline[whichbuf] = baseline;
-#ifndef lint		/* complains of long accuracy */
-	    lseek(tifd, (off_t)(baseline / lines_per_buf * BUFFERSIZE), 0);
+		LINENUM	offline = line % lines_per_buf;
+		LINENUM	baseline = line - offline;
+
+		if (tiline[0] == baseline)
+			whichbuf = 0;
+		else if (tiline[1] == baseline)
+			whichbuf = 1;
+		else {
+			tiline[whichbuf] = baseline;
+#ifndef lint			/* complains of long accuracy */
+			lseek(tifd, (off_t) (baseline / lines_per_buf *
+			    BUFFERSIZE), 0);
 #endif
-	    if (read(tifd, tibuf[whichbuf], BUFFERSIZE) < 0)
-		pfatal("error reading tmp file %s", TMPINNAME);
+			if (read(tifd, tibuf[whichbuf], BUFFERSIZE) < 0)
+				pfatal("error reading tmp file %s", TMPINNAME);
+		}
+		return tibuf[whichbuf] + (tireclen * offline);
 	}
-	return tibuf[whichbuf] + (tireclen*offline);
-    }
 }
 
-/* True if the string argument contains the revision number we want. */
-
+/*
+ * True if the string argument contains the revision number we want.
+ */
 bool
-rev_in_string(string)
-char *string;
+rev_in_string(char *string)
 {
-    char *s;
-    int patlen;
-
-    if (revision == Nullch)
-	return TRUE;
-    patlen = strlen(revision);
-    if (strnEQ(string,revision,patlen) && isspace(string[patlen]))
-	return TRUE;
-    for (s = string; *s; s++) {
-	if (isspace(*s) && strnEQ(s+1, revision, patlen) &&
-		isspace(s[patlen+1] )) {
-	    return TRUE;
+	char	*s;
+	int	patlen;
+
+	if (revision == Nullch)
+		return TRUE;
+	patlen = strlen(revision);
+	if (strnEQ(string, revision, patlen) && isspace(string[patlen]))
+		return TRUE;
+	for (s = string; *s; s++) {
+		if (isspace(*s) && strnEQ(s + 1, revision, patlen) &&
+		    isspace(s[patlen + 1])) {
+			return TRUE;
+		}
 	}
-    }
-    return FALSE;
+	return FALSE;
 }