author | Vladimir Marek <Vladimir.Marek@oracle.com> |
Mon, 25 Nov 2013 17:42:18 +0100 | |
branch | s11u1-sru |
changeset 2846 | 308d0c192664 |
parent 844 | 55358dcf0cb2 |
permissions | -rw-r--r-- |
789
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
1 |
diff -rupN a/src/lib/libast/sfio/sfstrtof.h b/src/lib/libast/sfio/sfstrtof.h |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
2 |
--- a/src/lib/libast/sfio/sfstrtof.h 2010-12-24 14:32:27.000000000 +0000 |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
3 |
+++ b/src/lib/libast/sfio/sfstrtof.h 2011-10-25 12:21:57.749942750 +0100 |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
4 |
@@ -414,7 +414,7 @@ S2F_function(str, end) char* str; char** |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
5 |
m = 0; |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
6 |
fraction = digits; |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
7 |
} |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
8 |
- else if (c != thousand) |
844
55358dcf0cb2
7169644 math functions in ksh93 behave differently from b15
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
789
diff
changeset
|
9 |
+ else if (c != thousand || (c == thousand && decimal == -1)) |
789
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
10 |
break; |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
11 |
else if (!(m = digits)) |
5f074ca23733
7106955 move ksh93 from ON to userland
Edwin Beasant <Edwin.Beasant@oracle.com>
parents:
diff
changeset
|
12 |
{ |