diff options
author | Denis Vlasenko | 2008-09-28 16:40:25 +0000 |
---|---|---|
committer | Denis Vlasenko | 2008-09-28 16:40:25 +0000 |
commit | bacaff6e5474d6c5f080ce4cd2a55e8ff1ba5c94 (patch) | |
tree | 5ca8c92753ef2c2fb7d39f125dc90deb18cfc1b8 /miscutils/crontab.c | |
parent | 261cf4784fa39fb6cb3b7db99e809a7832d94d0a (diff) | |
download | busybox-bacaff6e5474d6c5f080ce4cd2a55e8ff1ba5c94.zip busybox-bacaff6e5474d6c5f080ce4cd2a55e8ff1ba5c94.tar.gz |
apply post-1.12.0 fixes, bump version to 1.12.11_12_1
Diffstat (limited to 'miscutils/crontab.c')
-rw-r--r-- | miscutils/crontab.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/miscutils/crontab.c b/miscutils/crontab.c index f8662ba..01656cc 100644 --- a/miscutils/crontab.c +++ b/miscutils/crontab.c @@ -93,6 +93,7 @@ int crontab_main(int argc UNUSED_PARAM, char **argv) char *new_fname; char *user_name; /* -u USER */ int fd; + int src_fd; int opt_ler; /* file [opts] Replace crontab from file @@ -144,15 +145,15 @@ int crontab_main(int argc UNUSED_PARAM, char **argv) bb_show_usage(); /* Read replacement file under user's UID/GID/group vector */ + src_fd = STDIN_FILENO; if (!opt_ler) { /* Replace? */ if (!argv[0]) bb_show_usage(); if (NOT_LONE_DASH(argv[0])) { - fd = open_as_user(pas, argv[0]); - if (fd < 0) + src_fd = open_as_user(pas, argv[0]); + if (src_fd < 0) bb_error_msg_and_die("user %s cannot read %s", pas->pw_name, argv[0]); - xmove_fd(fd, STDIN_FILENO); } } @@ -180,23 +181,23 @@ int crontab_main(int argc UNUSED_PARAM, char **argv) tmp_fname = xasprintf("%s.%u", crontab_dir, (unsigned)getpid()); /* No O_EXCL: we don't want to be stuck if earlier crontabs * were killed, leaving stale temp file behind */ - fd = xopen3(tmp_fname, O_RDWR|O_CREAT|O_TRUNC, 0600); - xmove_fd(fd, STDIN_FILENO); - fchown(STDIN_FILENO, pas->pw_uid, pas->pw_gid); + src_fd = xopen3(tmp_fname, O_RDWR|O_CREAT|O_TRUNC, 0600); + fchown(src_fd, pas->pw_uid, pas->pw_gid); fd = open(pas->pw_name, O_RDONLY); if (fd >= 0) { - bb_copyfd_eof(fd, STDIN_FILENO); + bb_copyfd_eof(fd, src_fd); close(fd); + xlseek(src_fd, 0, SEEK_SET); } + close_on_exec_on(src_fd); /* don't want editor to see this fd */ edit_file(pas, tmp_fname); - xlseek(STDIN_FILENO, 0, SEEK_SET); /* fall through */ case 0: /* Replace (no -l, -e, or -r were given) */ new_fname = xasprintf("%s.new", pas->pw_name); fd = open(new_fname, O_WRONLY|O_CREAT|O_TRUNC|O_APPEND, 0600); if (fd >= 0) { - bb_copyfd_eof(STDIN_FILENO, fd); + bb_copyfd_eof(src_fd, fd); close(fd); xrename(new_fname, pas->pw_name); } else { |