Attachment 228581 Details for Bug 278571 – fix candidate

[patch] fix candidate

shadow-utils-utime.patch (text/plain), 2.12 KB, created by Peter Vrabec on 2007-10-16 11:45:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Vrabec

Created: 2007-10-16 11:45:46 UTC

Size: 2.12 KB

patch

obsolete

>diff -up shadow-4.0.18.1/libmisc/copydir.c.utime shadow-4.0.18.1/libmisc/copydir.c
>--- shadow-4.0.18.1/libmisc/copydir.c.utime	2007-10-16 11:36:54.000000000 +0200
>+++ shadow-4.0.18.1/libmisc/copydir.c	2007-10-16 11:40:17.000000000 +0200
>@@ -33,6 +33,7 @@
> 
> #include <sys/stat.h>
> #include <sys/types.h>
>+#include <utime.h>
> #include <fcntl.h>
> #include <stdio.h>
> #include "prototypes.h"
>@@ -154,6 +155,7 @@ int copy_tree (const char *src_root, con
> 	struct DIRECT *ent;
> 	struct stat sb;
> 	struct link_name *lp;
>+	struct utimbuf ut;
> 	DIR *dir;
> 
> 	/*
>@@ -215,6 +217,9 @@ int copy_tree (const char *src_root, con
> 		if (LSTAT (src_name, &sb) == -1)
> 			continue;
> 
>+		ut.actime  = sb.st_atime;
>+		ut.modtime = sb.st_mtime;
>+		
> 		if (S_ISDIR (sb.st_mode)) {
> 
> 			/*
>@@ -230,7 +235,8 @@ int copy_tree (const char *src_root, con
> 				      uid == (uid_t) - 1 ? sb.st_uid : uid,
> 				      gid == (gid_t) - 1 ? sb.st_gid : gid)
> 			    || chmod (dst_name, sb.st_mode)
>-			    || copy_tree (src_name, dst_name, uid, gid)) {
>+			    || copy_tree (src_name, dst_name, uid, gid)
>+			    || utime (dst_name, &ut)) {
> 				err++;
> 				break;
> 			}
>@@ -270,10 +276,11 @@ int copy_tree (const char *src_root, con
> #ifdef WITH_SELINUX
> 			selinux_file_context (dst_name);
> #endif
>-			if (symlink (oldlink, dst_name) ||
>-			    lchown (dst_name,
>+			if (symlink (oldlink, dst_name)
>+			    || lchown (dst_name,
> 				    uid == (uid_t) - 1 ? sb.st_uid : uid,
>-				    gid == (gid_t) - 1 ? sb.st_gid : gid)) {
>+				    gid == (gid_t) - 1 ? sb.st_gid : gid)
>+			    || utime (dst_name, &ut)) {
> 				err++;
> 				break;
> 			}
>@@ -314,7 +321,8 @@ int copy_tree (const char *src_root, con
> 			    || chown (dst_name,
> 				      uid == (uid_t) - 1 ? sb.st_uid : uid,
> 				      gid == (gid_t) - 1 ? sb.st_gid : gid)
>-			    || chmod (dst_name, sb.st_mode & 07777)) {
>+			    || chmod (dst_name, sb.st_mode & 07777)
>+			    || utime (dst_name, &ut)) {
> 				err++;
> 				break;
> 			}
>@@ -352,6 +360,11 @@ int copy_tree (const char *src_root, con
> 		close (ifd);
> 		close (ofd);
> 
>+		if (utime (dst_name, &ut) != 0) {
>+		  err++;
>+		  break;
>+		}
>+
> 		if (cnt == -1) {
> 			err++;
> 			break;

Actions: View | Diff

Attachments on bug 278571: 228581