[PATCH] symfile.c, find_separate_debug_file

[msnyder@sonic.net]

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

Just for a change, here's one that was not inspired by Coverity.

Find separate debug file does not work in the case where the path
lies in the global debug file directory -- because we stick an extra
slash into the pathname.


[-- Attachment #2: debug-file-dir.txt --]
[-- Type: text/plain, Size: 996 bytes --]

2007-08-02  Michael Snyder  <msnyder@access-company.com>

	* symfile.c (find_separate_debug_file): While consing up a path, 
	don't stick in an extra DIR_SEPARATOR.

Index: symfile.c
===================================================================
RCS file: /cvs/src/src/gdb/symfile.c,v
retrieving revision 1.189
diff -p -r1.189 symfile.c
*** symfile.c	31 Jul 2007 21:42:19 -0000	1.189
--- symfile.c	3 Aug 2007 01:10:42 -0000
*************** find_separate_debug_file (struct objfile
*** 1355,1361 ****
  
    /* Then try in the global debugfile directory.  */
    strcpy (debugfile, debug_file_directory);
!   strcat (debugfile, "/");
    strcat (debugfile, dir);
    strcat (debugfile, basename);
  
--- 1355,1364 ----
  
    /* Then try in the global debugfile directory.  */
    strcpy (debugfile, debug_file_directory);
! 
!   if (debugfile[strlen (debugfile) - 1] != '/' && dir[0] != '/')
!     strcat (debugfile, "/");
! 
    strcat (debugfile, dir);
    strcat (debugfile, basename);