Changeset 3438 for trunk/src/kash/bltin/kill.c

Timestamp:

Sep 9, 2020, 10:01:39 PM (5 years ago)

Author:

bird

Message:

kash: Hammering on threaded mode.

File:

• trunk/src/kash/bltin/kill.c (modified) (3 diffs)

trunk/src/kash/bltin/kill.c

@@ -61 +61 @@
 killcmd(shinstance *psh, int argc, char *argv[])
 {
-        int errors, numsig, pid;
+        int errors, numsig;
         char *ep;
 
@@ -131 +131 @@
 
         for (errors = 0; argc; argc--, argv++) {
-                if (*argv[0] == '%') {
-                        pid = getjobpgrp(psh, *argv);
+                const char * const strpid = argv[0];
+                shpid pid;
+                if (*strpid == '%') {
+                        pid = getjobpgrp(psh, strpid);
                         if (pid == 0) {
-                                sh_warnx(psh, "illegal job id: %s", *argv);
+                                sh_warnx(psh, "illegal job id: %s", strpid);
                                 errors = 1;
                                 continue;
                         }
                 } else {
-                        pid = strtol(*argv, &ep, 10);
-                        if (!**argv || *ep) {
-                                sh_warnx(psh, "illegal process id: %s", *argv);
+#if !defined(SH_FORKED_MODE) && defined(_MSC_VER)
+                        pid = _strtoi64(strpid, &ep, 10);
+#elif !defined(SH_FORKED_MODE)
+                        pid = strtoll(strpid, &ep, 10);
+#else
+                        pid = strtol(strpid, &ep, 10);
+#endif
+                        if (!*strpid || *ep) {
+                                sh_warnx(psh, "illegal process id: %s", strpid);
                                 errors = 1;
                                 continue;
@@ -147 +155 @@
                 }
                 if (sh_kill(psh, pid, numsig) == -1) {
-                        sh_warn(psh, "%s", *argv);
+                        sh_warn(psh, "%s", strpid);
                         errors = 1;
                 }