[crt]

[reactos.git] / reactos / lib / sdk / crt / string / scanf.h

diff --git a/reactos/lib/sdk/crt/string/scanf.h b/reactos/lib/sdk/crt/string/scanf.h
index f364c8c..b27eb56 100644 (file)
--- a/reactos/lib/sdk/crt/string/scanf.h
+++ b/reactos/lib/sdk/crt/string/scanf.h
@@ -131,8 +131,14 @@ _FUNCTION_ {
            /* read prefix (if any) */
            while (!prefix_finished) {
                switch(*format) {
-               case 'h': h_prefix = 1; break;
-               case 'l': l_prefix = 1; break;
+               case 'h': h_prefix++; break;
+               case 'l':
+                    if(*(format+1) == 'l') {
+                        I64_prefix = 1;
+                        format++;
+                    }
+                    l_prefix = 1;
+                    break;
                case 'w': w_prefix = 1; break;
                case 'L': L_prefix = 1; break;
                case 'I':
@@ -227,15 +233,15 @@ _FUNCTION_ {
 #define _SET_NUMBER_(type) *va_arg(ap, type*) = (type)(negative ? -cur : cur)
                        if (I64_prefix) _SET_NUMBER_(LONGLONG);
                        else if (l_prefix) _SET_NUMBER_(LONG);
-                       else if (h_prefix) _SET_NUMBER_(short int);
+                       else if (h_prefix == 1) _SET_NUMBER_(short int);
                        else _SET_NUMBER_(int);
                    }
                 }
                 break;
-           case 'e':
-           case 'E':
-           case 'f':
-           case 'g':
+            case 'e':
+            case 'E':
+            case 'f':
+            case 'g':
             case 'G': { /* read a float */
                     long double cur = 0;
                    int negative = 0;
@@ -279,7 +285,7 @@ _FUNCTION_ {
                    /* handle exponent */
                    if (width!=0 && (nch == 'e' || nch == 'E')) {
                        int exponent = 0, negexp = 0;
-                       float expcnt;
+                       double expcnt, shift;
                         nch = _GETC_(file);
                        if (width>0) width--;
                        /* possible sign on the exponent */
@@ -296,13 +302,15 @@ _FUNCTION_ {
                            if (width>0) width--;
                         }
                        /* update 'cur' with this exponent. */
-                       expcnt =  negexp ? 0.1f : 10.0f;
+                       expcnt = 10;
+                       shift = 1.0;
                        while (exponent!=0) {
                            if (exponent&1)
-                               cur*=expcnt;
+                               shift *= expcnt;
                            exponent/=2;
                            expcnt=expcnt*expcnt;
                        }
+                       cur = (negexp ? cur / shift : cur * shift);
                    }
                     st = 1;
                     if (!suppress) {
@@ -525,6 +533,7 @@ _FUNCTION_ {
     if (nch!=_EOF_) {
        _UNGETC_(nch, file);
     }
+
     TRACE("returning %d\n", rd);
     return rd;
 }