Changeset 3408 in kBuild

Timestamp:

Aug 13, 2020 9:01:14 AM (5 years ago)

Author:

bird

Message:

kash: Don't use sys_siglist, use strsignal instead. Should be present everywhere except when using VC++ on windows.

Location:

trunk/src/kash

Files:

• jobs.c (modified) (2 diffs)
• shinstance.h (modified) (1 diff)
• sys_signame.c (modified) (2 diffs)

trunk/src/kash/jobs.c

@@ -390 +390 @@
                                 fmtstr(s + col, 16, "Done");
                 } else {
+                        const char *pszSigNm;
 #if JOBS
                         if (WIFSTOPPED(ps->status))
@@ -397 +398 @@
                                 st = WTERMSIG(ps->status);
                         st &= 0x7f;
-                        if (st < NSIG && sys_siglist[st])
-                                scopyn(sys_siglist[st], s + col, 32);
+                        pszSigNm = st < NSIG ? strsignal(st) : NULL;
+                        if (pszSigNm)
+                                scopyn(pszSigNm, s + col, 32);
                         else
                                 fmtstr(s + col, 16, "Signal %d", st);

trunk/src/kash/shinstance.h

@@ -381 +381 @@
 /*# define SIGBREAK         21 */
 /*# define SIGABRT          22 */
-
-#   define sys_siglist      sys_signame
+const char *strsignal(int iSig);
 #endif /* _MSC_VER */
-#ifdef __sun__
-#   define sys_siglist      _sys_siglist
-#endif
 #ifndef HAVE_SYS_SIGNAME
 extern char sys_signame[NSIG][16];

trunk/src/kash/sys_signame.c

@@ -12 +12 @@
 void init_sys_signame(void)
 {
-    unsigned i;
+        unsigned i;
         if (sys_signame_initialized)
                 return;
@@ -120 +120 @@
         sys_signame_initialized = 1;
 }
+
+#if defined(_MSC_VER)
+const char *strsignal(int iSig)
+{
+    if (!sys_signame_initialized)
+        init_sys_signame();
+    if (iSig < NSIG)
+        return sys_signame(iSig);
+    return NULL;
+}
+#endif
+