aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt7
-rw-r--r--ports/common/guts/execl.c5
-rw-r--r--ports/common/guts/execle.c5
-rw-r--r--ports/common/guts/execlp.c5
-rw-r--r--ports/unix/guts/popen.c1
-rw-r--r--ports/unix/guts/system.c10
-rw-r--r--pseudo_util.c2
7 files changed, 27 insertions, 8 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0e53713..617e464 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+2012-03-28:
+ * (seebs) Cleanup unused variables, stray semicolons, add
+ comments to some unused functions which exist because the
+ wrapper generator makes them anyway.
+ * (seebs) Make system() drop environment if PSEUDO_UNLOAD is
+ set.
+
2012-03-27:
* (seebs) Merge in:
* (mhatle) Improve configuration compatibility with OE-Core.
diff --git a/ports/common/guts/execl.c b/ports/common/guts/execl.c
index ce908ed..be86b49 100644
--- a/ports/common/guts/execl.c
+++ b/ports/common/guts/execl.c
@@ -6,6 +6,11 @@
* int rc = -1;
*/
+ /* NOTE THAT THIS IS NEVER USED!
+ * We implement all execl() in terms of execv()
+ * so this call is not used.
+ */
+
rc = real_execl(file, arg, ap);
/* return rc;
diff --git a/ports/common/guts/execle.c b/ports/common/guts/execle.c
index 68d8bba..a3bc3ca 100644
--- a/ports/common/guts/execle.c
+++ b/ports/common/guts/execle.c
@@ -6,6 +6,11 @@
* int rc = -1;
*/
+ /* NOTE THAT THIS IS NEVER USED!
+ * We implement all execl() in terms of execv()
+ * so this call is not used.
+ */
+
rc = real_execle(file, arg, ap);
/* return rc;
diff --git a/ports/common/guts/execlp.c b/ports/common/guts/execlp.c
index d357986..3cf2889 100644
--- a/ports/common/guts/execlp.c
+++ b/ports/common/guts/execlp.c
@@ -6,6 +6,11 @@
* int rc = -1;
*/
+ /* NOTE THAT THIS IS NEVER USED!
+ * We implement all execl() in terms of execv()
+ * so this call is not used.
+ */
+
rc = real_execlp(file, arg, ap);
/* return rc;
diff --git a/ports/unix/guts/popen.c b/ports/unix/guts/popen.c
index 05f0f6a..0ca16b0 100644
--- a/ports/unix/guts/popen.c
+++ b/ports/unix/guts/popen.c
@@ -5,7 +5,6 @@
* FILE *popen(const char *command, const char *mode)
* FILE *rc = NULL;
*/
-
/* on at least some systems, popen() calls fork and exec
* in ways that avoid our usual enforcement of the environment.
*/
diff --git a/ports/unix/guts/system.c b/ports/unix/guts/system.c
index 8b3607d..028b372 100644
--- a/ports/unix/guts/system.c
+++ b/ports/unix/guts/system.c
@@ -1,19 +1,17 @@
/*
- * Copyright (c) 2011 Wind River Systems; see
+ * Copyright (c) 2011, 2012 Wind River Systems; see
* guts/COPYRIGHT for information.
*
* int system(const char *command)
* int rc = -1;
*/
- /* We want to ensure that the child process implicitly
- * spawned has the right environment. So...
- */
- int pid;
-
if (!command)
return 1;
pseudo_setupenv();
+ if (pseudo_get_value("PSEUDO_UNLOAD"))
+ pseudo_dropenv();
+
rc = real_system(command);
/* return rc;
diff --git a/pseudo_util.c b/pseudo_util.c
index d4aab07..fd3236d 100644
--- a/pseudo_util.c
+++ b/pseudo_util.c
@@ -1055,7 +1055,7 @@ char *
pseudo_get_bindir(void) {
char *s = pseudo_get_value("PSEUDO_BINDIR");
if (!s) {
- char *pseudo_bindir = pseudo_prefix_path(PSEUDO_BINDIR);;
+ char *pseudo_bindir = pseudo_prefix_path(PSEUDO_BINDIR);
if (pseudo_bindir) {
pseudo_set_value("PSEUDO_BINDIR", pseudo_bindir);
s = pseudo_bindir;