rpms/bridge-utils/devel bridge-utils-1.2-foreach.patch,1.1,1.2

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/bridge-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17982

Modified Files:
	bridge-utils-1.2-foreach.patch 
Log Message:
cleaner fix

bridge-utils-1.2-foreach.patch:

Index: bridge-utils-1.2-foreach.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bridge-utils/devel/bridge-utils-1.2-foreach.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bridge-utils-1.2-foreach.patch	5 Mar 2008 15:44:20 -0000	1.1
+++ bridge-utils-1.2-foreach.patch	5 Mar 2008 16:16:44 -0000	1.2
@@ -1,13 +1,17 @@
---- bridge-utils-1.2/libbridge/libbridge_init.c~	2007-08-22 14:22:49.000000000 +0100
-+++ bridge-utils-1.2/libbridge/libbridge_init.c	2008-03-05 15:40:42.000000000 +0000
-@@ -49,8 +49,8 @@ static int isbridge(const struct dirent 
+diff --git a/libbridge/libbridge_init.c b/libbridge/libbridge_init.c
+index a7473bd..d093bb1 100644
+--- a/libbridge/libbridge_init.c
++++ b/libbridge/libbridge_init.c
+@@ -49,6 +49,12 @@ static int isbridge(const struct dirent *entry)
  	char path[SYSFS_PATH_MAX];
  	struct stat st;
  
--	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge", entry->d_name);
--	return stat(path, &st) == 0 && S_ISDIR(st.st_mode);
-+	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge/bridge_id", entry->d_name);
-+	return stat(path, &st) == 0 && S_ISREG(st.st_mode);
++	/* Ignore "." and ".." entries. */
++	if (entry->d_name[0] == '.' &&
++	    (entry->d_name[1] == 0 ||
++	     (entry->d_name[1] == '.' && entry->d_name[2] == 0)))
++		return 0;
++
+ 	snprintf(path, SYSFS_PATH_MAX, SYSFS_CLASS_NET "%s/bridge", entry->d_name);
+ 	return stat(path, &st) == 0 && S_ISDIR(st.st_mode);
  }
- 
- /*