1 # This patch has been developed inhouse. This fixes a Solaris specific |
|
2 # issue and has not been submitted to the community. |
|
3 diff -r bb8978c251cb -r 6fbea5c30b60 usr/src/cmd/ast/lib/libshell/common/sh/name.c |
1 diff -r bb8978c251cb -r 6fbea5c30b60 usr/src/cmd/ast/lib/libshell/common/sh/name.c |
4 --- a/src/cmd/ksh93/sh/name.c Sun Mar 25 23:19:46 2012 -0700 |
2 --- a/src/cmd/ksh93/sh/name.c Sun Mar 25 23:19:46 2012 -0700 |
5 +++ b/src/cmd/ksh93/sh/name.c Mon Mar 26 05:09:19 2012 -0700 |
3 +++ b/src/cmd/ksh93/sh/name.c Mon Mar 26 05:09:19 2012 -0700 |
6 @@ -22,6 +22,9 @@ |
4 @@ -22,6 +22,9 @@ |
7 * AT&T Labs |
5 * AT&T Labs |
8 * |
6 * |
9 */ |
7 */ |
10 +/* |
8 +/* |
11 + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. |
9 + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. |
12 + */ |
10 + */ |
13 |
11 |
14 #define putenv ___putenv |
12 #define putenv ___putenv |
15 |
13 |
16 @@ -1926,7 +1923,10 @@ |
14 @@ -1832,7 +1835,10 @@ |
|
15 else |
17 #endif |
16 #endif |
18 { |
17 if(size==0 && nv_isattr(np,NV_HOST)!=NV_HOST &&nv_isattr(np,NV_LJUST|NV_RJUST|NV_ZFILL)) |
19 if(size==0 && nv_isattr(np,NV_HOST)!=NV_HOST &&nv_isattr(np,NV_LJUST|NV_RJUST|NV_ZFILL)) |
18 + { |
20 + { |
19 nv_setsize(np,size=dot); |
21 nv_setsize(np,size=dot); |
20 + tofree = up->cp; |
22 + tofree = up->cp; |
21 + } |
23 + } |
22 else if(size > dot) |
24 else if(size > dot) |
23 dot = size; |
25 dot = size; |
24 else if(nv_isattr(np,NV_LJUST|NV_RJUST)==NV_LJUST && dot>size) |
26 else if(nv_isattr(np,NV_LJUST|NV_RJUST)==NV_LJUST && dot>size) |
|