Changeset 364 for asp3_tinet_ecnl_arm/trunk/curl-7.57.0

Timestamp:

Feb 1, 2019, 9:57:09 PM (5 years ago)

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

Location:

asp3_tinet_ecnl_arm/trunk/curl-7.57.0

Files:

• .cproject (modified) (3 diffs)
• lib/curl_config.h (modified) (3 diffs)
• lib/mprintf.c (modified) (3 diffs)

asp3_tinet_ecnl_arm/trunk/curl-7.57.0/.cproject

@@ -24 +24 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -80 +80 @@
                                                                         <listOptionValue builtIn="false" value="HAVE_CONFIG_H"/>
                                                                         <listOptionValue builtIn="false" value="BUILDING_LIBCURL"/>
+                                                                        <listOptionValue builtIn="false" value="WOLFSSL_USER_SETTINGS"/>
                                                                 </option>
+                                                                <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.169831869" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="false" valueType="includeFiles"/>
                                                                 <inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.1041134774" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
                                                         </tool>
@@ -145 +147 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">

asp3_tinet_ecnl_arm/trunk/curl-7.57.0/lib/curl_config.h

@@ -4 +4 @@
 /* Location of default ca bundle */
 /* #undef CURL_CA_BUNDLE */
+#define CURL_CA_BUNDLE "0:/certs/ca-bundle.crt"
 
 /* define "1" to use built in CA store of SSL library */
@@ -573 +574 @@
 
 /* Define to 1 if you have the signal function. */
-#define HAVE_SIGNAL 1
+/* #undef HAVE_SIGNAL */
 
 /* Define to 1 if you have the <signal.h> header file. */
@@ -948 +949 @@
 
 /* If you want to build curl with the built-in manual */
-#define USE_MANUAL 1
+/* #undef USE_MANUAL */
 
 /* if mbedTLS is enabled */

asp3_tinet_ecnl_arm/trunk/curl-7.57.0/lib/mprintf.c

@@ -997 +997 @@
 {
         unsigned int r, i, j, w, f;
-        unsigned long v;
+        unsigned long long v;
         char s[16], c, d, *p;
 
@@ -1022 +1022 @@
                         w = w * 10 + c - '0';
                 if (c == 'l' || c == 'L') {     /* Prefix: Size is long int */
-                        f |= 4; c = *fmt++;
+                        c = *fmt++;
+                        if (c == 'l' || c == 'L') {     /* Prefix: Size is long int */
+                                f |= 32; c = *fmt++;
+                        }
+                        else {
+                                f |= 4;
+                        }
                 }
                 else if (c == 'h') {    /* Prefix: Size is short int */
@@ -1055 +1061 @@
 
                 /* Get an argument and put it in numeral */
-                v = (f & 4) ? va_arg(arp, long)
-                        : ((f & 16) ? ((d == 'D') ? (long)((short)va_arg(arp, int)) : (long)((unsigned short)va_arg(arp, unsigned int)))
-                                : ((d == 'D') ? (long)va_arg(arp, int) : (long)va_arg(arp, unsigned int)));
-                if (d == 'D' && (v & 0x80000000)) {
+                if (f & 4)
+                        v = (long long)va_arg(arp, long);
+                else if (f & 16)
+                        v = (d == 'D') ? (long long)((short)va_arg(arp, int)) : (long long)((unsigned short)va_arg(arp, unsigned int));
+                else if (f & 32)
+                        v = (d == 'D') ? (long long)(va_arg(arp, long long)) : (long long)(va_arg(arp, unsigned long long));
+                else
+                        v = (d == 'D') ? (long long)va_arg(arp, int) : (long long)va_arg(arp, unsigned int);
+                if (d == 'D' && (v & 0x8000000000000000ll)) {
                         v = 0 - v;
                         f |= 8;