author | Shawn Ferry <shawn.ferry@oracle.com> |
Mon, 28 Nov 2016 16:54:02 -0800 | |
changeset 7565 | 48aa82a0931f |
parent 5129 | 5431772f7235 |
permissions | -rw-r--r-- |
5129
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
1 |
# This patch has been developed inhouse. This fixes a Solaris specific |
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
2 |
# issue and has not been submitted to the community. |
789
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
3 |
diff -r bb8978c251cb -r 6fbea5c30b60 usr/src/cmd/ast/lib/libshell/common/sh/name.c |
5129
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
4 |
--- a/src/cmd/ksh93/sh/name.c Sun Mar 25 23:19:46 2012 -0700 |
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
5 |
+++ b/src/cmd/ksh93/sh/name.c Mon Mar 26 05:09:19 2012 -0700 |
789
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
6 |
@@ -22,6 +22,9 @@ |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
7 |
* AT&T Labs |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
8 |
* |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
9 |
*/ |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
10 |
+/* |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
11 |
+ * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
12 |
+ */ |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
13 |
|
5129
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
14 |
#define putenv ___putenv |
789
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
15 |
|
5129
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
16 |
@@ -1926,7 +1923,10 @@ |
789
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
17 |
#endif |
5129
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
18 |
{ |
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
19 |
if(size==0 && nv_isattr(np,NV_HOST)!=NV_HOST &&nv_isattr(np,NV_LJUST|NV_RJUST|NV_ZFILL)) |
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
20 |
+ { |
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
21 |
nv_setsize(np,size=dot); |
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
22 |
+ tofree = up->cp; |
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
23 |
+ } |
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
24 |
else if(size > dot) |
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
25 |
dot = size; |
5431772f7235
PSARC/2014/162 ksh93 update to 2012-08-01
Lijo George<lijo.x.george@oracle.com>
parents:
4305
diff
changeset
|
26 |
else if(nv_isattr(np,NV_LJUST|NV_RJUST)==NV_LJUST && dot>size) |