Changeset 331 for EcnlProtoTool/trunk/ntshell/fatfs/fftime.c

Timestamp:

Jan 21, 2018, 12:10:09 AM (6 years ago)

Author:

coas-nagasima

Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

File:

• EcnlProtoTool/trunk/ntshell/fatfs/fftime.c (moved) (moved from EcnlProtoTool/trunk/ntshell/fatfs/time.c ) (5 diffs)

EcnlProtoTool/trunk/ntshell/fatfs/fftime.c

@@ -30 +30 @@
 #include "ff.h"
 
+int shell_errno;
+
 /* 2000-03-01 (mod 400 year, immediately after feb29 */
 #define LEAPOCH (946684800LL + 86400*(31+29))
@@ -200 +202 @@
         * __secs_to_zone cannot safely handle them. */
         if (*t < INT_MIN * 31622400LL || *t > INT_MAX * 31622400LL) {
-                errno = EOVERFLOW;
+                shell_errno = EOVERFLOW;
                 return 0;
         }
         //TODO:__secs_to_zone(*t, 0, &tm->tm_isdst, &tm->__tm_gmtoff, 0, &tm->__tm_zone);
         if (__secs_to_tm((long long)*t /*+ tm->__tm_gmtoff*/, tm) < 0) {
-                errno = EOVERFLOW;
+                shell_errno = EOVERFLOW;
                 return 0;
         }
@@ -220 +222 @@
 {
         if (__secs_to_tm(*t, tm) < 0) {
-                errno = EOVERFLOW;
+                shell_errno = EOVERFLOW;
                 return 0;
         }
@@ -249 +251 @@
 
 error:
-        errno = EOVERFLOW;
+        shell_errno = EOVERFLOW;
         return -1;
 }
@@ -258 +260 @@
         struct tm _tm;
 
-        time(&temp);
+        temp = rtc_read();
         gmtime_r(&temp, &_tm);