[gentoo-commits] gentoo-projects commit in portage-utils/libq: xsystem.c

[Mike Frysinger (vapier)]

vapier      11/02/21 22:02:59

  Modified:             xsystem.c
  Log:
  add support for CONFIG_PROTECT_MASK when unmerging, as well as running the pkg_{pre,post}rm funcs

Revision  Changes    Path
1.2                  portage-utils/libq/xsystem.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/xsystem.c?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/xsystem.c?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/xsystem.c?r1=1.1&r2=1.2

Index: xsystem.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/xsystem.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsystem.c	13 Jan 2010 19:15:17 -0000	1.1
+++ xsystem.c	21 Feb 2011 22:02:59 -0000	1.2
@@ -3,14 +3,36 @@
  *
  * Copyright 2005-2010 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/xsystem.c,v 1.1 2010/01/13 19:15:17 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/xsystem.c,v 1.2 2011/02/21 22:02:59 vapier Exp $
  */
 
 #include <stdlib.h>
+#include <sys/wait.h>
 
-void xsystem(const char *command);
-void xsystem(const char *command)
+static void xsystem(const char *command)
 {
 	if (system(command))
 		errp("system(%s) failed", command);
 }
+
+static void xsystembash(const char *command)
+{
+	pid_t p = vfork();
+	int status;
+
+	switch (p) {
+	case 0: /* child */
+		execl("/bin/bash", "bash", "--norc", "--noprofile", "-c", command, NULL);
+		/* Hrm, still here ?  Maybe no bash ... */
+		_exit(execl("/bin/sh", "sh", "-c", command, NULL));
+
+	default: /* parent */
+		waitpid(p, &status, 0);
+		if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
+			return;
+		/* fall through */
+
+	case -1: /* fucked */
+		errp("xsystembash(%s) failed", command);
+	}
+}