Remove useless calls to basename().

[pw-darwin.git] / libutil / pw_util.c

diff --git a/libutil/pw_util.c b/libutil/pw_util.c
index 24c0263a51f214211997102550db7e8917d1cba0..2838871d93f6679307814271a79077e2a715c345 100644 (file)
--- a/libutil/pw_util.c
+++ b/libutil/pw_util.c
@@ -58,7 +58,6 @@ static const char rcsid[] =
 #include <err.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <libgen.h>
 #include <paths.h>
 #include <pwd.h>
 #include <signal.h>
@@ -179,7 +178,7 @@ pw_lock(void)
        for (;;) {
                struct stat st;
 
-               lockfd = flopen(masterpasswd, O_RDONLY|O_NONBLOCK, 0);
+               lockfd = flopen(masterpasswd, O_RDONLY|O_NONBLOCK|O_CLOEXEC, 0);
                if (lockfd == -1) {
                        if (errno == EWOULDBLOCK) {
                                errx(1, "the password db file is busy");
@@ -226,7 +225,7 @@ pw_tmp(int mfd)
                errno = ENAMETOOLONG;
                return (-1);
        }
-       if ((tfd = mkstemp(tempname)) == -1)
+       if ((tfd = mkostemp(tempname, O_SYNC)) == -1)
                return (-1);
        if (mfd != -1) {
                while ((nr = read(mfd, buf, sizeof(buf))) > 0)
@@ -315,7 +314,7 @@ pw_edit(int notsetuid)
                        (void)setuid(getuid());
                }
                errno = 0;
-               execlp(editor, basename(editor), tempname, (char *)NULL);
+               execlp(editor, editor, tempname, (char *)NULL);
                _exit(errno);
        default:
                /* parent */