about summary refs log tree commit diff
path: root/misc/mntent_r.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-12-09 22:29:37 +0000
committerUlrich Drepper <drepper@redhat.com>2006-12-09 22:29:37 +0000
commit66f17705e46e88f8f01e66556fe62487aecdce29 (patch)
treeb679c1a0b36f8f136299066fa7700847710f5953 /misc/mntent_r.c
parent60608028117600c2ca2c2ef8c122d56da253cc78 (diff)
downloadglibc-66f17705e46e88f8f01e66556fe62487aecdce29.tar.gz
glibc-66f17705e46e88f8f01e66556fe62487aecdce29.tar.xz
glibc-66f17705e46e88f8f01e66556fe62487aecdce29.zip
* sysdeps/unix/sysv/linux/rtld-lowlevel.h
	(__rtld_mrlock_initialize): Add missing closing parenthesis.
Diffstat (limited to 'misc/mntent_r.c')
-rw-r--r--misc/mntent_r.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/misc/mntent_r.c b/misc/mntent_r.c
index 1476c86ee2..829750b395 100644
--- a/misc/mntent_r.c
+++ b/misc/mntent_r.c
@@ -1,5 +1,6 @@
 /* Utilities for reading/writing fstab, mtab, etc.
-   Copyright (C) 1995-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-2000, 2001, 2002, 2003, 2006
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -278,14 +279,11 @@ __hasmntopt (const struct mntent *mnt, const char *opt)
 
   while ((p = strstr (rest, opt)) != NULL)
     {
-      if (p == rest
-	  || (p[-1] == ','
-	      && (p[optlen] == '\0' ||
-		  p[optlen] == '='  ||
-		  p[optlen] == ',')))
+      if ((p == rest || p[-1] == ',')
+	  && (p[optlen] == '\0' || p[optlen] == '=' || p[optlen] == ','))
 	return p;
 
-      rest = strchr (rest, ',');
+      rest = strchr (p, ',');
       if (rest == NULL)
 	break;
       ++rest;