Changeset 2648 in kBuild for trunk/src

Timestamp:

Sep 9, 2012 3:22:30 AM (12 years ago)

Author:

bird

Message:

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

Location:

trunk/src/kash

Files:

• bltin/printf.c (modified) (2 diffs)
• cd.c (modified) (1 diff)
• error.c (modified) (2 diffs)
• exec.c (modified) (1 diff)
• jobs.c (modified) (6 diffs)
• miscbltin.c (modified) (1 diff)
• redir.c (modified) (4 diffs)
• shinstance.c (modified) (1 diff)
• shinstance.h (modified) (2 diffs)

trunk/src/kash/bltin/printf.c

@@ -55 +55 @@
 #include <string.h>
 #include <unistd.h>
+#include "shinstance.h"
 
 #ifdef __GNUC__
@@ -647 +648 @@
                 rval = 1;
         } else if (errno == ERANGE) {
-                warnx("%s: %s", s, strerror(ERANGE));
+                warnx("%s: %s", s, sh_strerror(psh, ERANGE));
                 rval = 1;
         }

trunk/src/kash/cd.c

@@ -392 +392 @@
                         continue;
                 if (!noerror)
-                        error(psh, "getcwd() failed: %s", strerror(errno));
+                        error(psh, "getcwd() failed: %s", sh_strerror(psh, errno));
                 return;
         }

trunk/src/kash/error.c

@@ -138 +138 @@
         }
         if (sv_errno >= 0)
-                outfmt(&psh->errout, "%s", strerror(sv_errno));
+                outfmt(&psh->errout, "%s", sh_strerror(psh, sv_errno));
         out2c(psh, '\n');
         flushout(&psh->errout);
@@ -156 +156 @@
 #ifdef DEBUG
         if (msg) {
+                va_list va2;
                 TRACE((psh, "exverror(%d, \"", cond));
-                TRACEV((psh, msg, ap));
+                va_copy(va2, ap);
+                TRACEV((psh, msg, va2));
+                va_end(va2);
                 TRACE((psh, "\") pid=%d\n", sh_getpid(psh)));
         } else

trunk/src/kash/exec.c

@@ -1138 +1138 @@
                                         if (!v_flag)
                                                 out1fmt(psh, ": %s\n",
-                                                    strerror(errno));
+                                                    sh_strerror(psh, errno));
                                         else
                                                 err = 126;

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)

trunk/src/kash/miscbltin.c

@@ -424 +424 @@
                         limit.rlim_cur = val;
                 if (sh_setrlimit(psh, l->cmd, &limit) < 0)
-                        error(psh, "error setting limit (%s)", strerror(errno));
+                        error(psh, "error setting limit (%s)", sh_strerror(psh, errno));
         } else {
                 if (how & SOFT)

trunk/src/kash/redir.c

@@ -144 +144 @@
                                 default:
                                         INTON;
-                                        error(psh, "%d: %s", fd, strerror(errno));
+                                        error(psh, "%d: %s", fd, sh_strerror(psh, errno));
                                         /* NOTREACHED */
                                 }
@@ -377 +377 @@
                 if (errno == EMFILE)
                         return EMPTY;
-                error(psh, "%d: %s", from, strerror(errno));
+                error(psh, "%d: %s", from, sh_strerror(psh, errno));
         }
         return newfd;
@@ -398 +398 @@
                 if (errno == EMFILE)
                         return EMPTY;
-                error(psh, "%d: %s", from, strerror(errno));
+                error(psh, "%d: %s", from, sh_strerror(psh, errno));
         }
         return newfd;
@@ -419 +419 @@
                 if (errno == EMFILE)
                         return EMPTY;
-                error(psh, "%d: %s", from, strerror(errno));
+                error(psh, "%d: %s", from, sh_strerror(psh, errno));
         }
         return newfd;

trunk/src/kash/shinstance.c

@@ -1417 +1417 @@
 }
 
+
+/* Wrapper for strerror that makes sure it doesn't return NULL and causes the
+   caller or fprintf routines to crash. */
+const char *sh_strerror(shinstance *psh, int error)
+{
+    char *err = strerror(error);
+    if (!err)
+        return "strerror return NULL!";
+    (void)psh;
+    return err;
+}
+

trunk/src/kash/shinstance.h

@@ -494 +494 @@
 int sh_setrlimit(shinstance *, int, const shrlimit *);
 
+/* string.h */
+const char *sh_strerror(shinstance *, int);
 
 #ifdef DEBUG
@@ -499 +501 @@
 # define TRACE2V(param) tracev param
 #else
-# define TRACE2(param)
-# define TRACE2V(param)
-#endif
-
-#endif
+# define TRACE2(param)  do { } while (0)
+# define TRACE2V(param) do { } while (0)
+#endif
+
+#endif