Subject: patch for diropen() fixes access to /
From: [email-masked] (Scott Kempf)

10 Jan 1997 16:00:26 -0800
Sender: [email-masked]
Approved: [email-masked]
Distribution: cygnus
Message-ID: <[email-masked]>
Original-To: [email-masked]
Original-Sender: [email-masked]

A number of programs have trouble with accessing "/".
The problem seems to be due to opendir() changing "/"
into "c:\/*".  This patch fixes this and allows "ls /"
to work correctly.  This doesn't fix "ls //".

			Scott

*** cdksrc/src/winsup/dirsearch.cc.orig	Tue Dec 31 14:42:55 1996
--- cdksrc/src/winsup/dirsearch.cc	Tue Dec 31 14:43:17 1996
***************
*** 22,27 ****
--- 22,29 ----
  #define _COMPILING_NEWLIB
  #include "dirent.h"
  
+ #define SLASH_P(C) ((C) == '/' || (C) == '\\')
+ 
  extern "C"
  DIR *
  opendir (const char *dirname)
***************
*** 70,76 ****
    strcpy (dir->__d_dirname, real_dirname.get_win32 ());
    /* FindFirstFile doesn't seem to like duplicate /'s.  */
    len = strlen (dir->__d_dirname);
!   if (len == 0 || dir->__d_dirname[len - 1] == '/')
      strcat (dir->__d_dirname, "*");
    else
      strcat (dir->__d_dirname, "/*");	/**/
--- 72,78 ----
    strcpy (dir->__d_dirname, real_dirname.get_win32 ());
    /* FindFirstFile doesn't seem to like duplicate /'s.  */
    len = strlen (dir->__d_dirname);
!   if (len == 0 || SLASH_P(dir->__d_dirname[len - 1]))
      strcat (dir->__d_dirname, "*");
    else
      strcat (dir->__d_dirname, "/*");	/**/
-
For help on using this list, send a message to
"[email-masked]" with one line of text: "help".