final cleanup

3 files changed, 1 insertions, 135 deletions

diff --git a/src/firemon/cgroup.c b/src/firemon/cgroup.c
deleted file mode 100644
index 8dbf85824..000000000
--- a/src/firemon/cgroup.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2014-2018 Firejail Authors
- *
- * This file is part of firejail project
- *
- * 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 2 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, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include "firemon.h"
-#define MAXBUF 4098
-
-static void print_cgroup(int pid) {
-        char *file;
-        if (asprintf(&file, "/proc/%d/cgroup", pid) == -1) {
-                errExit("asprintf");
-                exit(1);
-        }
-
-        FILE *fp = fopen(file, "r");
-        if (!fp) {
-                printf("  Error: cannot open %s\n", file);
-                free(file);
-                return;
-        }
-
-        char buf[MAXBUF];
-        if (fgets(buf, MAXBUF, fp)) {
-                printf("  %s", buf);
-                fflush(0);
-        }
-
-        fclose(fp);
-        free(file);
-}
-
-void cgroup(pid_t pid, int print_procs) {
-        pid_read(pid);
-
-        // print processes
-        printf("  cgroup: ");
-        int i;
-        for (i = 0; i < max_pids; i++) {
-                if (pids[i].level == 1) {
-                        if (print_procs || pid == 0)
-                                pid_print_list(i, arg_nowrap);
-                        int child = find_child(i);
-                        if (child != -1)
-                                print_cgroup(child);
-                }
-        }
-        printf("\n");
-}
diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c
index 147b5073b..6124310b1 100644
--- a/src/firemon/firemon.c
+++ b/src/firemon/firemon.c
@@ -33,8 +33,6 @@ static int arg_interface = 0;
 static int arg_seccomp = 0;
 static int arg_caps = 0;
 static int arg_cpu = 0;
-static int arg_cgroup = 0;
-static int arg_x11 = 0;
 static int arg_top = 0;
 static int arg_list = 0;
 static int arg_netstats = 0;
@@ -159,10 +157,6 @@ int main(int argc, char **argv) {
 
 
                 // cumulative options with or without a pid argument
-                else if (strcmp(argv[i], "--x11") == 0)
-                        arg_x11 = 1;
-                else if (strcmp(argv[i], "--cgroup") == 0)
-                        arg_cgroup = 1;
                 else if (strcmp(argv[i], "--cpu") == 0)
                         arg_cpu = 1;
                 else if (strcmp(argv[i], "--seccomp") == 0)
@@ -250,13 +244,11 @@ int main(int argc, char **argv) {
 
         // if --name requested without other options, print all data
         if (pid && !arg_cpu && !arg_seccomp && !arg_caps && !arg_apparmor &&
-            !arg_cgroup && !arg_x11 && !arg_interface && !arg_route && !arg_arp) {
+            !arg_interface && !arg_route && !arg_arp) {
                 arg_tree = 1;
                 arg_cpu = 1;
                 arg_seccomp = 1;
                 arg_caps = 1;
-                arg_cgroup = 1;
-                arg_x11 = 1;
                 arg_interface = 1;
                 arg_route = 1;
                 arg_arp = 1;
@@ -281,14 +273,6 @@ int main(int argc, char **argv) {
                 apparmor((pid_t) pid, print_procs);
                 print_procs = 0;
         }
-        if (arg_cgroup) {
-                cgroup((pid_t) pid, print_procs);
-                print_procs = 0;
-        }
-        if (arg_x11) {
-                x11((pid_t) pid, print_procs);
-                print_procs = 0;
-        }
         if (arg_interface && getuid() == 0) {
                 interface((pid_t) pid, print_procs);
                 print_procs = 0;
diff --git a/src/firemon/x11.c b/src/firemon/x11.c
deleted file mode 100644
index 09eb3cd06..000000000
--- a/src/firemon/x11.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2014-2018 Firejail Authors
- *
- * This file is part of firejail project
- *
- * 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 2 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, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include "firemon.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-void x11(pid_t pid, int print_procs) {
-        pid_read(pid);
-
-        // print processes
-        int i;
-        for (i = 0; i < max_pids; i++) {
-                if (pids[i].level == 1) {
-                        if (print_procs || pid == 0)
-                                pid_print_list(i, arg_nowrap);
-
-                        char *x11file;
-                        // todo: use macro from src/firejail/firejail.h for /run/firejail/x11 directory
-                        if (asprintf(&x11file, "/run/firejail/x11/%d", i) == -1)
-                                errExit("asprintf");
-
-                        FILE *fp = fopen(x11file, "r");
-                        if (!fp) {
-                                free(x11file);
-                                continue;
-                        }
-
-                        int display;
-                        int rv = fscanf(fp, "%d", &display);
-                        if (rv == 1)
-                                printf("  DISPLAY :%d\n", display);
-                        fclose(fp);
-                        free(x11file);
-                }
-        }
-        printf("\n");
-}