[Dotgnu-pnet-commits] pnet/support dir.c, 1.17, 1.18 file.c, 1.15, 1.16 gen_errno.sh, 1.6, 1.7

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/support
In directory subversions:/tmp/cvs-serv25176/support

Modified Files:
        dir.c file.c gen_errno.sh 
Log Message:


Add the "ilgac" program; fix some error-handling bugs in the
file and directory support routines.


Index: gen_errno.sh
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/support/gen_errno.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gen_errno.sh        14 Jun 2003 22:39:37 -0000      1.6
--- gen_errno.sh        11 Nov 2003 00:37:09 -0000      1.7
***************
*** 40,48 ****
        if test -n "$f"; then
                if test -z "$FILE"; then
!                       CHKLINE=`grep EINVAL "$f" 2>/dev/null`
                        if test -n "$CHKLINE"; then
                                FILE="$f"
                        else
!                               CHKLINE=`grep ENOSYS "$f" 2>/dev/null`
                                if test -n "$CHKLINE"; then
                                        FILE="$f"
--- 40,48 ----
        if test -n "$f"; then
                if test -z "$FILE"; then
!                       CHKLINE=`grep '#define.*EINVAL' "$f" 2>/dev/null`
                        if test -n "$CHKLINE"; then
                                FILE="$f"
                        else
!                               CHKLINE=`grep '#define.*ENOSYS' "$f" 
2>/dev/null`
                                if test -n "$CHKLINE"; then
                                        FILE="$f"

Index: file.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/support/file.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** file.c      10 Nov 2003 13:25:04 -0000      1.15
--- file.c      11 Nov 2003 00:37:09 -0000      1.16
***************
*** 49,52 ****
--- 49,53 ----
  #endif
  #endif
+ #include <errno.h>
  
  #ifdef        __cplusplus
***************
*** 63,71 ****
  {
  #ifdef HAVE_UNLINK
!       return unlink(filename);
  #else
! #ifdef HAVE_REMOVE
!       return remove(filename);
! #endif
  #endif
  }
--- 64,78 ----
  {
  #ifdef HAVE_UNLINK
!       if(unlink(filename) == 0)
!               return IL_ERRNO_Success;
!       else
!               return ILSysIOConvertErrno(errno);
! #elif defined(HAVE_REMOVE)
!       if(remove(filename) == 0)
!               return IL_ERRNO_Success;
!       else
!               return ILSysIOConvertErrno(errno);
  #else
!       return IL_ERRNO_ENOSYS;
  #endif
  }

Index: dir.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/support/dir.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** dir.c       15 May 2003 02:46:28 -0000      1.17
--- dir.c       11 Nov 2003 00:37:09 -0000      1.18
***************
*** 59,80 ****
  #ifndef IL_NO_DIR_ROUTINES
  
  ILInt32 ILDeleteDir(const char *path)
  {
!       int retval;
!       if (path == NULL)
        {
                return IL_ERRNO_ENOENT;
        }
! 
! #ifdef HAVE_REMOVE
!       retval=remove(path);
!       if(retval)
!       {
!               return ILSysIOConvertErrno(retval);
!       }
        else
!       {
                return IL_ERRNO_Success;
!       }
  #else
      return IL_ERRNO_ENOSYS;
--- 59,85 ----
  #ifndef IL_NO_DIR_ROUTINES
  
+ /*
+  * Note: this may be called to delete either a directory or a file.
+  */
  ILInt32 ILDeleteDir(const char *path)
  {
!       if(!path)
        {
                return IL_ERRNO_ENOENT;
        }
! #ifdef HAVE_RMDIR
!       if(rmdir(path) == 0)
!               return IL_ERRNO_Success;
! #endif
! #ifdef HAVE_UNLINK
!       if(unlink(path) == 0)
!               return IL_ERRNO_Success;
        else
!               return ILSysIOConvertErrno(errno);
! #elif defined(HAVE_REMOVE)
!       if(remove(path) == 0)
                return IL_ERRNO_Success;
!       else
!               return ILSysIOConvertErrno(errno);
  #else
      return IL_ERRNO_ENOSYS;
***************
*** 85,91 ****
  ILInt32 ILRenameDir(const char *old_name, const char *new_name)
  {
!       int retVal;
! 
!       if (old_name == NULL || new_name == NULL)
        {
            return IL_ERRNO_ENOENT;
--- 90,94 ----
  ILInt32 ILRenameDir(const char *old_name, const char *new_name)
  {
!       if(!old_name || !new_name)
        {
            return IL_ERRNO_ENOENT;
***************
*** 93,98 ****
  
  #ifdef HAVE_RENAME
!       retVal = rename(old_name, new_name);
!       if(retVal == 0)
                return IL_ERRNO_Success;
        else
--- 96,100 ----
  
  #ifdef HAVE_RENAME
!       if(rename(old_name, new_name) == 0)
                return IL_ERRNO_Success;
        else
***************
*** 106,115 ****
  ILInt32 ILChangeDir(const char *path)
  {
!       if(path==NULL)
        {
                return IL_ERRNO_ENOENT;
        }
  #ifdef HAVE_CHDIR
!       return ILSysIOConvertErrno(chdir(path));        
  #else
        return IL_ERRNO_ENOSYS;
--- 108,120 ----
  ILInt32 ILChangeDir(const char *path)
  {
!       if(!path)
        {
                return IL_ERRNO_ENOENT;
        }
  #ifdef HAVE_CHDIR
!       if(chdir(path) == 0)
!               return IL_ERRNO_Success;
!       else
!               return ILSysIOConvertErrno(errno);
  #else
        return IL_ERRNO_ENOSYS;
***************
*** 120,124 ****
  ILInt32 ILCreateDir(const char *path)
  {
!       if(path==NULL)
        {
                return IL_ERRNO_ENOENT;
--- 125,129 ----
  ILInt32 ILCreateDir(const char *path)
  {
!       if(!path)
        {
                return IL_ERRNO_ENOENT;
***************
*** 126,132 ****
  #ifdef HAVE_MKDIR
        #ifdef IL_WIN32_NATIVE
!               return ILSysIOConvertErrno(mkdir(path));
        #else
!               return ILSysIOConvertErrno(mkdir(path, 0777));
        #endif
  #else
--- 131,143 ----
  #ifdef HAVE_MKDIR
        #ifdef IL_WIN32_NATIVE
!               if(mkdir(path) == 0)
!                       return IL_ERRNO_Success;
!               else
!                       return ILSysIOConvertErrno(errno);
        #else
!               if(mkdir(path, 0777) == 0)
!                       return IL_ERRNO_Success;
!               else
!                       return ILSysIOConvertErrno(errno);
        #endif
  #else