* defs.h (OPF_TRY_CWD_FIRST, OPF_SEARCH_IN_PATH): New macros.

	* exec.c (exec_file_attach):
	* nto-tdep.c (nto_find_and_open_solib):
	* pa64solib.c (pa64_solib_sizeof_symbol_table):
	* solib.c (solib_open):
	* somsolib.c (som_solib_sizeof_symbol_table):
	* source.c (is_regular_file, openp, open_source_file):
	* symfile.c (symfile_bfd_open):
	* wince.c (upload_to_device): Differentiate between the search for
	binary and source files.

	* gdb.texinfo (Source Path): Document the new behavior of
	searching for the source files.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f42911d3ac74d710ec6d18813192748cf0b92e09..4932138c58aac05ac74dc99345f34f74b4a1f2df 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2004-07-30  Baurjan Ismagulov  <ibr@ata.cs.hun.edu.tr>
+
+       * defs.h (OPF_TRY_CWD_FIRST, OPF_SEARCH_IN_PATH): New macros.
+
+       * exec.c (exec_file_attach):
+       * nto-tdep.c (nto_find_and_open_solib):
+       * pa64solib.c (pa64_solib_sizeof_symbol_table):
+       * solib.c (solib_open):
+       * somsolib.c (som_solib_sizeof_symbol_table):
+       * source.c (is_regular_file, openp, open_source_file):
+       * symfile.c (symfile_bfd_open):
+       * wince.c (upload_to_device): Differentiate between the search for
+       binary and source files.
+
 2004-07-30  Andrew Cagney  <cagney@gnu.org>
 
        * complaints.c (_initialize_complaints): Pass NULL to

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 39455511fffdbd293131d0f6b5c368a6289f3c4a..e41c2431ca22c6ea085815f42c068bebdd492d33 100644 (file)
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-30  Baurjan Ismagulov  <ibr@ata.cs.hun.edu.tr>
+
+       * gdb.texinfo (Source Path): Document the new behavior of
+       searching for the source files.
+
 2004-07-17  Eli Zaretskii  <eliz@gnu.org>
 
        * gdb.texinfo (Edit): Fix markup of EDITOR and improve wording.

diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 5435aabe27baef6d7afdc62f49bfb0f614ae43c1..0f4f2770bd588dd9926d8056a2bf2dffaaca644d 100644 (file)
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -4519,16 +4519,30 @@ the directories could be moved between the compilation and your debugging
 session.  @value{GDBN} has a list of directories to search for source files;
 this is called the @dfn{source path}.  Each time @value{GDBN} wants a source file,
 it tries all the directories in the list, in the order they are present
-in the list, until it finds a file with the desired name.  Note that
-the executable search path is @emph{not} used for this purpose.  Neither is
-the current working directory, unless it happens to be in the source
-path.
-
-If @value{GDBN} cannot find a source file in the source path, and the
-object program records a directory, @value{GDBN} tries that directory
-too.  If the source path is empty, and there is no record of the
-compilation directory, @value{GDBN} looks in the current directory as a
-last resort.
+in the list, until it finds a file with the desired name.
+
+For example, suppose an executable references the file
+@file{/usr/src/foo-1.0/lib/foo.c}, and our source path is
+@file{/mnt/cross}.  The file is first looked up literally; if this
+fails, @file{/mnt/cross/usr/src/foo-1.0/lib/foo.c} is tried; if this
+fails, @file{/mnt/cross/foo.c} is opened; if this fails, an error
+message is printed.  @value{GDBN} does not look up the parts of the
+source file name, such as @file{/mnt/cross/src/foo-1.0/lib/foo.c}.
+Likewise, the subdirectories of the source path are not searched: if
+the source path is @file{/mnt/cross}, and the binary refers to
+@file{foo.c}, @value{GDBN} would not find it under
+@file{/mnt/cross/usr/src/foo-1.0/lib}.
+
+Plain file names, relative file names with leading directories, file
+names containing dots, etc.@: are all treated as described above; for
+instance, if the source path is @file{/mnt/cross}, and the source file
+is recorded as @file{../lib/foo.c}, @value{GDBN} would first try
+@file{../lib/foo.c}, then @file{/mnt/cross/../lib/foo.c}, and after
+that---@file{/mnt/cross/foo.c}.
+
+Note that the executable search path is @emph{not} used to locate the
+source files.  Neither is the current working directory, unless it
+happens to be in the source path.
 
 Whenever you reset or rearrange the source path, @value{GDBN} clears out
 any information it has cached about where source files are found and where

diff --git a/gdb/wince.c b/gdb/wince.c
index b70e5b9fee69f1a2336206c62287565431cbcb30..a9dafee1cb740a0f0393b6abc9b2d4bdc8e9474f 100644 (file)
--- a/gdb/wince.c
+++ b/gdb/wince.c
@@ -1587,7 +1587,8 @@ upload_to_device (const char *to, const char *from)
     return remotefile;         /* Don't bother uploading. */
 
   /* Open the source. */
-  if ((fd = openp (getenv ("PATH"), TRUE, (char *) from, O_RDONLY, 0, NULL)) < 0)
+  if ((fd = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST, (char *) from, O_RDONLY,
+                  0, NULL)) < 0)
     error ("couldn't open %s", from);
 
   /* Get the time for later comparison. */