Re: [RFA] Should openp open directories?

[Joel Brobecker <brobecker@ACT-Europe.FR>]

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

> This is okay with me (non-existing files will fail the open call
> anyhow).

Sorry for the delay. Here is a new patch, based on our discussion:

2002-04-18  Joel Brobecker  <brobecker@gnat.com>

        * source.c (is_regular_file): New function.
        (openp): Check wether file to open is a regular file
        to avoid opening directories.

Ok to commit?
-- 
Joel

[-- Attachment #2: source.c.diff --]
[-- Type: text/plain, Size: 2012 bytes --]

Index: source.c
===================================================================
RCS file: /cvs/src/src/gdb/source.c,v
retrieving revision 1.27
diff -c -3 -p -r1.27 source.c
*** source.c	12 Apr 2002 19:46:29 -0000	1.27
--- source.c	22 Apr 2002 10:59:28 -0000
*************** source_info (char *ignore, int from_tty)
*** 503,508 ****
--- 503,525 ----
  }
  \f
  
+ /* Return True if the file NAME exists and is a regular file */
+ static int
+ is_regular_file (const char *name)
+ {
+   struct stat st;
+   const int status = stat (name, &st);
+ 
+   /* Stat should never fail except when the file does not exist.
+      If stat fails, analyze the source of error and return True
+      unless the file does not exist, to avoid returning false results
+      on obscure systems where stat does not work as expected.
+    */
+   if (status != 0)
+     return (errno != ENOENT);
+ 
+   return S_ISREG (st.st_mode);
+ }
  
  /* Open a file named STRING, searching path PATH (dir names sep by some char)
     using mode MODE and protection bits PROT in the calls to open.
*************** openp (const char *path, int try_cwd_fir
*** 543,549 ****
    mode |= O_BINARY;
  #endif
  
!   if (try_cwd_first || IS_ABSOLUTE_PATH (string))
      {
        int i;
        filename = alloca (strlen (string) + 1);
--- 560,566 ----
    mode |= O_BINARY;
  #endif
  
!   if ((try_cwd_first || IS_ABSOLUTE_PATH (string)) && is_regular_file (string))
      {
        int i;
        filename = alloca (strlen (string) + 1);
*************** openp (const char *path, int try_cwd_fir
*** 601,609 ****
        strcat (filename + len, SLASH_STRING);
        strcat (filename, string);
  
!       fd = open (filename, mode);
!       if (fd >= 0)
! 	break;
      }
  
  done:
--- 618,629 ----
        strcat (filename + len, SLASH_STRING);
        strcat (filename, string);
  
!       if (is_regular_file (filename))
!       {
!         fd = open (filename, mode);
!         if (fd >= 0)
!           break;
!       }
      }
  
  done: