Mercurial > hg > octave-lojdl > gnulib-hg

changeset 4538:e05e3087e98a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix typo in previous change; it mishandled the case when line_end was neither a space nor NUL.
author Paul Eggert <eggert@cs.ucla.edu>
date Wed, 13 Aug 2003 23:44:25 +0000
parents 940fdf291f5b
children aa8df09ef521
files lib/exclude.c
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lib/exclude.c
+++ b/lib/exclude.c
@@ -267,21 +267,25 @@
     e = errno;
 
   buf = xrealloc (buf, buf_count + 1);
+  buf[buf_count] = line_end;
+  lim = buf + buf_count + ! (buf_count == 0 || buf[buf_count - 1] == line_end);
+  pattern = buf;
 
-  for (pattern = p = buf, lim = buf + buf_count;  p <= lim;  p++)
-    if (p < lim ? *p == line_end : buf < p && p[-1])
+  for (p = buf; p < lim; p++)
+    if (*p == line_end)
       {
+	char *pattern_end = p;
+
 	if (is_space (line_end))
 	  {
-	    char *pattern_end = p;
 	    for (; ; pattern_end--)
 	      if (pattern_end == pattern)
 		goto next_pattern;
 	      else if (! is_space (pattern_end[-1]))
 		break;
-	    *pattern_end = '\0';
 	  }
 
+	*pattern_end = '\0';
 	(*add_func) (ex, pattern, options);
 
       next_pattern: