Changeset 2648 for trunk/src/kash/jobs.c

Timestamp:

Sep 9, 2012, 5:22:30 AM (13 years ago)

Author:

bird

Message:

Made TRACE2 and TRACE2V safe. Fixed DEBUG bug where va_copy was missing. Introduced sh_strerror.

File:

• trunk/src/kash/jobs.c (modified) (6 diffs)

trunk/src/kash/jobs.c

@@ -150 +150 @@
                 if (sh_getpgid(psh, 0) != psh->rootpid && sh_setpgid(psh, 0, psh->rootpid) == -1)
                         error(psh, "Cannot set process group (%s) at %d",
-                            strerror(errno), __LINE__);
+                            sh_strerror(psh, errno), __LINE__);
                 if (sh_tcsetpgrp(psh, psh->ttyfd, psh->rootpid) == -1)
                         error(psh, "Cannot set tty process group (%s) at %d",
-                            strerror(errno), __LINE__);
+                            sh_strerror(psh, errno), __LINE__);
         } else { /* turning job control off */
                 if (sh_getpgid(psh, 0) != psh->initialpgrp && sh_setpgid(psh, 0, psh->initialpgrp) == -1)
                         error(psh, "Cannot set process group (%s) at %d",
-                            strerror(errno), __LINE__);
+                            sh_strerror(psh, errno), __LINE__);
                 if (sh_tcsetpgrp(psh, psh->ttyfd, psh->initialpgrp) == -1)
                         error(psh, "Cannot set tty process group (%s) at %d",
-                            strerror(errno), __LINE__);
+                            sh_strerror(psh, errno), __LINE__);
                 shfile_close(&psh->fdtab, psh->ttyfd);
                 psh->ttyfd = -1;
@@ -209 +209 @@
         if (i >= jp->nprocs) {
                 error(psh, "Cannot set tty process group (%s) at %d",
-                    strerror(errno), __LINE__);
+                    sh_strerror(psh, errno), __LINE__);
         }
         restartjob(psh, jp);
@@ -301 +301 @@
                         break;
         if (i >= jp->nprocs)
-                error(psh, "Cannot continue job (%s)", strerror(errno));
+                error(psh, "Cannot continue job (%s)", sh_strerror(psh, errno));
         for (ps = jp->ps, i = jp->nprocs ; --i >= 0 ; ps++) {
                 if (WIFSTOPPED(ps->status)) {
@@ -485 +485 @@
                 if (sh_tcsetpgrp(psh, psh->ttyfd, sh_getpid(psh)) == -1)
                         error(psh, "Cannot set tty process group (%s) at %d",
-                            strerror(errno), __LINE__);
+                            sh_strerror(psh, errno), __LINE__);
                 TRACE((psh, "repaired tty process group\n"));
                 silent = 1;
@@ -854 +854 @@
                         if (sh_tcsetpgrp(psh, psh->ttyfd, pgrp) == -1)
                                 error(psh, "Cannot set tty process group (%s) at %d",
-                                    strerror(errno), __LINE__);
+                                    sh_strerror(psh, errno), __LINE__);
                 }
                 setsignal(psh, SIGTSTP, vforked);
@@ -927 +927 @@
                 if (sh_tcsetpgrp(psh, psh->ttyfd, mypgrp) == -1)
                         error(psh, "Cannot set tty process group (%s) at %d",
-                            strerror(errno), __LINE__);
+                            sh_strerror(psh, errno), __LINE__);
         }
         if (jp->state == JOBSTOPPED && psh->curjob != jp - psh->jobtab)