diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-migrate.c | 58 |
2 files changed, 46 insertions, 19 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index d7b8a34fba..d4b869f5e5 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,12 @@ 2004-01-21 Not Zed <NotZed@Ximian.com> + * em-migrate.c (cp_r): use camel_mkdir(0777) rather than 0777 & + st.st_mode which isn't set anyway. + (cp): use simple 0666 for the mode open, and then chmod after. + (cp): check the return code of close, not just fsync. + (cp): dont use fd[0] and fd[1] when we really just want simple + variables, rename to readfd and writefd. + ** See bug #53159. * em-format.c (emf_message_rfc822): removed incorrect comment, diff --git a/mail/em-migrate.c b/mail/em-migrate.c index b1d4834959..999708ad54 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -30,6 +30,7 @@ #include <string.h> #include <sys/types.h> #include <sys/stat.h> +#include <utime.h> #include <unistd.h> #include <dirent.h> #include <regex.h> @@ -1240,31 +1241,39 @@ cp (const char *src, const char *dest, gboolean show_progress) { unsigned char readbuf[4096]; ssize_t nread, nwritten; - int errnosav, fd[2]; + int errnosav, readfd, writefd; size_t total = 0; struct stat st; - + struct utimbuf ut; + /* if the dest file exists and has content, abort - we don't * want to corrupt their existing data */ - if (stat (dest, &st) == 0 && st.st_size > 0) + if (stat(dest, &st) == 0 && st.st_size > 0) { + printf("destination exists, not copying '%s' to '%s'\n", src, dest); return -1; + } - if (stat (src, &st) == -1) + if (stat(src, &st) == -1) { + printf("source doesn't exist '%s'\n", src); return -1; + } - if ((fd[0] = open (src, O_RDONLY)) == -1) + if ((readfd = open(src, O_RDONLY)) == -1) { + printf("source cannot be opened '%s'\n", src); return -1; + } - if ((fd[1] = open (dest, O_WRONLY | O_CREAT | O_TRUNC, st.st_mode & 0666)) == -1) { + if ((writefd = open(dest, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) { + printf("cannot open dest '%s' '%s'\n", dest, strerror(errno)); errnosav = errno; - close (fd[0]); + close(readfd); errno = errnosav; return -1; } - + do { do { - nread = read (fd[0], readbuf, sizeof (readbuf)); + nread = read(readfd, readbuf, sizeof(readbuf)); } while (nread == -1 && errno == EINTR); if (nread == 0) @@ -1273,7 +1282,7 @@ cp (const char *src, const char *dest, gboolean show_progress) goto exception; do { - nwritten = write (fd[1], readbuf, nread); + nwritten = write(writefd, readbuf, nread); } while (nwritten == -1 && errno == EINTR); if (nwritten < nread) @@ -1282,24 +1291,35 @@ cp (const char *src, const char *dest, gboolean show_progress) total += nwritten; if (show_progress) - em_migrate_set_progress (((double) total) / ((double) st.st_size)); + em_migrate_set_progress(((double) total) / ((double) st.st_size)); } while (total < st.st_size); - if (fsync (fd[1]) == -1) + if (fsync(writefd) == -1) goto exception; - close (fd[0]); - close (fd[1]); - + close(readfd); + if (close(writefd) == -1) + goto failwrite; + + ut.actime = st.st_atime; + ut.modtime = st.st_mtime; + utime(dest, &ut); + chmod(dest, st.st_mode); + return 0; exception: errnosav = errno; - close (fd[0]); - close (fd[1]); - unlink (dest); + close(readfd); + close(writefd); + + errno = errnosav; +failwrite: + errnosav = errno; + + unlink(dest); errno = errnosav; @@ -1315,7 +1335,7 @@ cp_r (const char *src, const char *dest) struct stat st; DIR *dir; - if (camel_mkdir (dest, st.st_mode & 0777) == -1) + if (camel_mkdir (dest, 0777) == -1) return -1; if (!(dir = opendir (src))) |