Bash-5.3-alpha release

lib/sh/uconvert.c

@@ -1,7 +1,7 @@
 /* uconvert - convert string representations of decimal numbers into whole
 	      number/fractional value pairs. */
 
-/* Copyright (C) 2008,2009,2020 Free Software Foundation, Inc.
+/* Copyright (C) 2008,2009,2020,2022 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -40,7 +40,7 @@
 #define RETURN(x) \
 do { \
   if (ip) *ip = ipart * mult; \
-  if (up) *up = upart; \
+  if (up) *up = upart * (ipart == 0 ? mult : 1); \
   if (ep) *ep = p; \
   return (x); \
 } while (0)
@@ -57,10 +57,7 @@ static int multiplier[7] = { 1, 100000, 10000, 1000, 100, 10, 1 };
    Return 1 if value converted; 0 if invalid integer for either whole or
    fractional parts. */
 int
-uconvert(s, ip, up, ep)
-     char *s;
-     long *ip, *up;
-     char **ep;
+uconvert(const char *s, long *ip, long *up, char **ep)
 {
   int n, mult;
   long ipart, upart;
@@ -72,10 +69,10 @@ uconvert(s, ip, up, ep)
   if (s && (*s == '-' || *s == '+'))
     {
       mult = (*s == '-') ? -1 : 1;
-      p = s + 1;
+      p = (char *)s + 1;
     }
   else
-    p = s;
+    p = (char *)s;
 
   for ( ; p && *p; p++)
     {