X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ffsck%2Ffsck.c;h=f60cc1d9126ce4ebca93c70bd6081c95e3dcef5c;hp=b6691c96ff05845c4fb0624259b066933f82c983;hb=03e334a1c7dc8c20c38902aa039440763acc9b17;hpb=059cb3858acd038ff2cef10a3a99119bf71a8fc6

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index b6691c96f..f60cc1d91 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -142,7 +142,7 @@ static int process_progress(int fd) {
 
         f = fdopen(fd, "r");
         if (!f) {
-                close_nointr_nofail(fd);
+                safe_close(fd);
                 return -errno;
         }
 
@@ -329,15 +329,12 @@ int main(int argc, char *argv[]) {
         } else if (pid == 0) {
                 /* Child */
                 if (progress_pipe[0] >= 0)
-                        close_nointr_nofail(progress_pipe[0]);
+                        safe_close(progress_pipe[0]);
                 execv(cmdline[0], (char**) cmdline);
                 _exit(8); /* Operational error */
         }
 
-        if (progress_pipe[1] >= 0) {
-                close_nointr_nofail(progress_pipe[1]);
-                progress_pipe[1] = -1;
-        }
+        progress_pipe[1] = safe_close(progress_pipe[1]);
 
         if (progress_pipe[0] >= 0) {
                 process_progress(progress_pipe[0]);