emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crontab: stop using remove() - use unlink() instead

Browse Source
This commit is contained in:
Denis Vlasenko 2008-02-17 14:30:03 +00:00
parent b3b0753593
commit 03b4c14bd4
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
miscutils/crontab.c
View File

@ -65,33 +65,26 @@ static void edit_file(const struct passwd *pas, const char *file)
static int open_as_user(const struct passwd *pas, const char *file) static int open_as_user(const struct passwd *pas, const char *file)
{ {
struct fd_pair filedes;
pid_t pid; pid_t pid;
char c; char c;
xpiped_pair(filedes);
pid = vfork(); pid = vfork();
if (pid < 0) /* ERROR */ if (pid < 0) /* ERROR */
bb_perror_msg_and_die("vfork"); bb_perror_msg_and_die("vfork");
if (pid) { /* PARENT */ if (pid) { /* PARENT */
int n = safe_read(filedes.rd, &c, 1); if (wait4pid(pid) == 0) {
close(filedes.rd); /* exitcode 0: child says it can read */
close(filedes.wr);
if (n > 0) /* child says it can read */
return open(file, O_RDONLY); return open(file, O_RDONLY);
}
return -1; return -1;
} }
/* CHILD */ /* CHILD */
/* initgroups, setgid, setuid */ /* initgroups, setgid, setuid */
change_identity(pas); change_identity(pas);
/* We just try to read one byte. If it works, file is readable
/* We just try to read one byte. If that works, file is readable * under this user. We signal that by exiting with 0. */
* under this user. We signal that by sending one byte to parent. */ _exit(safe_read(xopen(file, O_RDONLY), &c, 1) < 0);
if (safe_read(xopen(file, O_RDONLY), &c, 1) == 1)
safe_write(filedes.wr, &c, 1); /* "papa, I can read!" */
_exit(0);
} }
int crontab_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int crontab_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@ -180,7 +173,7 @@ int crontab_main(int argc, char **argv)
switch (opt_ler) { switch (opt_ler) {
default: /* case OPT_r: Delete */ default: /* case OPT_r: Delete */
remove(pas->pw_name); unlink(pas->pw_name);
break; break;
case OPT_l: /* List */ case OPT_l: /* List */
@ -211,13 +204,13 @@ int crontab_main(int argc, char **argv)
if (fd >= 0) { if (fd >= 0) {
bb_copyfd_eof(STDIN_FILENO, fd); bb_copyfd_eof(STDIN_FILENO, fd);
close(fd); close(fd);
rename(new_fname, pas->pw_name); xrename(new_fname, pas->pw_name);
} else { } else {
bb_error_msg("cannot create %s/%s", bb_error_msg("cannot create %s/%s",
crontab_dir, new_fname); crontab_dir, new_fname);
} }
if (tmp_fname) if (tmp_fname)
remove(tmp_fname); unlink(tmp_fname);
/*free(tmp_fname);*/ /*free(tmp_fname);*/
/*free(new_fname);*/ /*free(new_fname);*/