Skip to content

Minor fixes: to list_files and mkdir in fpm_filesystem #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2020
Merged

Minor fixes: to list_files and mkdir in fpm_filesystem #208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions fpm/src/fpm_filesystem.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@ subroutine mkdir(dir)
character(len=*), intent(in) :: dir
integer :: stat

if (is_dir(dir)) return

select case (get_os_type())
case (OS_UNKNOWN, OS_LINUX, OS_MACOS, OS_CYGWIN, OS_SOLARIS, OS_FREEBSD)
call execute_command_line('mkdir -p ' // dir, exitstat=stat)
Expand All @@ -233,6 +235,11 @@ end subroutine mkdir


recursive subroutine list_files(dir, files, recurse)
! Get file & directory names in directory `dir`.
!
! - File/directory names return are relative to cwd, ie. preprended with `dir`
! - Includes files starting with `.` except current directory and parent directory
!
character(len=*), intent(in) :: dir
type(string_t), allocatable, intent(out) :: files(:)
logical, intent(in), optional :: recurse
Expand All @@ -242,8 +249,7 @@ recursive subroutine list_files(dir, files, recurse)
type(string_t), allocatable :: dir_files(:)
type(string_t), allocatable :: sub_dir_files(:)

! Using `inquire` / exists on directories works with gfortran, but not ifort
if (.not. exists(dir)) then
if (.not. is_dir(dir)) then
allocate (files(0))
return
end if
Expand All @@ -252,7 +258,7 @@ recursive subroutine list_files(dir, files, recurse)

select case (get_os_type())
case (OS_UNKNOWN, OS_LINUX, OS_MACOS, OS_CYGWIN, OS_SOLARIS, OS_FREEBSD)
call execute_command_line('ls ' // dir // ' > ' // temp_file, &
call execute_command_line('ls -A ' // dir // ' > ' // temp_file, &
exitstat=stat)
case (OS_WINDOWS)
call execute_command_line('dir /b ' // windows_path(dir) // ' > ' // temp_file, &
Expand Down