remove mode argument, some minor changes

Author: wassup05

doc/specs/stdlib_system.md

@@ -543,12 +543,12 @@ Experimental
 
 ### Description
 
-It creates an empty directory.
+It creates an empty directory with default permissions.
 It is designed to work across multiple platforms. On Windows, paths with both forward `/` and backward `\` slashes are accepted.
 
 ### Syntax
 
-`call [[stdlib_system(module):make_directory(subroutine)]] (path, mode, err)`
+`call [[stdlib_system(module):make_directory(subroutine)]] (path [,err])`
 
 ### Class
 
@@ -558,13 +558,11 @@ Subroutine
 
 `path`: Shall be a character string containing the path of the directory to create. It is an `intent(in)` argument.
 
-`mode`: Shall be a scalar integer indicating the permission bits required (Not applicable to Windows). It is an `optional, intent(in)` argument.
-
-`err`: Shall be of type `state_type`, for error handling. It is an `optional, intent(out)` argument.
+`err`(optional): Shall be of type `state_type`, for error handling. It is an `optional, intent(out)` argument.
 
 ### Return values
 
-The `err` is set accordingly.
+`err` is an optional state return flag. On error if not requested, a `FS_ERROR` will trigger an error stop.
 
 ### Example
 
@@ -597,11 +595,11 @@ Subroutine
 
 `path`: Shall be a character string containing the path of the directory to create. It is an `intent(in)` argument.
 
-`err`: Shall be of type `state_type`, for error handling. It is an `intent(out)` argument.
+`err`(optional): Shall be of type `state_type`, for error handling. It is an `intent(out)` argument.
 
 ### Return values
 
-The `err` is set accordingly.
+`err` is an optional state return flag. On error if not requested, a `FS_ERROR` will trigger an error stop.
 
 ### Example
 

example/system/example_make_directory.f90

@@ -1,12 +1,12 @@
-! Illustrate the usage of make_directory
+! Illustrate the usage of `make_directory`
 program example_make_directory
-    use stdlib_system, only: make_directory, is_directory
+    use stdlib_system, only: make_directory
     use stdlib_error, only: state_type
     implicit none
 
     type(state_type) :: err
 
-    call make_directory("test", err=err)
+    call make_directory("temp_dir", err)
 
     if (err%error()) then
         print *, err%print()

example/system/example_remove_directory.f90

@@ -1,6 +1,6 @@
-! Illustrate the usage of remove_directory
+! Illustrate the usage of `remove_directory`
 program example_remove_directory
-    use stdlib_system, only: make_directory, is_directory, remove_directory
+    use stdlib_system, only: remove_directory
     use stdlib_error, only: state_type
     implicit none
 

src/stdlib_system.F90

@@ -2,8 +2,9 @@ module stdlib_system
 use, intrinsic :: iso_c_binding, only : c_int, c_long, c_ptr, c_null_ptr, c_int64_t, c_size_t, &
     c_f_pointer
 use stdlib_kinds, only: int64, dp, c_bool, c_char
-use stdlib_strings, only: to_c_char
+use stdlib_strings, only: to_c_char, ends_with
 use stdlib_string_type, only: string_type
+use stdlib_optval, only: optval
 use stdlib_error, only: state_type, STDLIB_SUCCESS, STDLIB_FS_ERROR
 implicit none
 private
@@ -115,12 +116,12 @@ module stdlib_system
 !! ([Specification](../page/specs/stdlib_system.html#make_directory))
 !!
 !! ### Summary
-!! Creates an empty directory with particular permissions.
+!! Creates an empty directory with default permissions.
 !!
 !! ### Description
 !! This function makes an empty directory according to the path provided.
-!! Relative paths as well as on Windows paths involving either `/` or `\` are accepted
-!! appropriate error message is returned whenever any error occur.
+!! Relative paths as well as on Windows, paths involving either `/` or `\` are accepted.
+!! Appropriate error message is returned whenever any error occurs.
 !!
 public :: make_directory
 
@@ -130,12 +131,12 @@ module stdlib_system
 !! ([Specification](../page/specs/stdlib_system.html#remove_directory))
 !!
 !! ### Summary
-!! Deletes an empty directory.
+!! Removes an empty directory.
 !!
 !! ### Description
-!! This function deletes an empty directory according to the path provided.
+!! This function Removes an empty directory according to the path provided.
 !! Relative paths as well as on Windows paths involving either `/` or `\` are accepted.
-!! appropriate error message is returned whenever any error occur.
+!! Appropriate error message is returned whenever any error occurs.
 !!
 public :: remove_directory
 
@@ -879,6 +880,9 @@ end function stdlib_is_directory
 
 end function is_directory
 
+! A helper function to get the result of the C function `strerror`.
+! `strerror` is a function provided by `<string.h>`. 
+! It returns a string describing the meaning of `errno` in the C header `<errno.h>`
 function c_get_strerror() result(str)
     character(len=:), allocatable :: str
 
@@ -906,40 +910,27 @@ end function strerror
 end function c_get_strerror
 
 !! makes an empty directory
-subroutine make_directory(path, mode, err)
+subroutine make_directory(path, err)
     character(len=*), intent(in) :: path
-    integer, intent(in), optional :: mode
     type(state_type), optional, intent(out) :: err
 
     integer :: code
     type(state_type) :: err0
 
-
     interface
-        integer function stdlib_make_directory(cpath, cmode) bind(C, name='stdlib_make_directory')
+        integer function stdlib_make_directory(cpath) bind(C, name='stdlib_make_directory')
             import c_char
             character(kind=c_char), intent(in) :: cpath(*)
-            integer, intent(in) :: cmode
         end function stdlib_make_directory
     end interface
 
-    if (is_windows() .and. present(mode)) then
-        ! _mkdir() doesn't have a `mode` argument
-        err0 = state_type(STDLIB_FS_ERROR, "mode argument not present for Windows")
+    code = stdlib_make_directory(to_c_char(trim(path)))
+
+    if (code /= 0) then
+        err0 = FS_ERROR_CODE(code, c_get_strerror())
         call err0%handle(err)
-        return
     end if
 
-    code = stdlib_make_directory(to_c_char(trim(path)), mode)
-
-    select case (code)
-        case (0)
-            return
-        case default
-            ! error
-            err0 = state_type(STDLIB_FS_ERROR, "code:", to_string(code)//',', c_get_strerror())
-            call err0%handle(err)
-    end select
 end subroutine make_directory
 
 !! Removes an empty directory
@@ -959,14 +950,11 @@ end function stdlib_remove_directory
 
     code = stdlib_remove_directory(to_c_char(trim(path)))
 
-    select case (code)
-        case (0)
-            return
-        case default
-            ! error
-            err0 = state_type(STDLIB_FS_ERROR, "code:", to_string(code)//',', c_get_strerror())
-            call err0%handle(err)
-    end select
+    if (code /= 0) then
+        err0 = FS_ERROR_CODE(code, c_get_strerror())
+        call err0%handle(err)
+    end if
+
 end subroutine remove_directory
 
 !> Returns the file path of the null device for the current operating system.

src/stdlib_system.c

@@ -15,19 +15,16 @@ char* stdlib_strerror(size_t* len){
     return err;
 }
 
-int stdlib_make_directory(const char* path, mode_t mode){
+int stdlib_make_directory(const char* path){
     int code;
 #ifdef _WIN32
     code = _mkdir(path);
 #else
-    code = mkdir(path, mode);
+    // Default mode 0777
+    code = mkdir(path, 0777);
 #endif /* ifdef _WIN32 */
 
-    if (!code){
-        return 0;
-    }
-
-    return errno;
+    return (!code) ? 0 : errno;
 }
 
 int stdlib_remove_directory(const char* path){
@@ -38,9 +35,5 @@ int stdlib_remove_directory(const char* path){
     code = rmdir(path);
 #endif /* ifdef _WIN32 */
 
-    if (!code){
-        return 0;
-    }
-
-    return errno;
+    return (!code) ? 0 : errno;
 }

test/system/test_filesystem.f90

@@ -1,6 +1,7 @@
 module test_filesystem
     use testdrive, only : new_unittest, unittest_type, error_type, check, skip_test
-    use stdlib_system, only: is_directory, delete_file, FS_ERROR, FS_ERROR_CODE
+    use stdlib_system, only: is_directory, delete_file, FS_ERROR, FS_ERROR_CODE, &
+        make_directory, remove_directory
     use stdlib_error, only: state_type, STDLIB_FS_ERROR
 
     implicit none
@@ -207,11 +208,13 @@ subroutine test_make_directory_existing(error)
 
         ! Clean up: remove the empty directory
         call execute_command_line('rmdir ' // filename, exitstat=ios, cmdstat=iocmd, cmdmsg=msg)
+
         if (allocated(error)) then
             ! if previous error is allocated as well
             call check(error, ios==0 .and. iocmd==0, error%message // ' and cannot cleanup make_directory test: '//trim(msg))
             return
         end if
+
         call check(error, ios==0 .and. iocmd==0, 'Cannot cleanup make_directory test: '//trim(msg))
     end subroutine test_make_directory_existing
 
@@ -230,6 +233,7 @@ subroutine test_remove_directory(error)
 
         call remove_directory(filename, err)
         call check(error, err%ok(), 'Could not remove directory: '//err%print())
+
         if (allocated(error)) then 
             ! Clean up: remove the empty directory
             call execute_command_line('rmdir ' // filename, exitstat=ios, cmdstat=iocmd, cmdmsg=msg)
@@ -242,7 +246,7 @@ subroutine test_remove_directory_nonexistent(error)
         type(state_type) :: err
 
         call remove_directory("random_name", err)
-        call check(error, err%error(), 'Somehow removed a non-existent directory!: ')
+        call check(error, err%error(), 'Somehow removed a non-existent directory')
         if (allocated(error)) return
     end subroutine test_remove_directory_nonexistent