summaryrefslogtreecommitdiff
path: root/libc/misc
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2010-05-04 00:21:32 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2010-05-04 00:21:32 +0000
commit7900271c9a94743597a2d3e63c372a8e26fd02e0 (patch)
tree8e878759cc802e1b2a543c32e2b370656e9f9453 /libc/misc
parent58799f878e732ac938bc4c714b160b65d6e6bff2 (diff)
downloadeglibc2-7900271c9a94743597a2d3e63c372a8e26fd02e0.tar.gz
Merge changes between r10318 and r10371 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@10372 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/misc')
-rw-r--r--libc/misc/mntent_r.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/misc/mntent_r.c b/libc/misc/mntent_r.c
index 829750b39..959852832 100644
--- a/libc/misc/mntent_r.c
+++ b/libc/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; \