}
} else {
if (source_stat.st_dev == dest_stat.st_dev &&
- source_stat.st_ino == dest_stat.st_ino) {
- bb_error_msg("`%s' and `%s' are the same file", source, dest);
- return -1;
- }
+ source_stat.st_ino == dest_stat.st_ino)
+ {
+ bb_error_msg("`%s' and `%s' are the same file", source, dest);
+ return -1;
+ }
dest_exists = 1;
}
status = -1;
}
} else if (S_ISREG(source_stat.st_mode)) {
- FILE *sfp, *dfp=NULL;
+ int src_fd;
+ int dst_fd;
#ifdef CONFIG_FEATURE_PRESERVE_HARDLINKS
char *link_name;
return 0;
}
#endif
-
- if ((sfp = bb_wfopen(source, "r")) == NULL) {
- return -1;
+ src_fd = open(source, O_RDONLY);
+ if (src_fd == -1) {
+ bb_perror_msg("unable to open `%s'", source);
+ return(-1);
}
if (dest_exists) {
if (flags & FILEUTILS_INTERACTIVE) {
fprintf(stderr, "%s: overwrite `%s'? ", bb_applet_name, dest);
if (!bb_ask_confirmation()) {
- fclose (sfp);
+ close (src_fd);
return 0;
}
}
- if ((dfp = fopen(dest, "w")) == NULL) {
+ dst_fd = open(dest, O_WRONLY|O_TRUNC);
+ if (dst_fd == -1) {
if (!(flags & FILEUTILS_FORCE)) {
bb_perror_msg("unable to open `%s'", dest);
- fclose (sfp);
+ close(src_fd);
return -1;
}
if (unlink(dest) < 0) {
bb_perror_msg("unable to remove `%s'", dest);
- fclose (sfp);
+ close(src_fd);
return -1;
}
}
if (!dest_exists) {
- int fd;
-
- if ((fd = open(dest, O_WRONLY|O_CREAT, source_stat.st_mode)) < 0 ||
- (dfp = fdopen(fd, "w")) == NULL) {
- if (fd >= 0)
- close(fd);
+ dst_fd = open(dest, O_WRONLY|O_CREAT, source_stat.st_mode);
+ if (dst_fd == -1) {
bb_perror_msg("unable to open `%s'", dest);
- fclose (sfp);
- return -1;
+ close(src_fd);
+ return(-1);
}
}
- if (bb_copyfd(fileno(sfp), fileno(dfp), 0) == -1)
+ if (bb_copyfd_eof(src_fd, dst_fd) == -1)
status = -1;
- if (fclose(dfp) < 0) {
+ if (close(dst_fd) < 0) {
bb_perror_msg("unable to close `%s'", dest);
status = -1;
}
- if (fclose(sfp) < 0) {
+ if (close(src_fd) < 0) {
bb_perror_msg("unable to close `%s'", source);
status = -1;
}
S_ISSOCK(source_stat.st_mode) || S_ISFIFO(source_stat.st_mode) ||
S_ISLNK(source_stat.st_mode)) {
- if (dest_exists &&
- ((flags & FILEUTILS_FORCE) == 0 || unlink(dest) < 0)) {
+ if (dest_exists) {
+ if((flags & FILEUTILS_FORCE) == 0) {
+ fprintf(stderr, "`%s' exists\n", dest);
+ return -1;
+ }
+ if(unlink(dest) < 0) {
bb_perror_msg("unable to remove `%s'", dest);
return -1;
-
}
+ }
} else {
bb_error_msg("internal error: unrecognized file type");
return -1;
}
#ifdef CONFIG_FEATURE_PRESERVE_HARDLINKS
- add_to_ino_dev_hashtable(&source_stat, dest);
+ if (! S_ISDIR(source_stat.st_mode)) {
+ add_to_ino_dev_hashtable(&source_stat, dest);
+ }
#endif
end: