Re: [patch] symfile find_separate_debug_file

[Aleksandar Ristovski <aristovski@qnx.com>]

[-- Attachment #1: Type: text/plain, Size: 1076 bytes --]

Tom Tromey wrote:
>>>>>> "Doug" == Doug Evans <dje@google.com> writes:
> 
> Doug> fwiw, I wouldn't mind an elaboration of the comment, e.g. provide an
> Doug> example when  "unless there isn't" happens.  Otherwise I have to go
> Doug> looking and assume what I find is what the comment is referring to.
> 
> Sounds reasonable to me.

My initial idea was to remove that comment altogether since 
it describes an assumption that may have been good at the 
time, but doesn't stand any longer. But then went with 
"minimal change" approach.

The code itself is clear and I don't think it needs 
explanation: if file does not contain any directory 
separators, use current directory. It happens when gdb opens 
a shared library from its current directory (e.g. libc.so.3).

So how about I remove portion of that comment, and leave 
only generic part that makes no assumptions about presence 
of dir. separators? (new patch attached).

-- 
Aleksandar Ristovski
QNX Software Systems

* symfile.c (find_separate_debug_file): Fix the case when 
objfile has only basename as its name.


[-- Attachment #2: symfile-20090814.diff --]
[-- Type: text/x-patch, Size: 1005 bytes --]

Index: gdb/symfile.c
===================================================================
RCS file: /cvs/src/src/gdb/symfile.c,v
retrieving revision 1.240
@@ -1377,15 +1371,21 @@ find_separate_debug_file (struct objfile
   dir = xstrdup (objfile->name);
 
   /* Strip off the final filename part, leaving the directory name,
-     followed by a slash.  Objfile names should always be absolute and
-     tilde-expanded, so there should always be a slash in there
-     somewhere.  */
-  for (i = strlen(dir) - 1; i >= 0; i--)
+     followed by a slash.  */
+  for (i = strlen (dir) - 1; i >= 0; i--)
     {
       if (IS_DIR_SEPARATOR (dir[i]))
 	break;
     }
-  gdb_assert (i >= 0 && IS_DIR_SEPARATOR (dir[i]));
+  if (i < 0)
+    {
+      /* We are dealing with base name only.  Make it current dir.  */
+      if (strlen (dir) < 2)
+	dir = xrealloc (dir, 3);
+      dir[0] = '.';
+      dir[1] = '/';
+      i = 1;
+    }
   dir[i+1] = '\0';
 
   /* Set I to max (strlen (canon_name), strlen (dir)). */