Skip to content

Commit d9ac321

Browse files
dalekoperaamontoison
authored andcommitted
also remove names before final \ (for Windows)
1 parent cbc62e5 commit d9ac321

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

src/decode/makemaster

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ test_unconstrained: $(SIFDECODES)
5555
echo " Decode unconstrained SIF file"
5656
cd $(SIFDECODE)/sif/ ; \
5757
$(SIFDECODE)/bin/sifdecoder -A $(VERSION) ALLINITU
58+
cd $(SIFDECODE)/sif/ ; \
59+
$(RM) ELFUN*.* GROUP*.* RANGE*.* EXTER*.* OUTSDIF*.*
5860
echo ""
5961
echo " Tests for unconstrained sifdecode complete"
6062

@@ -63,6 +65,8 @@ test_constrained: $(SIFDECODES)
6365
echo " Decode constrained SIF file"
6466
cd $(SIFDECODE)/sif/ ; \
6567
$(SIFDECODE)/bin/sifdecoder -A $(VERSION) ALLINITC
68+
cd $(SIFDECODE)/sif/ ; \
69+
$(RM) ELFUN*.* GROUP*.* RANGE*.* EXTER*.* OUTSDIF*.*
6670
echo ""
6771
echo " Tests for constrained sifdecode complete"
6872

@@ -80,14 +84,22 @@ test_standalone: $(SIFDECODES)
8084
echo " ** Call with forced unpermitted non-default parameter -"
8185
cd $(SIFDECODE)/sif/ ; \
8286
$(OBJ)/sifdecoder_standalone -param "m=4" -force KISSING2
87+
cd $(SIFDECODE)/sif/ ; \
88+
$(RM) ELFUN*.* GROUP*.* RANGE*.* EXTER*.* OUTSDIF*.*
8389
echo ""
8490
echo " ** Call with added suffices -"
8591
cd $(SIFDECODE)/sif/ ; \
8692
$(OBJ)/sifdecoder_standalone -suffix KISSING2
93+
cd $(SIFDECODE)/sif/ ; \
94+
echo " files: " ELFUN*.* GROUP*.* RANGE*.* OUTSDIF*.* || true
8795
echo ""
8896
echo " ** Call with added suffices deleting prepended pathname -"
8997
cd $(SIFDECODE)/sif/ ; \
9098
$(OBJ)/sifdecoder_standalone -suffix $(SIFDECODE)/sif/KISSING2
99+
cd $(SIFDECODE)/sif/ ; \
100+
echo " files: " ELFUN*.* GROUP*.* RANGE*.* OUTSDIF*.* || true
101+
cd $(SIFDECODE)/sif/ ; \
102+
$(RM) ELFUN*.* GROUP*.* RANGE*.* EXTER*.* OUTSDIF*.*
91103
echo ""
92104
echo " Standalone test for sifdecode complete"
93105

src/decode/sifdecoder_standalone.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
! THIS VERSION: SIFDECODE 2.6 - 2025-04-19 AT 14:50 GMT.
1+
! THIS VERSION: SIFDECODE 2.6 - 2025-04-21 AT 08:55 GMT.
22

33
!-*-*-*-*-*- S I F D E C O D E R _ S T A N A L O N E _ M O D U L E -*-*-*-*-*-
44

@@ -313,7 +313,7 @@ SUBROUTINE SIFDECODER_decode( name, status, out, size, realpr, start, &
313313
j = j - 4
314314
END IF
315315
DO i = j, 1, - 1
316-
IF ( sifname( i : i ) == '/' ) THEN
316+
IF ( sifname( i : i ) == '/' .OR. sifname( i : i ) == '\' ) THEN
317317
sifname( 1 : i ) = REPEAT( ' ', i )
318318
sifname = ADJUSTL( sifname )
319319
EXIT

0 commit comments

Comments
 (0)