2 files changed, 10 insertions, 10 deletions

diff --git a/shell/ash.c b/shell/ash.c
index f16d7fb6a..54f004375 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -11371,10 +11371,10 @@ static void FAST_FUNC
 change_epoch(struct var *vepoch, const char *fmt)
 {
         struct timeval tv;
-        char buffer[sizeof("%lu.nnnnnn") + sizeof(long)*3];
+        char buffer[sizeof("%llu.nnnnnn") + sizeof(long long)*3];
 
-        gettimeofday(&tv, NULL);
-        sprintf(buffer, fmt, (unsigned long)tv.tv_sec, (unsigned)tv.tv_usec);
+        xgettimeofday(&tv);
+        sprintf(buffer, fmt, (unsigned long long)tv.tv_sec, (unsigned)tv.tv_usec);
         setvar(vepoch->var_text, buffer, VNOFUNC);
         vepoch->flags &= ~VNOFUNC;
 }
@@ -11382,13 +11382,13 @@ change_epoch(struct var *vepoch, const char *fmt)
 static void FAST_FUNC
 change_seconds(const char *value UNUSED_PARAM)
 {
-        change_epoch(&vepochs, "%lu");
+        change_epoch(&vepochs, "%llu");
 }
 
 static void FAST_FUNC
 change_realtime(const char *value UNUSED_PARAM)
 {
-        change_epoch(&vepochr, "%lu.%06u");
+        change_epoch(&vepochr, "%llu.%06u");
 }
 #endif
 
diff --git a/shell/hush.c b/shell/hush.c
index 9fead37da..65f08659f 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1027,7 +1027,7 @@ struct globals {
         struct sigaction sa;
         char optstring_buf[sizeof("eixcs")];
 #if BASH_EPOCH_VARS
-        char epoch_buf[sizeof("%lu.nnnnnn") + sizeof(long)*3];
+        char epoch_buf[sizeof("%llu.nnnnnn") + sizeof(long long)*3];
 #endif
 #if ENABLE_FEATURE_EDITING
         char user_input_buf[CONFIG_FEATURE_EDITING_MAX_LEN];
@@ -2277,13 +2277,13 @@ static const char* FAST_FUNC get_local_var_value(const char *name)
         {
                 const char *fmt = NULL;
                 if (strcmp(name, "EPOCHSECONDS") == 0)
-                        fmt = "%lu";
+                        fmt = "%llu";
                 else if (strcmp(name, "EPOCHREALTIME") == 0)
-                        fmt = "%lu.%06u";
+                        fmt = "%llu.%06u";
                 if (fmt) {
                         struct timeval tv;
-                        gettimeofday(&tv, NULL);
-                        sprintf(G.epoch_buf, fmt, (unsigned long)tv.tv_sec,
+                        xgettimeofday(&tv);
+                        sprintf(G.epoch_buf, fmt, (unsigned long long)tv.tv_sec,
                                         (unsigned)tv.tv_usec);
                         return G.epoch_buf;
                 }