Merge branch 'mz/doc-synopsis-verse'

diff --git a/copy.c b/copy.c
index afc4fbf41405d42d2751ea35ec7a9a32f8df6274..a7f58fd905b31b2634f74580090ec664a640e279 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -9,8 +9,7 @@ int copy_fd(int ifd, int ofd)
                if (!len)
                        break;
                if (len < 0) {
-                       int read_error;
-                       read_error = errno;
+                       int read_error = errno;
                        close(ifd);
                        return error("copy-fd: read returned %s",
                                     strerror(read_error));
@@ -25,9 +24,10 @@ int copy_fd(int ifd, int ofd)
                                close(ifd);
                                return error("copy-fd: write returned 0");
                        } else {
+                               int write_error = errno;
                                close(ifd);
                                return error("copy-fd: write returned %s",
-                                            strerror(errno));
+                                            strerror(write_error));
                        }
                }
        }
@@ -35,6 +35,19 @@ int copy_fd(int ifd, int ofd)
        return 0;
 }
 
+static int copy_times(const char *dst, const char *src)
+{
+       struct stat st;
+       struct utimbuf times;
+       if (stat(src, &st) < 0)
+               return -1;
+       times.actime = st.st_atime;
+       times.modtime = st.st_mtime;
+       if (utime(dst, &times) < 0)
+               return -1;
+       return 0;
+}
+
 int copy_file(const char *dst, const char *src, int mode)
 {
        int fdi, fdo, status;
@@ -48,10 +61,18 @@ int copy_file(const char *dst, const char *src, int mode)
        }
        status = copy_fd(fdi, fdo);
        if (close(fdo) != 0)
-               return error("%s: write error: %s", dst, strerror(errno));
+               return error("%s: close error: %s", dst, strerror(errno));
 
        if (!status && adjust_shared_perm(dst))
                return -1;
 
        return status;
 }
+
+int copy_file_with_time(const char *dst, const char *src, int mode)
+{
+       int status = copy_file(dst, src, mode);
+       if (!status)
+               return copy_times(dst, src);
+       return status;
+}