From 7900271c9a94743597a2d3e63c372a8e26fd02e0 Mon Sep 17 00:00:00 2001 From: joseph Date: Tue, 4 May 2010 00:21:32 +0000 Subject: Merge changes between r10318 and r10371 from /fsf/trunk. git-svn-id: svn://svn.eglibc.org/trunk@10372 7b3dc134-2b1b-0410-93df-9e9f96275f8d --- libc/misc/mntent_r.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libc/misc') 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; \ -- cgit v1.2.3