]>
Commit | Line | Data |
---|---|---|
315debac KK |
1 | --- main.c~ 2011-07-07 18:15:26.961632040 +0100 |
2 | +++ main.c 2011-07-07 18:15:50.664694256 +0100 | |
3 | @@ -532,10 +532,14 @@ | |
bbdaf468 KK |
4 | char *env_file; |
5 | ||
bbdaf468 | 6 | /* include $ENV */ |
315debac KK |
7 | - env_file = substitute(substitute("${ENV:-" MKSHRC_PATH "}", 0), |
8 | - DOTILDE); | |
9 | + env_file = substitute("${ENV}", 0); | |
10 | if (*env_file != '\0') | |
11 | include(env_file, 0, NULL, 1); | |
12 | + else { | |
13 | + env_file = substitute(MKSHRC_PATH, DOTILDE); | |
14 | + include("/etc/mkshrc", 0, NULL, 1); | |
15 | + include(env_file, 0, NULL, 1); | |
16 | + } | |
17 | } | |
18 | ||
19 | if (restricted) { | |
bbdaf468 KK |
20 | --- check.t~ 2011-07-07 09:55:26.802497928 +0100 |
21 | +++ check.t 2011-07-07 09:55:31.859107570 +0100 | |
22 | @@ -5908,13 +5908,13 @@ | |
23 | Ensure ±U on the command line is honoured | |
24 | (this test may pass falsely depending on CPPFLAGS) | |
25 | stdin: | |
26 | - export i=0 | |
27 | - code='if [[ $- = *U* ]]; then echo $i on; else echo $i off; fi' | |
28 | - let i++; "$__progname" -U -c "$code" | |
29 | - let i++; "$__progname" +U -c "$code" | |
30 | - let i++; "$__progname" -U -ic "$code" | |
31 | - let i++; "$__progname" +U -ic "$code" | |
32 | - echo $((++i)) done | |
33 | + export iter=0 | |
34 | + code='if [[ $- = *U* ]]; then echo $iter on; else echo $iter off; fi' | |
35 | + let iter++; "$__progname" -U -c "$code" | |
36 | + let iter++; "$__progname" +U -c "$code" | |
37 | + let iter++; "$__progname" -U -ic "$code" | |
38 | + let iter++; "$__progname" +U -ic "$code" | |
39 | + echo $((++iter)) done | |
40 | expected-stdout: | |
41 | 1 on | |
42 | 2 off |