| author | Stefan Teleman <stefan.teleman@oracle.com> |
| Mon, 29 Feb 2016 10:09:14 -0800 | |
| changeset 5518 | c47fe0edc204 |
| parent 1082 | 6d49548fa9da |
| child 7485 | 89b2d849f322 |
| permissions | -rw-r--r-- |
|
5518
c47fe0edc204
20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1082
diff
changeset
|
1 |
# Export the default variables if they aren't set. |
|
c47fe0edc204
20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1082
diff
changeset
|
2 |
# Otherwise we end up with inconsistently defined/exported |
|
c47fe0edc204
20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1082
diff
changeset
|
3 |
# defaults. |
|
c47fe0edc204
20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1082
diff
changeset
|
4 |
# Solaris-specific patch. |
|
1082
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
5 |
--- variables.c 2011-01-24 17:07:48.000000000 -0800 |
|
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
6 |
+++ variables.c 2011-11-29 09:29:51.902791524 -0800 |
|
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
7 |
@@ -417,14 +417,12 @@ |
|
110
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
/* Now make our own defaults in case the vars that we think are |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
important are missing. */ |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
temp_var = set_if_not ("PATH", DEFAULT_PATH_VALUE);
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
-#if 0 |
|
1082
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
12 |
+ |
|
110
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
set_auto_export (temp_var); /* XXX */ |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
-#endif |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
temp_var = set_if_not ("TERM", "dumb");
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
-#if 0 |
|
1082
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
18 |
+ |
|
110
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
set_auto_export (temp_var); /* XXX */ |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
-#endif |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
|
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
22 |
#if defined (__QNX__) |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
/* set node id -- don't import it from the environment */ |