From: Karel Zak <kzak@redhat.com>
Date: Wed, 11 Apr 2012 10:37:59 +0000 (+0200)
Subject: Merge branch 'close_stream' of git://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.22-rc1~539
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6259c257d873798ea87341548d5e9c1d7821fce3;p=thirdparty%2Futil-linux.git

Merge branch 'close_stream' of git://github.com/kerolasa/lelux-utiliteetit

* 'close_stream' of git://github.com/kerolasa/lelux-utiliteetit:
  disk-utils: verify writing to streams was successful
  fdisk: verify writing to streams was successful
  getopt: verify writing to streams was successful
  hwclock: verify writing to streams was successful
  login-utils: verify writing to streams was successful
  misc-utils: verify writing to streams was successful
  mount: verify writing to streams was successful
  partx: verify writing to streams was successful
  schedutils: verify writing to streams was successful
  sys-utils: verify writing to streams was successful
  term-utils: verify writing to streams was successful
  text-utils: verify writing to streams was successful
  include: add stream error checking facility

Conflicts:
	fdisk/fdisk.c
---

6259c257d873798ea87341548d5e9c1d7821fce3
diff --cc fdisk/fdisk.c
index 7c1486184a,4fc347b1fe..cf64fa7768
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@@ -33,7 -33,7 +33,8 @@@
  #include "pathnames.h"
  #include "canonicalize.h"
  #include "strutils.h"
 +#include "randutils.h"
+ #include "closestream.h"
  
  #include "fdisksunlabel.h"
  #include "fdisksgilabel.h"