===================================================================
RCS file: /cvs/djgpp/djgpp/src/utils/djmerge.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -u -r1.3 -r1.4
--- djgpp/src/utils/djmerge.c	1999/12/14 12:01:36	1.3
+++ /cvs/djgpp/djgpp/src/utils/djmerge.c	2001/01/20 09:20:39	1.4
@@ -5,6 +5,9 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <utime.h>
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -15,8 +18,9 @@
 static void
 usage(void)
 {
-  fprintf(stderr,"Usage: djmerge [inputBase] [outputFile]\n");
+  fprintf(stderr,"Usage: djmerge [-t] [inputBase] [outputFile]\n");
   fprintf(stderr, "reads <inputBase>.000, <inputBase>.001, etc\n");
+  fprintf(stderr, " -t means don't set the file's time stamp and modes as for original file\n");
   exit(1);
 }
 
@@ -35,10 +39,18 @@ main(int argc, char **argv)
   long r;
   int partnum;
   int outf, f;
+  struct stat stbuf;
+  int preserve_file_time = 1;
   
-  if (argc != 3)
+  if (argc != 3 && argc != 4)
     usage();
 
+  if (strcmp(argv[1], "-t") == 0)
+  {
+    preserve_file_time = 0;
+    ++argv;
+  }
+
   outf = open(argv[2], O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0666);
   if (outf < 0)
     usage();
@@ -51,6 +63,11 @@ main(int argc, char **argv)
     perror("");
     exit(1);
   }
+  else if (fstat(f, &stbuf) != 0)
+  {
+    perror("Couldn't fstat, file's time and modes won't be preserved");
+    preserve_file_time = 0;
+  }
   while (1)
   {
     r = read(f, buf, BUFS);
@@ -63,7 +80,17 @@ main(int argc, char **argv)
 
       if (f < 0)
       {
+	struct utimbuf timbuf;
+
         close(outf);
+	if (preserve_file_time)
+	{
+	  timbuf.actime = stbuf.st_atime;
+	  timbuf.modtime = stbuf.st_mtime;
+	  utime(argv[2], &timbuf);
+	  chown(argv[2], stbuf.st_uid, stbuf.st_gid);
+	  chmod(argv[2], stbuf.st_mode);
+	}
         exit(0);
       }
     }