summary refs log tree commit diff
path: root/misc/mntent_r.c
diff options
context:
space:
mode:
Diffstat (limited to 'misc/mntent_r.c')
-rw-r--r--misc/mntent_r.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/misc/mntent_r.c b/misc/mntent_r.c
index 829750b395..1476c86ee2 100644
--- a/misc/mntent_r.c
+++ b/misc/mntent_r.c
@@ -1,6 +1,5 @@
 /* Utilities for reading/writing fstab, mtab, etc.
-   Copyright (C) 1995-2000, 2001, 2002, 2003, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-2000, 2001, 2002, 2003 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
@@ -279,11 +278,14 @@ __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 (p, ',');
+      rest = strchr (rest, ',');
       if (rest == NULL)
 	break;
       ++rest;