diff options
author | Roland McGrath <roland@redhat.com> | 2010-05-04 12:13:28 -0700 |
---|---|---|
committer | Roland McGrath <roland@redhat.com> | 2010-05-04 12:13:28 -0700 |
commit | bb6d7d23841e57fde2c6c79a4455c7e9373a5d1b (patch) | |
tree | 334c4a5d9b11045021021f5f0db53ce4f4fa3ff3 /misc | |
parent | 2e76ab2332a7fb9e73a4047625b915bff93bd427 (diff) | |
parent | c4ccff16e2ff92f84102988bd3a32cd1d2719f3a (diff) | |
download | glibc-bb6d7d23841e57fde2c6c79a4455c7e9373a5d1b.tar.gz glibc-bb6d7d23841e57fde2c6c79a4455c7e9373a5d1b.tar.xz glibc-bb6d7d23841e57fde2c6c79a4455c7e9373a5d1b.zip |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'misc')
-rw-r--r-- | misc/mntent_r.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/misc/mntent_r.c b/misc/mntent_r.c index 829750b395..9598528324 100644 --- a/misc/mntent_r.c +++ b/misc/mntent_r.c @@ -1,5 +1,5 @@ /* Utilities for reading/writing fstab, mtab, etc. - Copyright (C) 1995-2000, 2001, 2002, 2003, 2006 + Copyright (C) 1995-2000, 2001, 2002, 2003, 2006, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -194,7 +194,7 @@ weak_alias (__getmntent_r, getmntent_r) const char *rp = name; \ \ while (*rp != '\0') \ - if (*rp == ' ' || *rp == '\t' || *rp == '\\') \ + if (*rp == ' ' || *rp == '\t' || *rp == '\n' || *rp == '\\') \ break; \ else \ ++rp; \ @@ -202,7 +202,7 @@ weak_alias (__getmntent_r, getmntent_r) if (*rp != '\0') \ { \ /* In the worst case the length of the string can increase to \ - founr times the current length. */ \ + four times the current length. */ \ char *wp; \ \ rp = name; \ |