diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-12-10 10:38:56 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-12-10 10:38:56 +0000 |
| commit | b0ec19ce6e64c405fdd95c90a5d4212f86abea1f (patch) | |
| tree | 9f52f1f004f36f9bd712fe2fb753736733f6324c /misc/mntent_r.c | |
| parent | 7f65f3e3920a0dd6bb6a8774f46063371be4d029 (diff) | |
Updated to fedora-glibc-20061210T1006
Diffstat (limited to 'misc/mntent_r.c')
| -rw-r--r-- | misc/mntent_r.c | 12 |
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; |