From mboxrd@z Thu Jan  1 00:00:00 1970
From: Martin Erik Werner <martinerikwerner@gmail.com>
Subject: [PATCH v4 3/4] setup: Add 'abspath_part_inside_repo' function
Date: Sun,  2 Feb 2014 02:59:10 +0100
Message-ID: <1391306351-13237-4-git-send-email-martinerikwerner@gmail.com>
References: <20140131202142.GA9731@mule>
 <1391306351-13237-1-git-send-email-martinerikwerner@gmail.com>
Cc: richih@debian.org, tboegi@web.de, gitster@pobox.com,
	pclouds@gmail.com, Martin Erik Werner <martinerikwerner@gmail.com>
To: git@vger.kernel.org
X-From: git-owner@vger.kernel.org Sun Feb 02 03:00:12 2014
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@plane.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <git-owner@vger.kernel.org>)
	id 1W9mLz-0007u1-PZ
	for gcvg-git-2@plane.gmane.org; Sun, 02 Feb 2014 03:00:12 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751466AbaBBCAE (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Sat, 1 Feb 2014 21:00:04 -0500
Received: from mail-lb0-f182.google.com ([209.85.217.182]:62569 "EHLO
	mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751107AbaBBCAD (ORCPT <rfc822;git@vger.kernel.org>);
	Sat, 1 Feb 2014 21:00:03 -0500
Received: by mail-lb0-f182.google.com with SMTP id w7so4564214lbi.27
        for <git@vger.kernel.org>; Sat, 01 Feb 2014 18:00:01 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=from:to:cc:subject:date:message-id:in-reply-to:references;
        bh=bEypwsydNlXxzPUaw3njsx98GOpo1XZKyFnOtStmZHg=;
        b=seAuw3E/ZNFo0KXCLHWX6dkttB7Y0UqHE7F4prWyUEl3ZsUfBFRMoeaByvLbtgEsML
         xmDyLrlSRgjlCBSazrLrQ64uvMEhsN4B/6EjWoDVtBTXFO/NDs/bPm2XnlBEUrJGzsE6
         l3Dhqenpbnj2vniAHDNRY1QO/eVzacqcUyTqH50NAnb+hCkBODCVKWl4iJD3g61CnGgt
         7gvH8fUinx3OGtklZ7ItU2alrp5al7190+POGMy9j420EmgwiwQHIR2NxbqwyKKTUV0h
         mKtZDkY9rb0nDV3vS2hL07k2u+zr+JxCXBaFM7BVR7EPc6wLPKkRpiazKVZRB7mLFQpa
         OnRw==
X-Received: by 10.112.140.202 with SMTP id ri10mr18775320lbb.9.1391306401568;
        Sat, 01 Feb 2014 18:00:01 -0800 (PST)
Received: from mule.student.uu.se (nl116-226-21.student.uu.se. [130.243.226.21])
        by mx.google.com with ESMTPSA id g8sm22136585lae.1.2014.02.01.17.59.59
        for <multiple recipients>
        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
        Sat, 01 Feb 2014 18:00:00 -0800 (PST)
X-Mailer: git-send-email 1.8.5.2
In-Reply-To: <1391306351-13237-1-git-send-email-martinerikwerner@gmail.com>
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/241349>

In order to extract the part of an absolute path which lies inside the
repo, it is not possible to directly use real_path, since that would
dereference symlinks both outside and inside the work tree.

Add an 'abspath_part_inside_repo' function which first checks if the
work tree is already the prefix, then incrementally checks each path
level by temporarily NUL-terminating at each '/' and comparing against
the work tree path. If a match is found, it overwrites the input path
with the remainder past the work tree (which will be the in-repo part).

The path being exactly equal to the work tree is handled separately,
since then there is no directory separator between the work tree and
in-repo part.

This function is currently only intended for use in
'prefix_path_gently'.

Signed-off-by: Martin Erik Werner <martinerikwerner@gmail.com>
---
 setup.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/setup.c b/setup.c
index 5432a31..e938785 100644
--- a/setup.c
+++ b/setup.c
@@ -6,6 +6,63 @@ static int inside_git_dir = -1;
 static int inside_work_tree = -1;
 
 /*
+ * No checking if the path is in fact an absolute path is done, and it must
+ * already be normalized.
+ *
+ * Find the part of an absolute path that lies inside the work tree by
+ * dereferencing symlinks outside the work tree, for example:
+ * /dir1/repo/dir2/file   (work tree is /dir1/repo)      -> dir2/file
+ * /dir/file              (work tree is /)               -> dir/file
+ * /dir/symlink1/symlink2 (symlink1 points to work tree) -> symlink2
+ * /dir/repo              (exactly equal to work tree)   -> (empty string)
+ */
+static inline int abspath_part_inside_repo(char *path)
+{
+	size_t len;
+	size_t wtlen;
+	char *path0;
+
+	const char* work_tree = get_git_work_tree();
+	if (!work_tree)
+		return -1;
+	wtlen = strlen(work_tree);
+	len = strlen(path);
+
+	/* check if work tree is already the prefix */
+	if (strncmp(path, work_tree, wtlen) == 0) {
+		if (path[wtlen] == '/')
+			memmove(path, path + wtlen + 1, len - wtlen);
+		else
+			/* work tree is the root, or the whole path */
+			memmove(path, path + wtlen, len - wtlen + 1);
+		return 0;
+	}
+	path0 = path;
+	path += offset_1st_component(path);
+
+	/* check each level */
+	while (*path != '\0') {
+		path++;
+		if (*path == '/') {
+			*path = '\0';
+			if (strcmp(real_path(path0), work_tree) == 0) {
+				memmove(path0, path + 1, len - (path - path0));
+				return 0;
+			}
+			*path = '/';
+		}
+	}
+
+	/* check whole path */
+	if (strcmp(real_path(path0), work_tree) == 0) {
+		*path0 = '\0';
+		return 0;
+	}
+
+	return -1;
+}
+
+/*
  * Normalize "path", prepending the "prefix" for relative paths. If
  * remaining_prefix is not NULL, return the actual prefix still
  * remains in the path. For example, prefix = sub1/sub2/ and path is
-- 
1.8.5.2