From 072b10225217d5ae073051998515a921c167ded5 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Mon, 13 Jan 2003 20:11:47 +0000 Subject: [PATCH] * source.c (openp): If the file does not exist don't necessarily search the path. --- gdb/ChangeLog | 5 +++++ gdb/source.c | 19 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index de950fe..e4da29e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2003-01-13 Daniel Jacobowitz + * source.c (openp): If the file does not exist don't necessarily + search the path. + +2003-01-13 Daniel Jacobowitz + Fix PR gdb/872. * gdbtypes.c (init_type): Mark "char" as TYPE_FLAG_NOSIGN. (integer_types_same_name_p): New function. diff --git a/gdb/source.c b/gdb/source.c index c2991b5..e6cd3f3 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -674,14 +674,21 @@ openp (const char *path, int try_cwd_first, const char *string, mode |= O_BINARY; #endif - if ((try_cwd_first || IS_ABSOLUTE_PATH (string)) && is_regular_file (string)) + if (try_cwd_first || IS_ABSOLUTE_PATH (string)) { int i; - filename = alloca (strlen (string) + 1); - strcpy (filename, string); - fd = open (filename, mode, prot); - if (fd >= 0) - goto done; + + if (is_regular_file (string)) + { + filename = alloca (strlen (string) + 1); + strcpy (filename, string); + fd = open (filename, mode, prot); + if (fd >= 0) + goto done; + } + else + fd = -1; + for (i = 0; string[i]; i++) if (IS_DIR_SEPARATOR (string[i])) goto done; -- 2.7.4