add got-diminished-cerberus1387741134

Signed-off-by: Mattias Andrée <maandree@operamail.com>

4 files changed, 71 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index b30a001..6c88cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+_/
 /bin
 /got-diminished
 \#*\#
diff --git a/Makefile b/Makefile
index c7c29d6..5b5b0d7 100644
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,15 @@ LICENSES = $(PREFIX)$(DATA)/licenses
 
 OPTIMISE = -Os
 
+BINS = login ssh cerberus
+_BINS = $(foreach B, $(BINS), bin/got-diminished-$(B))
+
 # Use /sbin for LIBEXEC if you do not have /libexec in PREFIX
 
 
 
 .PHONY: all
-all: got-diminished bin/got-diminished-login bin/got-diminished-ssh
+all: got-diminished $(_BINS)
 
 
 got-diminished: src/got-diminished
@@ -26,20 +29,18 @@ bin/%: src/%.c
 
 
 .PHONY: install
-install: got-diminished bin/got-diminished-login bin/got-diminished-ssh
+install: got-diminished $(_BINS)
 	install -d     --                          "$(DESTDIR)$(SYSCONF)/gotrc.examples"
 	install  -m644 -- got-diminished           "$(DESTDIR)$(SYSCONF)/gotrc.examples"
 	install -d     --                          "$(DESTDIR)$(PREFIX)$(LIBEXEC)"
-	install  -m755 -- bin/got-diminished-login "$(DESTDIR)$(PREFIX)$(LIBEXEC)"
-	install  -m755 -- bin/got-diminished-ssh   "$(DESTDIR)$(PREFIX)$(LIBEXEC)"
+	install  -m755 -- $(_BINS)                 "$(DESTDIR)$(PREFIX)$(LIBEXEC)"
 	install -d     --                          "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
 	install  -m644 -- COPYING LICENSE          "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
 
 
 .PHONY: uninstall
 uninstall:
-	-rm    -- "$(DESTDIR)$(PREFIX)$(LIBEXEC)/got-diminished-login"
-	-rm    -- "$(DESTDIR)$(PREFIX)$(LIBEXEC)/got-diminished-ssh"
+	-rm    -- $(foreach B, $(BINS), "$(DESTDIR)$(PREFIX)$(LIBEXEC)/got-diminished-$(B)")
 	-rm    -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)/COPYING"
 	-rm    -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)/LICENSE"
 	-rm -d -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
diff --git a/src/got-diminished b/src/got-diminished
index 6ff6642..618f63b 100644
--- a/src/got-diminished
+++ b/src/got-diminished
@@ -15,5 +15,6 @@ _use_ssh ()
 _use_login ()
 {
     exec "/usr/libexec/got-diminished-login" "${user}" "${tty_settings}"
+#    exec "/usr/libexec/got-diminished-cerberus" "${user}" "${tty_settings}"
 }
 
diff --git a/src/got-diminished-cerberus.c b/src/got-diminished-cerberus.c
new file mode 100644
index 0000000..37fb060
--- /dev/null
+++ b/src/got-diminished-cerberus.c
@@ -0,0 +1,62 @@
+/**
+ * got-diminished – Extension for gates-of-tartaros to minimise memory usage after logging in
+ * 
+ * Copyright © 2013  Mattias Andrée (maandree@member.fsf.org)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <sys/wait.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+
+
+int main(int argc, char** argv)
+{
+  pid_t pid = vfork();
+  if (pid == -1)
+    {
+      perror("vfork");
+      return 1;
+    }
+  
+  if (pid)
+    {
+      waitpid(pid, &pid, 0);
+      {
+	int n = 0, i;
+	char* stty = *(argv + 2);
+	char* stty_cmd;
+	
+	while (*(stty + n++))
+	  ;
+	
+	stty_cmd = malloc(5 + n);
+	for (i = 0; i < 5; i++)
+	  *(stty_cmd + i) = *("stty " + i);
+	stty_cmd += 5;
+	for (i = 0; i < n; i++)
+	  *(stty_cmd + i) = *(stty + i);
+	stty_cmd -= 5;
+	
+	system(stty_cmd);
+	free(stty_cmd);
+      }
+    }
+  else
+    execlp("setsid", "setsid", "-c", "cerberus", "--", *(argv + 1), NULL);
+  
+  return 0;
+}
+