From: Ulrich Drepper <drepper@gmail.com>
Date: Thu, 12 May 2011 03:37:25 +0000 (+0100)
Subject: Report write error  in addmnt even for cached streams.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18852b24dcd132d2aaa3488638ab18c15833730f;p=thirdparty%2Fglibc.git

Report write error  in addmnt even for cached streams.

(cherry picked from commit e1fb097f447a89aa69a926e45e673a52d86a6c57)
---

diff --git a/ChangeLog b/ChangeLog
index 20a0c49deef..ad835e65f7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-11  Ulrich Drepper  <drepper@gmail.com>
 
+	[BZ #12625]
+	* misc/mntent_r.c (addmntent): Flush the stream after the output
+
 	[BZ #12393]
 	* elf/dl-load.c (is_trusted_path): Remove unnecessary test.
 	(is_trusted_path_normalize): Skip initial colon.  Append slash
diff --git a/misc/mntent_r.c b/misc/mntent_r.c
index 95985283244..6959f0e21d5 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, 2010
+   Copyright (C) 1995-2000, 2001, 2002, 2003, 2006, 2010, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -263,8 +263,8 @@ __addmntent (FILE *stream, const struct mntent *mnt)
 		   mntcopy.mnt_type,
 		   mntcopy.mnt_opts,
 		   mntcopy.mnt_freq,
-		   mntcopy.mnt_passno)
-	  < 0 ? 1 : 0);
+		   mntcopy.mnt_passno) < 0
+	  || fflush (stream) != 0);
 }
 weak_alias (__addmntent, addmntent)