Skip to content

Commit a4080dc

Browse files
committed
Remove FHS from C source
The meaning of it is described at https://www.jsoftware.com/help/user/lib_sysenv.htm#FHS. I guess this has once been a compile option, but is now set runtime in stdlib.ijs. This also resulted in jdllver no longer being referenced, and a possiblity to combine two string append statements.
1 parent 1d71d2c commit a4080dc

1 file changed

Lines changed: 3 additions & 11 deletions

File tree

jsrc/jeload.cpp

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ static JGetAType jgeta;
3232
static JSetAType jseta;
3333
std::string path;
3434
std::string pathdll;
35-
static char jdllver[20]; // Not sure why this is being added, but keeping it for now.
36-
static int FHS = 0; // Not sure what this is
3735

3836
auto
3937
jedo(char const* sentence) -> int {
@@ -178,15 +176,9 @@ auto
178176
jefirst(int type, char* arg) -> int {
179177
std::string input;
180178

181-
if (type == 0) {
182-
if (!FHS)
183-
input.append("(3 : '0!:0 y')<BINPATH,'");
184-
else {
185-
input.append("(3 : '0!:0 y')<'/etc/j/");
186-
input.append(jdllver);
187-
}
188-
input.append("/profile.ijs'");
189-
} else if (type == 1)
179+
if (type == 0)
180+
input.append("(3 : '0!:0 y')<BINPATH,'/profile.ijs'");
181+
else if (type == 1)
190182
input.append("(3 : '0!:0 y')2{ARGV");
191183
else if (type == 2)
192184
input.append("");

0 commit comments

Comments
 (0)