From 5b14bc41824ae70d33f1e7cd1486aec32b46b3e1 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Sun, 15 Jul 2012 04:41:00 -0700
Subject: pass group-ID in environment

---
 tools/hi-q.c    | 15 +++++++++++++--
 tools/hi-test.c |  6 +++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/hi-q.c b/tools/hi-q.c
index 40d7100..9d85b7a 100644
--- a/tools/hi-q.c
+++ b/tools/hi-q.c
@@ -20,6 +20,7 @@ using namespace std;
 #include <sstream>
 #include <string>
 #include <vector>
+#include <sstream>
 
 //  error exit codes, as stated in qmail.c
 const int ex_spam = 21;
@@ -126,7 +127,9 @@ int xclose(int arg){
   return close(arg);
 }
 
-int main(int argc, char** argv, char const * const * env) {
+extern char** environ;
+
+int main(int argc, char** argv) {
   int verbose(1);
   int kidstatus;
   pid_t somekid;
@@ -339,7 +342,15 @@ int main(int argc, char** argv, char const * const * env) {
       close(resync[rEnd]);
       close(sync[rEnd]);
       close(sync[wEnd]);
-      rslt = Execve(prog[0], prog, env);
+
+      stringstream convert;
+      convert << getpgid(0);
+      const string grouper("HI_Q_GROUP=" + convert.str());
+      if (putenv((char*)grouper.c_str()) != 0) {
+        cerr << "putenv failed" << endl;
+        exit(1);
+      }
+      rslt = Execve(prog[0], prog, environ);
       fprintf(stderr, "hi-q: failed to exec '%s': ", prog[0]);
       perror(0);
       exit(ex_syserr);
diff --git a/tools/hi-test.c b/tools/hi-test.c
index 3086535..d74b3c9 100644
--- a/tools/hi-test.c
+++ b/tools/hi-test.c
@@ -1,7 +1,11 @@
 
 #include <iostream>
+#include <stdlib.h>
 
 using namespace std;
 int main(){
-  cerr << "++++ hi-test pid: " << getpid() << "  group: " << getpgid(0) << endl;
+  cerr << "++++ hi-test pid: " << getpid() << "  group: " << getpgid(0);
+  char* foo = getenv("HI_Q_GROUP");
+  if (foo) cerr << " HI_Q_GROUP: " << foo;
+  cerr << endl;
 }
-- 
cgit v1.2.3