Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Jul 2013 11:18:48 +0000 (UTC)
From:      Peter Holm <pho@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r253029 - user/pho/stress2/testcases/fts
Message-ID:  <201307081118.r68BImnq041686@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pho
Date: Mon Jul  8 11:18:47 2013
New Revision: 253029
URL: http://svnweb.freebsd.org/changeset/base/253029

Log:
  ftsoptions needs to be non zero, move printing of file names to a higher
  verbose level and ignore fts_read(3) errors.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/pho/stress2/testcases/fts/fts.c

Modified: user/pho/stress2/testcases/fts/fts.c
==============================================================================
--- user/pho/stress2/testcases/fts/fts.c	Mon Jul  8 06:12:38 2013	(r253028)
+++ user/pho/stress2/testcases/fts/fts.c	Mon Jul  8 11:18:47 2013	(r253029)
@@ -63,7 +63,7 @@ test(void)
 	int		ftsoptions;
 	char 		*args[2];
 
-	ftsoptions = 0;
+	ftsoptions = FTS_LOGICAL;
 	args[0] = ".";
 	args[1] = 0;
 
@@ -71,7 +71,7 @@ test(void)
 		err(1, "fts_open");
 
 	while ((p = fts_read(fts)) != NULL && done_testing == 0) {
-		if (op->verbose > 1)
+		if (op->verbose > 2)
 			(void) printf("%s\n", p->fts_path);
 		switch (p->fts_info) {
 			case FTS_F:			/* Ignore. */
@@ -84,6 +84,8 @@ test(void)
 				break;
 			case FTS_SL:			/* Ignore. */
 				break;
+			case FTS_SLNONE:		/* Ignore. */
+				break;
 			case FTS_DNR:			/* Warn, continue. */
 			case FTS_ERR:
 			case FTS_NS:
@@ -97,8 +99,6 @@ test(void)
 		}
 	}
 
-	if (errno != 0 && errno != ENOENT)
-		err(1, "fts_read");
 	if (fts_close(fts) == -1)
 		err(1, "fts_close()");
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307081118.r68BImnq041686>