From owner-p4-projects  Fri Mar  7  7:52:29 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AD46A37B401; Fri,  7 Mar 2003 07:52:25 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3DF6337B405
	for <perforce@freebsd.org>; Fri,  7 Mar 2003 07:52:25 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B3B0943FBD
	for <perforce@freebsd.org>; Fri,  7 Mar 2003 07:52:24 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h27FqO0U053310
	for <perforce@freebsd.org>; Fri, 7 Mar 2003 07:52:24 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h27FqOwC053307
	for perforce@freebsd.org; Fri, 7 Mar 2003 07:52:24 -0800 (PST)
Date: Fri, 7 Mar 2003 07:52:24 -0800 (PST)
Message-Id: <200303071552.h27FqOwC053307@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 26492 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=26492

Change 26492 by jhb@jhb_laptop on 2003/03/07 07:52:09

	Trim annoying ../'s from the beginning of filenames.  Hopefully this
	will cleanup a few things.

Affected files ...

.. //depot/projects/smpng/sys/kern/subr_witness.c#84 edit

Differences ...

==== //depot/projects/smpng/sys/kern/subr_witness.c#84 (text+ko) ====

@@ -167,6 +167,7 @@
 		    struct witness *oldparent);
 static void	witness_displaydescendants(void(*)(const char *fmt, ...),
 					   struct witness *);
+static const char *fixup_filename(const char *file);
 static void	witness_leveldescendents(struct witness *parent, int level);
 static void	witness_levelall(void);
 static struct	witness *witness_get(void);
@@ -545,6 +546,18 @@
 }
 #endif /* DDB */
 
+/* Trim useless garbage from filenames. */
+static const char *
+fixup_filename(const char *file)
+{
+
+	if (file == NULL)
+		return (NULL);
+	while (strncmp(file, "../", 3) == 0)
+		file += 3;
+	return (file);
+}
+
 void
 witness_lock(struct lock_object *lock, int flags, const char *file, int line)
 {
@@ -564,6 +577,7 @@
 	w = lock->lo_witness;
 	class = lock->lo_class;
 	td = curthread;
+	file = fixup_filename(file);
 
 	if (class->lc_flags & LC_SLEEPLOCK) {
 		/*
@@ -838,6 +852,7 @@
 	if (lock->lo_witness == NULL || witness_dead || panicstr != NULL)
 		return;
 	class = lock->lo_class;
+	file = fixup_filename(file);
 	if ((lock->lo_flags & LO_UPGRADABLE) == 0)
 		panic("upgrade of non-upgradable lock (%s) %s @ %s:%d",
 		    class->lc_name, lock->lo_name, file, line);
@@ -872,6 +887,7 @@
 	if (lock->lo_witness == NULL || witness_dead || panicstr != NULL)
 		return;
 	class = lock->lo_class;
+	file = fixup_filename(file);
 	if ((lock->lo_flags & LO_UPGRADABLE) == 0)
 		panic("downgrade of non-upgradable lock (%s) %s @ %s:%d",
 		    class->lc_name, lock->lo_name, file, line);
@@ -907,6 +923,7 @@
 		return;
 	td = curthread;
 	class = lock->lo_class;
+	file = fixup_filename(file);
 	if (class->lc_flags & LC_SLEEPLOCK)
 		lock_list = &td->td_sleeplocks;
 	else
@@ -1667,6 +1684,7 @@
 		    lock->lo_class->lc_name, lock->lo_name);
 		return;
 	}
+	file = fixup_filename(file);
 	switch (flags) {
 	case LA_UNLOCKED:
 		if (instance != NULL)

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message