Skip to content
This repository was archived by the owner on May 20, 2024. It is now read-only.

Commit c1ef2fc

Browse files
CodingMarkusCodingMarkus
CodingMarkus
authored and
CodingMarkus
committed
Use record, not file separator for file lists
1 parent 7c0bd2f commit c1ef2fc

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

lib/psst/basic/ifs.inc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-} _ifs.inc.sh_"
3333
# 1: Current $IFS value could not be saved.
3434
#
3535
# SAMPLE
36-
# ifs_set_psst "$FS_CHAR_PSST"
36+
# ifs_set_psst "$US_CHAR_PSST"
3737
#
3838
ifs_set_psst()
3939
{

lib/psst/file/glob.inc.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ INCLUDE_SEEN_PSST="${INCLUDE_SEEN_PSST-} _glob.inc.sh_"
3030
# filter: Globbing pattern.
3131
#
3232
# OUTPUT
33-
# stdout: Globbed files separated by FS (`$FS_CHAR_PSST`).
33+
# stdout: Globbed files separated by RS (`$RS_CHAR_PSST`).
3434
#
3535
# SAMPLE
3636
# globbed=$( glob_psst "$somePath/*.txt" "/tmp/*.tmp" )
@@ -49,7 +49,7 @@ glob_psst()
4949
if [ -e "$f" ]
5050
then
5151
printf "%s%s" "$separator" "$f"
52-
separator=$FS_CHAR_PSST
52+
separator=$RS_CHAR_PSST
5353
fi
5454
done
5555
)
@@ -68,7 +68,7 @@ glob_psst()
6868
# filter: Globbing pattern.
6969
#
7070
# OUTPUT
71-
# stdout: Globbed files separated by NUL (`$FS_CHAR_PSST`).
71+
# stdout: Globbed files separated by RS (`$RS_CHAR_PSST`).
7272
#
7373
# SAMPLE
7474
# globbed=$( glob_psst 5 "$somePath/*.txt" "/tmp/*.tmp" )
@@ -92,7 +92,7 @@ glob_max_psst()
9292
if [ -e "$f" ]
9393
then
9494
printf "%s%s" "$separator" "$f"
95-
separator=$FS_CHAR_PSST
95+
separator=$RS_CHAR_PSST
9696
count=$(( count + 1 ))
9797
if [ $count -ge "$limit" ]
9898
then

test/file/bin/test_glob.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,29 @@ globDst="$tmpDir/glob_psst"
5656

5757
# Test globbing is correct
5858
glob_psst "../data/glob/testdir/*" \
59-
| tr "$FS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
59+
| tr "$RS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
6060

6161
cmp -s "$globDst" "../data/glob/glob.txt" \
6262
|| test_fail_psst $LINENO
6363

6464

6565
glob_psst "../data/glob/testdir/*.txt" \
66-
| tr "$FS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
66+
| tr "$RS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
6767

6868
cmp -s "$globDst" "../data/glob/glob_txt.txt" \
6969
|| test_fail_psst $LINENO
7070

7171

7272
glob_psst "../data/glob/testdir/*.space" \
73-
| tr "$FS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
73+
| tr "$RS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
7474

7575
cmp -s "$globDst" "../data/glob/glob_space.txt" \
7676
|| test_fail_psst $LINENO
7777

7878

7979
glob_psst "../data/glob/testdir/*.space" \
8080
"../data/glob/testdir/*.txt" \
81-
| tr "$FS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
81+
| tr "$RS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
8282

8383
cmp -s "$globDst" "../data/glob/glob_txt_space.txt" \
8484
|| test_fail_psst $LINENO
@@ -87,37 +87,37 @@ cmp -s "$globDst" "../data/glob/glob_txt_space.txt" \
8787

8888
# Test globbing max is correct
8989
glob_max_psst 3 "../data/glob/testdir/*" \
90-
| tr "$FS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
90+
| tr "$RS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
9191

9292
cmp -s "$globDst" "../data/glob/glob_3.txt" \
9393
|| test_fail_psst $LINENO
9494

9595

9696
glob_max_psst 3 "../data/glob/testdir/*.txt" \
97-
| tr "$FS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
97+
| tr "$RS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
9898

9999
cmp -s "$globDst" "../data/glob/glob_txt_3.txt" \
100100
|| test_fail_psst $LINENO
101101

102102

103103
glob_max_psst 3 "../data/glob/testdir/*.space" \
104-
| tr "$FS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
104+
| tr "$RS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
105105

106106
cmp -s "$globDst" "../data/glob/glob_space_3.txt" \
107107
|| test_fail_psst $LINENO
108108

109109

110110
glob_max_psst 3 "../data/glob/testdir/*.space" \
111111
"../data/glob/testdir/*.txt" \
112-
| tr "$FS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
112+
| tr "$RS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
113113

114114
cmp -s "$globDst" "../data/glob/glob_space_3.txt" \
115115
|| test_fail_psst $LINENO
116116

117117

118118
glob_max_psst 3 "../data/glob/testdir/*.txt" \
119119
"../data/glob/testdir/*.space" \
120-
| tr "$FS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
120+
| tr "$RS_CHAR_PSST" "$NL_CHAR_PSST" >"$globDst"
121121

122122
cmp -s "$globDst" "$cmdBase/../data/glob/glob_txt_3.txt" \
123123
|| test_fail_psst $LINENO

0 commit comments

Comments
 (0)