Changeset 3192 for trunk/src/kmk/kmkbuiltin/sleep.c

Timestamp:

Mar 26, 2018, 10:25:56 PM (7 years ago)

Author:

bird

Message:

kmkbuiltin: funnel output thru output.c (usually via err.c).

File:

• trunk/src/kmk/kmkbuiltin/sleep.c (modified) (8 diffs)

trunk/src/kmk/kmkbuiltin/sleep.c

@@ -40 +40 @@
 #endif
 
+#include "err.h"
 #include "../kmkbuiltin.h"
 
 
-static const char *name(const char *pszName)
+static int kmk_builtin_sleep_usage(PKMKBUILTINCTX pCtx, int fIsErr)
 {
-    const char *psz = strrchr(pszName, '/');
-#if defined(_MSC_VER) || defined(__OS2__)
-    const char *psz2 = strrchr(pszName, '\\');
-    if (!psz2)
-        psz2 = strrchr(pszName, ':');
-    if (psz2 && (!psz || psz2 > psz))
-        psz = psz2;
-#endif
-    return psz ? psz + 1 : pszName;
-}
-
-
-static int usage(FILE *pOut,  const char *argv0)
-{
-    argv0 = name(argv0);
-    fprintf(pOut,
-            "usage: %s <seconds>[s]\n"
-            "   or: %s <milliseconds>ms\n"
-            "   or: %s <minutes>m\n"
-            "   or: %s <hours>h\n"
-            "   or: %s <days>d\n"
-            "   or: %s --help\n"
-            "   or: %s --version\n"
-            "\n"
-            "Only integer values are accepted.\n"
-            ,
-            argv0, argv0, argv0, argv0, argv0, argv0, argv0);
+    kmk_builtin_ctx_printf(pCtx, fIsErr,
+                           "usage: %s <seconds>[s]\n"
+                           "   or: %s <milliseconds>ms\n"
+                           "   or: %s <minutes>m\n"
+                           "   or: %s <hours>h\n"
+                           "   or: %s <days>d\n"
+                           "   or: %s --help\n"
+                           "   or: %s --version\n"
+                           "\n"
+                           "Only integer values are accepted.\n"
+                           ,
+                           pCtx->pszProgName, pCtx->pszProgName, pCtx->pszProgName, pCtx->pszProgName,
+                           pCtx->pszProgName, pCtx->pszProgName, pCtx->pszProgName);
     return 1;
 }
 
 
-int kmk_builtin_sleep(int argc, char **argv, char **envp)
+int kmk_builtin_sleep(int argc, char **argv, char **envp, PKMKBUILTINCTX pCtx)
 {
     long cMsToSleep;
@@ -88 +75 @@
      */
     if (argc != 2)
-        return usage(stderr, argv[0]);
+        return kmk_builtin_sleep_usage(pCtx, 1);
 
     /* help request */
@@ -96 +83 @@
         || !strcmp(argv[1], "--help"))
     {
-        usage(stdout, argv[0]);
+        kmk_builtin_sleep_usage(pCtx, 0);
         return 0;
     }
@@ -121 +108 @@
     cMsToSleep = strtol(pszInterval, &pszSuff, 0);
     if (pszSuff == pszInterval)
-    {
-        fprintf(stderr, "%s: malformed interval '%s'!\n", name(argv[0]), pszInterval);
-        return 1;
-    }
+        return errx(pCtx, 1, "malformed interval '%s'!\n", pszInterval);
 
     while (isspace(*pszSuff))
@@ -142 +126 @@
         {
             if (!isspace(pszSuff[i]))
-            {
-                fprintf(stderr, "%s: malformed interval '%s'!\n", name(argv[0]), pszInterval);
-                return 1;
-            }
+                return errx(pCtx, 1, "malformed interval '%s'!\n", pszInterval);
             i++;
         }
@@ -160 +141 @@
             ulFactor = 24*60*60*1000;
         else
-        {
-            fprintf(stderr, "%s: unknown suffix '%.*s'!\n", name(argv[0]), cchSuff, pszSuff);
-            return 1;
-        }
+            return errx(pCtx, 1, "unknown suffix '%.*s'!\n", cchSuff, pszSuff);
     }
 
@@ -169 +147 @@
     cMsToSleep *= ulFactor;
     if ((cMsToSleep / ulFactor) != (unsigned long)lTmp)
-    {
-        fprintf(stderr, "%s: time interval overflow!\n", name(argv[0]));
-        return 1;
-    }
+        return errx(pCtx, 1, "time interval overflow!\n");
 
     /*
@@ -195 +170 @@
 }
 
+#ifdef KMK_BUILTIN_STANDALONE
+int main(int argc, char **argv, char **envp)
+{
+    KMKBUILTINCTX Ctx = { "kmk_sleep", NULL };
+    return kmk_builtin_sleep(argc, argv, envp, &Ctx);
+}
+#endif
+