[PATCH] Define a version of lstat(2) specially for copy operation

From: Alex Riesen <raa.lkml@gmail.com>
Date: Mar 17, 2009, 21:38 UTC
Message-ID: <20090317213820.GC13458@blimp.localdomain>
In-Reply-To: <7v63i7ridk.fsf@gitster.siamese.dyndns.org>

So that Cygwin port can continue work around its supporting library and get access to its faked file attributes.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Junio C Hamano, Tue, Mar 17, 2009 21:42:31 +0100:

> But isn't this something shops that do deploy Cygwin version of git want
> to see fixed, so that they can have a site-wide policy implemented in the

Frankly, I doubt they know or care.

Show 6 quoted lines

> hooks copied from templates?  I think we could pass mode 0 to copy_files()
> and have the function special case it (and allow a platform specific
> copy_files() implementated by Cygwin).  lstat() in the copy_templates_1()
> codepath is primarily done to see if we need to descend into a directory
> or symlink() and our use of st.st_mode to pass to copy_files() is a no
> cost side effect on platforms with x-bit support.

And I don't think that the platform broken in so many ways deserves that kind of treatement. Maybe this patch is enough. Will test it tomorrow, when I get to mine so much hated Windows system.

Show 5 quoted lines

> >> access(..., X_OK), not lstat(). We don't play games with access(), do we?
> > access(..., X_OK) will return -1.
> 
> That codepath would also need to be fixed if Cygwin wants to use hooks, I
> would guess.

I hope not. In the reply to Johannes' example I was referring to the copied file, the one which was created with open(..., O_CREAT..., 0666), 0666 being there because of our lstat stub.

 builtin-init-db.c |    2 +-
 git-compat-util.h |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/builtin-init-db.c b/builtin-init-db.c
index ee3911f..f3f781b 100644
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -66,7 +66,7 @@ static void copy_templates_1(char *path, int baselen,
 		else
 			exists = 1;
 
-		if (lstat(template, &st_template))
+		if (lstat_for_copy(template, &st_template))
 			die("cannot stat template %s", template);
 
 		if (S_ISDIR(st_template.st_mode)) {
diff --git a/git-compat-util.h b/git-compat-util.h
index 878d83d..4c23478 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -85,11 +85,16 @@
 #undef _XOPEN_SOURCE
 #include <grp.h>
 #define _XOPEN_SOURCE 600
+static inline int lstat_for_copy(const char *file_name, struct stat *buf)
+{
+	return lstat(file_name, buf);
+}
 #include "compat/cygwin.h"
 #else
 #undef _ALL_SOURCE /* AIX 5.3L defines a struct list with _ALL_SOURCE. */
 #include <grp.h>
 #define _ALL_SOURCE 1
+#define lstat_for_copy lstat
 #endif
 #else 	/* __MINGW32__ */
 /* pull in Windows compatibility stuff */

-- 
1.6.2.1.171.g3422