Merge lp:~xnox/libnih/fix-672643 into lp:libnih

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

libnih development has moved on to github.

review: Disapprove

Unmerged revisions

1055. By Dimitri John Ledkov on 2012-12-17

nih/file.c (nih_dir_walk_scan): Fallback to lstat, if the
non-portable dirent.d_type is not available.

=== modified file 'ChangeLog'
--- ChangeLog	2011-09-01 18:41:03 +0000
+++ ChangeLog	2012-12-17 10:15:23 +0000
@@ -1,3 +1,13 @@
[phone]  Dmitrijs Ledkovs  <[e-mail]>
+
+	* nih/file.c (nih_dir_walk_scan): Fallback to lstat, if the
+	non-portable dirent.d_type is not available (LP: #672643) (Closes:
+	#695604).
+
[phone]  Petr Lautrbach  <[e-mail]>
+
+	* nih/tests/test_file.c: don't use dirent.d_type (not portable)
+
 2011-08-31  James Hunt  <[e-mail]>
 
 	* nih-dbus-tool/tests/test_com.netsplit.Nih.Test_object.c

=== modified file 'nih/file.c'
--- nih/file.c	2009-10-03 09:37:58 +0000
+++ nih/file.c	2012-12-17 10:15:23 +0000
@@ -619,6 +619,8 @@
 	struct dirent  *ent;
 	char          **paths;
 	size_t          npaths;
+	int             isdir;
+	struct stat     statbuf;
 
 	nih_assert (path != NULL);
 
@@ -640,7 +642,15 @@
 		subpath = NIH_MUST (nih_sprintf (NULL, "%s/%s",
 						 path, ent->d_name));
 
-		if (filter && filter (data, subpath, ent->d_type == DT_DIR))
+		if (ent->d_type == DT_UNKNOWN) {
+			if ( lstat (subpath, &statbuf))
+				isdir = 0;
+			else
+				isdir = S_ISDIR(statbuf.st_mode);
+		} else
+			isdir = ent->d_type == DT_DIR;
+
+		if (filter && filter (data, subpath, isdir))
 			continue;
 
 		NIH_MUST (nih_str_array_addp (&paths, NULL, &npaths, subpath));

=== modified file 'nih/tests/test_file.c'
--- nih/tests/test_file.c	2009-07-08 20:40:57 +0000
+++ nih/tests/test_file.c	2012-12-17 10:15:23 +0000
@@ -724,6 +724,25 @@
 	return FALSE;
 }
 
+/* find only frodo files */
+static int
+my_filter_frodo_file (void       *data,
+	   const char *path,
+	   int         is_dir)
+{
+	char *slash;
+
+	if (is_dir)
+		return FALSE;
+
+	slash = strrchr (path, '/');
+	if (strcmp (slash, "/frodo"))
+		return TRUE;
+
+	return FALSE;
+}
+
+
 static int logger_called = 0;
 
 static int
@@ -905,6 +924,48 @@
 		TEST_EQ_STR (v->path, filename);
 
 		nih_free (visited);
+
+				/* Try also inverse filter */
+		TEST_ALLOC_SAFE {
+			visitor_called = 0;
+			visited = nih_list_new (NULL);
+		}
+
+		ret = nih_dir_walk (dirname, my_filter_frodo_file,
+				    my_visitor, NULL, &ret);
+
+		TEST_EQ (ret, 0);
+		TEST_EQ (visitor_called, 4);
+
+		v = (Visited *)visited->next;
+		TEST_EQ (v->data, &ret);
+		TEST_EQ_STR (v->dirname, dirname);
+		strcpy (filename, dirname);
+		strcat (filename, "/bar");
+		TEST_EQ_STR (v->path, filename);
+
+		v = (Visited *)v->entry.next;
+		TEST_EQ (v->data, &ret);
+		TEST_EQ_STR (v->dirname, dirname);
+		strcpy (filename, dirname);
+		strcat (filename, "/bar/frodo");
+		TEST_EQ_STR (v->path, filename);
+
+		v = (Visited *)v->entry.next;
+		TEST_EQ (v->data, &ret);
+		TEST_EQ_STR (v->dirname, dirname);
+		strcpy (filename, dirname);
+		strcat (filename, "/baz");
+		TEST_EQ_STR (v->path, filename);
+
+		v = (Visited *)v->entry.next;
+		TEST_EQ (v->data, &ret);
+		TEST_EQ_STR (v->dirname, dirname);
+		strcpy (filename, dirname);
+		strcat (filename, "/frodo");
+		TEST_EQ_STR (v->path, filename);
+
+		nih_free (visited);
 	}