diff options
| author | Karel Zak | 2012-04-11 12:37:59 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-04-11 12:37:59 +0200 |
| commit | 6259c257d873798ea87341548d5e9c1d7821fce3 (patch) | |
| tree | 8ef976bde5eabf8f549f2cd1407f321ac5032f2d /login-utils/setpwnam.c | |
| parent | libuuid: use randutils (diff) | |
| parent | disk-utils: verify writing to streams was successful (diff) | |
| download | kernel-qcow2-util-linux-6259c257d873798ea87341548d5e9c1d7821fce3.tar.gz kernel-qcow2-util-linux-6259c257d873798ea87341548d5e9c1d7821fce3.tar.xz kernel-qcow2-util-linux-6259c257d873798ea87341548d5e9c1d7821fce3.zip | |
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
Diffstat (limited to 'login-utils/setpwnam.c')
| -rw-r--r-- | login-utils/setpwnam.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/login-utils/setpwnam.c b/login-utils/setpwnam.c index 7459fe298..ba15bc131 100644 --- a/login-utils/setpwnam.c +++ b/login-utils/setpwnam.c @@ -59,7 +59,7 @@ #include <unistd.h> #include "c.h" -#include "fileutils.h" +#include "closestream.h" #include "setpwnam.h" static void pw_init(void); @@ -143,9 +143,7 @@ int setpwnam(struct passwd *pwd) /* xfmkstemp is too restrictive by default for passwd file */ if (fchmod(fileno(fp), 0644) < 0) goto fail; - rc = fclose(fp); - fp = NULL; - if (rc < 0) + if (close_stream(fp) != 0) goto fail; fclose(pwf); /* I don't think I want to know if this failed */ |