* unix/tclUnixInit.c (TclpInitLibraryPath): Purged dead code that

        * win/tclWinInit.c (TclpInitLibraryPath):       used to extend the
        "library path".  Search path construction for init.tcl is now done
        within the [tclInit] proc.

3 files changed, 11 insertions, 217 deletions

diff --git a/ChangeLog b/ChangeLog
index 18f4f72..2ac354c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-11-22  Don Porter  <dgp@users.sourceforge.net>
 
+	* unix/tclUnixInit.c (TclpInitLibraryPath):	Purged dead code that
+	* win/tclWinInit.c (TclpInitLibraryPath):	used to extend the
+	"library path".  Search path construction for init.tcl is now done
+	within the [tclInit] proc.
+
 	* generic/tclInterp.c:	Restored several directories to the search
 	* tests/unixInit.test:	path used to locate init.tcl within [tclInit].
 	This change does not restore any directories to the encoding search
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index a25d519..3592c17 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclUnixInit.c,v 1.51 2004/11/19 06:28:31 das Exp $
+ * RCS: @(#) $Id: tclUnixInit.c,v 1.52 2004/11/22 22:13:40 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -335,7 +335,7 @@ CONST char *path;		/* Path to the executable in native
     Tcl_DString buffer, ds;
     int pathc;
     CONST char **pathv;
-    char installLib[LIBRARY_SIZE], developLib[LIBRARY_SIZE];
+    char installLib[LIBRARY_SIZE];
 
     Tcl_DStringInit(&ds);
     pathPtr = Tcl_NewObj();
@@ -343,12 +343,10 @@ CONST char *path;		/* Path to the executable in native
     /*
      * Initialize the substrings used when locating an executable.  The
      * installLib variable computes the path as though the executable
-     * is installed.  The developLib computes the path as though the
-     * executable is run from a develpment directory.
+     * is installed.
      */
 
     sprintf(installLib, "lib/tcl%s", TCL_VERSION);
-    sprintf(developLib, "tcl%s/library", TCL_PATCH_LEVEL);
 
     /*
      * Look for the library relative to default encoding dir.
@@ -399,109 +397,6 @@ CONST char *path;		/* Path to the executable in native
     }
 
     /*
-     * Look for the library relative to the executable.  This algorithm
-     * should be the same as the one in the tcl_findLibrary procedure.
-     *
-     * This code looks in the following directories:
-     *
-     *	<bindir>/../<installLib>
-     *	  (e.g. /usr/local/bin/../lib/tcl8.4)
-     *	<bindir>/../../<installLib>
-     *	  (e.g. /usr/local/TclPro/solaris-sparc/bin/../../lib/tcl8.4)
-     *	<bindir>/../library
-     *	  (e.g. /usr/src/tcl8.4.0/unix/../library)
-     *	<bindir>/../../library
-     *	  (e.g. /usr/src/tcl8.4.0/unix/solaris-sparc/../../library)
-     *	<bindir>/../../<developLib>
-     *	  (e.g. /usr/src/tcl8.4.0/unix/../../tcl8.4.0/library)
-     *	<bindir>/../../../<developLib>
-     *	  (e.g. /usr/src/tcl8.4.0/unix/solaris-sparc/../../../tcl8.4.0/library)
-     */
-
-     /*
-      * The variable path holds an absolute path.  Take care not to
-      * overwrite pathv[0] since that might produce a relative path.
-      */
-
-    if (0 && path != NULL) {
-	int i, origc;
-	CONST char **origv;
-
-	Tcl_SplitPath(path, &origc, &origv);
-	pathc = 0;
-	pathv = (CONST char **) ckalloc((unsigned int)(origc * sizeof(char *)));
-	for (i=0; i< origc; i++) {
-	    if (origv[i][0] == '.') {
-		if (strcmp(origv[i], ".") == 0) {
-		    /* do nothing */
-		} else if (strcmp(origv[i], "..") == 0) {
-		    pathc--;
-		} else {
-		    pathv[pathc++] = origv[i];
-		}
-	    } else {
-		pathv[pathc++] = origv[i];
-	    }
-	}
-	if (pathc > 2) {
-	    str = pathv[pathc - 2];
-	    pathv[pathc - 2] = installLib;
-	    path = Tcl_JoinPath(pathc - 1, pathv, &ds);
-	    pathv[pathc - 2] = str;
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	if (pathc > 3) {
-	    str = pathv[pathc - 3];
-	    pathv[pathc - 3] = installLib;
-	    path = Tcl_JoinPath(pathc - 2, pathv, &ds);
-	    pathv[pathc - 3] = str;
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	if (pathc > 2) {
-	    str = pathv[pathc - 2];
-	    pathv[pathc - 2] = "library";
-	    path = Tcl_JoinPath(pathc - 1, pathv, &ds);
-	    pathv[pathc - 2] = str;
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	if (pathc > 3) {
-	    str = pathv[pathc - 3];
-	    pathv[pathc - 3] = "library";
-	    path = Tcl_JoinPath(pathc - 2, pathv, &ds);
-	    pathv[pathc - 3] = str;
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	if (pathc > 3) {
-	    str = pathv[pathc - 3];
-	    pathv[pathc - 3] = developLib;
-	    path = Tcl_JoinPath(pathc - 2, pathv, &ds);
-	    pathv[pathc - 3] = str;
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	if (pathc > 4) {
-	    str = pathv[pathc - 4];
-	    pathv[pathc - 4] = developLib;
-	    path = Tcl_JoinPath(pathc - 3, pathv, &ds);
-	    pathv[pathc - 4] = str;
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	ckfree((char *) origv);
-	ckfree((char *) pathv);
-    }
-
-    /*
      * Finally, look for the library relative to the compiled-in path.
      * This is needed when users install Tcl with an exec-prefix that
      * is different from the prtefix.
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index 2fc4fc1..a3a66ee 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclWinInit.c,v 1.61 2004/07/08 16:53:54 kennykb Exp $
+ * RCS: @(#) $Id: tclWinInit.c,v 1.62 2004/11/22 22:13:42 dgp Exp $
  */
 
 #include "tclWinInt.h"
@@ -336,7 +336,7 @@ TclpInitLibraryPath(path)
     Tcl_DString ds;
     int objc, pathc;
     CONST char **pathv;
-    char installLib[LIBRARY_SIZE], developLib[LIBRARY_SIZE];
+    char installLib[LIBRARY_SIZE];
 
     Tcl_DStringInit(&ds);
     pathPtr = Tcl_NewObj();
@@ -344,12 +344,10 @@ TclpInitLibraryPath(path)
     /*
      * Initialize the substrings used when locating an executable.  The
      * installLib variable computes the path as though the executable
-     * is installed.  The developLib computes the path as though the
-     * executable is run from a develpment directory.
+     * is installed.
      */
 
     sprintf(installLib, "lib/tcl%s", TCL_VERSION);
-    sprintf(developLib, "tcl%s/library", TCL_PATCH_LEVEL);
 
     /*
      * Look for the library relative to default encoding dir.
@@ -379,110 +377,6 @@ TclpInitLibraryPath(path)
 
     Tcl_ListObjGetElements(NULL, pathPtr, &objc, &objv);
     SetDefaultLibraryDir(Tcl_DuplicateObj(objv[objc-1]));
-
-    /*
-     * Look for the library relative to the executable.  This algorithm
-     * should be the same as the one in the tcl_findLibrary procedure.
-     *
-     * This code looks in the following directories:
-     *
-     *	<bindir>/../<installLib>
-     *	  (e.g. /usr/local/bin/../lib/tcl8.4)
-     *	<bindir>/../../<installLib>
-     * 	  (e.g. /usr/local/TclPro/solaris-sparc/bin/../../lib/tcl8.4)
-     *	<bindir>/../library
-     * 	  (e.g. /usr/src/tcl8.4.0/unix/../library)
-     *	<bindir>/../../library
-     *	  (e.g. /usr/src/tcl8.4.0/unix/solaris-sparc/../../library)
-     *	<bindir>/../../<developLib>
-     *	  (e.g. /usr/src/tcl8.4.0/unix/../../tcl8.4.0/library)
-     *	<bindir>/../../../<developLib>
-     *	   (e.g. /usr/src/tcl8.4.0/unix/solaris-sparc/../../../tcl8.4.0/library)
-     */
-
-    /*
-     * The variable path holds an absolute path.  Take care not to
-     * overwrite pathv[0] since that might produce a relative path.
-     */
-
-    if (0 && path != NULL) {
-	int i, origc;
-	CONST char **origv;
-
-	Tcl_SplitPath(path, &origc, &origv);
-	pathc = 0;
-	pathv = (CONST char **) ckalloc((unsigned) (origc * sizeof(char *)));
-	for (i=0; i< origc; i++) {
-	    if (origv[i][0] == '.') {
-		if (strcmp(origv[i], ".") == 0) {
-		    /* do nothing */
-		} else if (strcmp(origv[i], "..") == 0) {
-		    pathc--;
-		} else {
-		    pathv[pathc++] = origv[i];
-		}
-	    } else {
-		pathv[pathc++] = origv[i];
-	    }
-	}
-	if (pathc > 2) {
-	    str = pathv[pathc - 2];
-	    pathv[pathc - 2] = installLib;
-	    path = Tcl_JoinPath(pathc - 1, pathv, &ds);
-	    pathv[pathc - 2] = str;
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	if (pathc > 3) {
-	    str = pathv[pathc - 3];
-	    pathv[pathc - 3] = installLib;
-	    path = Tcl_JoinPath(pathc - 2, pathv, &ds);
-	    pathv[pathc - 3] = str;
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	if (pathc > 2) {
-	    str = pathv[pathc - 2];
-	    pathv[pathc - 2] = "library";
-	    path = Tcl_JoinPath(pathc - 1, pathv, &ds);
-	    pathv[pathc - 2] = str;
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	if (pathc > 3) {
-	    str = pathv[pathc - 3];
-	    pathv[pathc - 3] = "library";
-	    path = Tcl_JoinPath(pathc - 2, pathv, &ds);
-	    pathv[pathc - 3] = str;
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	if (pathc > 3) {
-	    str = pathv[pathc - 3];
-	    pathv[pathc - 3] = developLib;
-	    path = Tcl_JoinPath(pathc - 2, pathv, &ds);
-	    pathv[pathc - 3] = str;
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	if (pathc > 4) {
-	    str = pathv[pathc - 4];
-	    pathv[pathc - 4] = developLib;
-	    path = Tcl_JoinPath(pathc - 3, pathv, &ds);
-	    pathv[pathc - 4] = str;
-	    objPtr = Tcl_NewStringObj(path, Tcl_DStringLength(&ds));
-	    Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-	    Tcl_DStringFree(&ds);
-	}
-	ckfree((char *) origv);
-	ckfree((char *) pathv);
-    }
-
     TclSetLibraryPath(pathPtr);
 
     return 0; /* 0 indicates that pathPtr is clean (true) utf */