Add -p flag for install tool

diff --git a/commands/simple/install.c b/commands/simple/install.c
index b167195e2c44e188bf4ee8da0484f1223cac5c27..a6d638dd25e4fc64c1b0ab806c15ced3a7e02e17 100644 (file)
--- a/commands/simple/install.c
+++ b/commands/simple/install.c
@@ -60,6 +60,7 @@ void deallocate(void *mem)
 int lflag= 0;          /* Make a hard link if possible. */
 int cflag= 0;          /* Copy if you can't link, otherwise symlink. */
 int dflag= 0;          /* Create a directory. */
+int pflag= 0;          /* Preserve timestamps. */
 int strip= 0;          /* Strip the copy. */
 char **compress= nil;  /* Compress utility to make a compressed executable. */
 char *zcat= nil;       /* Line one to decompress. */
@@ -169,6 +170,17 @@ void makedir(char *dir, int mode, int owner, int group)
                        /* Set the mode again, chown may have wrecked it. */
                        (void) chmod(dir, mode);
                }
+               
+               if (pflag) {
+                       struct utimbuf ubuf;
+
+                       ubuf.actime= st.st_atime;
+                       ubuf.modtime= st.st_mtime;
+
+                       if (utime(dir, &ubuf) < 0 && errno != EPERM) {
+                               report(dir); return;
+                       }
+               }
        }
 }
 
@@ -382,7 +394,7 @@ void copylink(char *source, char *dest, int mode, int owner, int group)
                /* Set the mode again, chown may have wrecked it. */
                (void) chmod(dest, mode);
        }
-       if (!change) {
+       if (!change || pflag) {
                struct utimbuf ubuf;
 
                ubuf.actime= dst.st_atime;
@@ -398,8 +410,8 @@ void usage(void)
 {
        fprintf(stderr, "\
 Usage:\n\
-  install [-lcsz#] [-o owner] [-g group] [-m mode] [-S stack] [file1] file2\n\
-  install [-lcsz#] [-o owner] [-g group] [-m mode] [-S stack] file ... dir\n\
+  install [-lcpsz#] [-o owner] [-g group] [-m mode] [-S stack] [file1] file2\n\
+  install [-lcpsz#] [-o owner] [-g group] [-m mode] [-S stack] file ... dir\n\
   install -d [-o owner] [-g group] [-m mode] directory\n");
        exit(1);
 }
@@ -447,6 +459,7 @@ void main(int argc, char **argv)
                        case 'c':       cflag= 1;       break;
                        case 's':       strip= 1;       break;
                        case 'd':       dflag= 1;       break;
+                       case 'p':       pflag= 1;       break;
                        case 'z':
                                if (compress == nil) {
                                        compress= COMPRESS;

diff --git a/man/man1/install.1 b/man/man1/install.1
index 081dd6ac4b12eb3e3d929418be056b6d2d5ee902..d76356f78c87260ec1ada0991bd4b0b3e13d422e 100644 (file)
--- a/man/man1/install.1
+++ b/man/man1/install.1
@@ -5,7 +5,7 @@ install \- install files
 .in +5
 .ti -5
 .B install
-.RB [ \-lcsz\fIN\fP "] [" \-o
+.RB [ \-lcpsz\fIN\fP "] [" \-o
 .IR owner ]
 .RB [ \-g
 .IR group ]
@@ -18,7 +18,7 @@ install \- install files
 .br
 .ti -5
 .B install
-.RB [ \-lcsz\fIN\fP "] [" \-o
+.RB [ \-lcpsz\fIN\fP "] [" \-o
 .IR owner ]
 .RB [ \-g
 .IR group ]
@@ -80,6 +80,9 @@ is not given.  With
 .BR \-l ,
 the file is copied if the link fails.
 .TP
+.B \-p
+Preserve timestamp on source file or directory.
+.TP
 .B \-s
 Strip the destination file of its symbol table,
 .I if