Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-10-29 20:27:40 +00:00
Code Issues Projects Releases Wiki Activity

Use low level file descriptors to match bb_copyfd_eof

Browse Source
This commit is contained in:
Glenn L McGrath 2003-12-20 04:38:01 +00:00
parent 266c1f5eff
commit f62ea20aff
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libbb/copy_file.c
View File

@ -123,7 +123,8 @@ int copy_file(const char *source, const char *dest, int flags)
status = -1; status = -1;
} }
} else if (S_ISREG(source_stat.st_mode)) { } else if (S_ISREG(source_stat.st_mode)) {
FILE *sfp, *dfp=NULL; int src_fd;
int dst_fd;
#ifdef CONFIG_FEATURE_PRESERVE_HARDLINKS #ifdef CONFIG_FEATURE_PRESERVE_HARDLINKS
char *link_name; char *link_name;
@ -137,30 +138,32 @@ int copy_file(const char *source, const char *dest, int flags)
return 0; return 0;
} }
#endif #endif
src_fd = open(source, O_RDONLY);
if ((sfp = bb_wfopen(source, "r")) == NULL) { if (src_fd == -1) {
return -1; bb_perror_msg("unable to open `%s'", source);
return(-1);
} }
if (dest_exists) { if (dest_exists) {
if (flags & FILEUTILS_INTERACTIVE) { if (flags & FILEUTILS_INTERACTIVE) {
fprintf(stderr, "%s: overwrite `%s'? ", bb_applet_name, dest); bb_error_msg("overwrite `%s'? ", dest);
if (!bb_ask_confirmation()) { if (!bb_ask_confirmation()) {
fclose (sfp); close (src_fd);
return 0; return 0;
} }
} }
if ((dfp = fopen(dest, "w")) == NULL) { dst_fd = open(dest, O_WRONLY);
if (dst_fd == -1) {
if (!(flags & FILEUTILS_FORCE)) { if (!(flags & FILEUTILS_FORCE)) {
bb_perror_msg("unable to open `%s'", dest); bb_perror_msg("unable to open `%s'", dest);
fclose (sfp); close(src_fd);
return -1; return -1;
} }
if (unlink(dest) < 0) { if (unlink(dest) < 0) {
bb_perror_msg("unable to remove `%s'", dest); bb_perror_msg("unable to remove `%s'", dest);
fclose (sfp); close(src_fd);
return -1; return -1;
} }
@ -169,27 +172,23 @@ int copy_file(const char *source, const char *dest, int flags)
} }
if (!dest_exists) { if (!dest_exists) {
int fd; dst_fd = open(dest, O_WRONLY|O_CREAT, source_stat.st_mode);
if (dst_fd == -1) {
if ((fd = open(dest, O_WRONLY|O_CREAT, source_stat.st_mode)) < 0 ||
(dfp = fdopen(fd, "w")) == NULL) {
if (fd >= 0)
close(fd);
bb_perror_msg("unable to open `%s'", dest); bb_perror_msg("unable to open `%s'", dest);
fclose (sfp); close(src_fd);
return -1; return(-1);
} }
} }
if (bb_copyfd_eof(fileno(sfp), fileno(dfp)) == -1) if (bb_copyfd_eof(src_fd, dst_fd) == -1)
status = -1; status = -1;
if (fclose(dfp) < 0) { if (close(dst_fd) < 0) {
bb_perror_msg("unable to close `%s'", dest); bb_perror_msg("unable to close `%s'", dest);
status = -1; status = -1;
} }
if (fclose(sfp) < 0) { if (close(src_fd) < 0) {
bb_perror_msg("unable to close `%s'", source); bb_perror_msg("unable to close `%s'", source);
status = -1; status = -1;
} }