cleanup

13 files changed, 18 insertions, 52 deletions

diff --git a/RELNOTES b/RELNOTES
index 92086d3bc..475f58c16 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,4 +1,4 @@
-firejail (0.9.40-rc1) baseline; urgency=low
+firejail (0.9.39) baseline; urgency=low
   * default seccomp filter update
   * disable STUN/WebRTC in default netfilter configuration
   * added --nice option
@@ -9,7 +9,7 @@ firejail (0.9.40-rc1) baseline; urgency=low
   * build rpm packages using "make rpms"
   * new profiles: lxterminal, Epiphany, cherrytree, Polari, Vivaldi
   * bugfixes
- -- netblue30 <netblue30@yahoo.com>  Wed, 28 Feb 2016 08:00:00 -0500
+ -- netblue30 <netblue30@yahoo.com>  Wed, 3 Mar 2016 08:00:00 -0500
 
 firejail (0.9.38) baseline; urgency=low
   * IPv6 support (--ip6 and --netfilter6)
diff --git a/configure b/configure
index d14c14ee6..71f421ff4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for firejail 0.9.40-rc1.
+# Generated by GNU Autoconf 2.69 for firejail 0.9.39.
 #
 # Report bugs to <netblue30@yahoo.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='firejail'
 PACKAGE_TARNAME='firejail'
-PACKAGE_VERSION='0.9.40-rc1'
-PACKAGE_STRING='firejail 0.9.40-rc1'
+PACKAGE_VERSION='0.9.39'
+PACKAGE_STRING='firejail 0.9.39'
 PACKAGE_BUGREPORT='netblue30@yahoo.com'
 PACKAGE_URL='http://firejail.wordpress.com'
 
@@ -1244,7 +1244,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures firejail 0.9.40-rc1 to adapt to many kinds of systems.
+\`configure' configures firejail 0.9.39 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1305,7 +1305,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of firejail 0.9.40-rc1:";;
+     short | recursive ) echo "Configuration of firejail 0.9.39:";;
    esac
   cat <<\_ACEOF
 
@@ -1400,7 +1400,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-firejail configure 0.9.40-rc1
+firejail configure 0.9.39
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1702,7 +1702,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by firejail $as_me 0.9.40-rc1, which was
+It was created by firejail $as_me 0.9.39, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4168,7 +4168,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by firejail $as_me 0.9.40-rc1, which was
+This file was extended by firejail $as_me 0.9.39, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4222,7 +4222,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-firejail config.status 0.9.40-rc1
+firejail config.status 0.9.39
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index b8d560c91..512159568 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT(firejail, 0.9.40-rc1, netblue30@yahoo.com, , http://firejail.wordpress.com)
+AC_INIT(firejail, 0.9.39, netblue30@yahoo.com, , http://firejail.wordpress.com)
 AC_CONFIG_SRCDIR([src/firejail/main.c])
 #AC_CONFIG_HEADERS([config.h])
 
diff --git a/src/firejail/bandwidth.c b/src/firejail/bandwidth.c
index da894b321..0be23b9bc 100644
--- a/src/firejail/bandwidth.c
+++ b/src/firejail/bandwidth.c
@@ -364,10 +364,7 @@ void bandwidth_pid(pid_t pid, const char *command, const char *dev, int down, in
                 exit(1);
         }
 
-        // remove \n and check for firejail sandbox
-        char *ptr = strchr(comm, '\n');
-        if (ptr)
-                *ptr = '\0';
+        // check for firejail sandbox
         if (strcmp(comm, "firejail") != 0) {
                 fprintf(stderr, "Error: cannot find sandbox\n");
                 exit(1);
diff --git a/src/firejail/caps.c b/src/firejail/caps.c
index d623c5fd3..de7c93b48 100644
--- a/src/firejail/caps.c
+++ b/src/firejail/caps.c
@@ -419,10 +419,6 @@ void caps_print_filter(pid_t pid) {
         // if the pid is that of a firejail  process, use the pid of the first child process
         char *comm = pid_proc_comm(pid);
         if (comm) {
-                // remove \n
-                char *ptr = strchr(comm, '\n');
-                if (ptr)
-                        *ptr = '\0';
                 if (strcmp(comm, "firejail") == 0) {
                         pid_t child;
                         if (find_child(pid, &child) == 0) {
diff --git a/src/firejail/fs_logger.c b/src/firejail/fs_logger.c
index f803982d7..058bcc1c9 100644
--- a/src/firejail/fs_logger.c
+++ b/src/firejail/fs_logger.c
@@ -143,10 +143,6 @@ void fs_logger_print_log(pid_t pid) {
         // if the pid is that of a firejail  process, use the pid of the first child process
         char *comm = pid_proc_comm(pid);
         if (comm) {
-                // remove \n
-                char *ptr = strchr(comm, '\n');
-                if (ptr)
-                        *ptr = '\0';
                 if (strcmp(comm, "firejail") == 0) {
                         pid_t child;
                         if (find_child(pid, &child) == 0) {
diff --git a/src/firejail/join.c b/src/firejail/join.c
index 4cd315d90..21bb56e9d 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -202,10 +202,6 @@ void join(pid_t pid, const char *homedir, int argc, char **argv, int index) {
         // if the pid is that of a firejail  process, use the pid of the first child process
         char *comm = pid_proc_comm(pid);
         if (comm) {
-                // remove \n
-                char *ptr = strchr(comm, '\n');
-                if (ptr)
-                        *ptr = '\0';
                 if (strcmp(comm, "firejail") == 0) {
                         pid_t child;
                         if (find_child(pid, &child) == 0) {
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 05745a3f1..a9fe13c78 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -618,10 +618,6 @@ int main(int argc, char **argv) {
                 pid_t ppid = getppid();
                 char *comm = pid_proc_comm(ppid);
                 if (comm) {
-                        // remove \n
-                        char *ptr = strchr(comm, '\n');
-                        if (ptr)
-                                *ptr = '\0';
                         if (strcmp(comm, "sshd") == 0)
                                 parent_sshd = 1;
                         free(comm);
diff --git a/src/firejail/network_main.c b/src/firejail/network_main.c
index 9ddd56dcd..3fb79b9f4 100644
--- a/src/firejail/network_main.c
+++ b/src/firejail/network_main.c
@@ -246,10 +246,6 @@ void net_dns_print(pid_t pid) {
         // if the pid is that of a firejail  process, use the pid of the first child process
         char *comm = pid_proc_comm(pid);
         if (comm) {
-                // remove \n
-                char *ptr = strchr(comm, '\n');
-                if (ptr)
-                        *ptr = '\0';
                 if (strcmp(comm, "firejail") == 0) {
                         pid_t child;
                         if (find_child(pid, &child) == 0) {
diff --git a/src/firejail/protocol.c b/src/firejail/protocol.c
index 24fbfc024..3e81f13dc 100644
--- a/src/firejail/protocol.c
+++ b/src/firejail/protocol.c
@@ -341,10 +341,6 @@ void protocol_print_filter(pid_t pid) {
         // if the pid is that of a firejail  process, use the pid of the first child process
         char *comm = pid_proc_comm(pid);
         if (comm) {
-                // remove \n
-                char *ptr = strchr(comm, '\n');
-                if (ptr)
-                        *ptr = '\0';
                 if (strcmp(comm, "firejail") == 0) {
                         pid_t child;
                         if (find_child(pid, &child) == 0) {
diff --git a/src/firejail/seccomp.c b/src/firejail/seccomp.c
index f9a9df211..a5a77abab 100644
--- a/src/firejail/seccomp.c
+++ b/src/firejail/seccomp.c
@@ -820,10 +820,6 @@ void seccomp_print_filter(pid_t pid) {
         // if the pid is that of a firejail  process, use the pid of the first child process
         char *comm = pid_proc_comm(pid);
         if (comm) {
-                // remove \n
-                char *ptr = strchr(comm, '\n');
-                if (ptr)
-                        *ptr = '\0';
                 if (strcmp(comm, "firejail") == 0) {
                         pid_t child;
                         if (find_child(pid, &child) == 0) {
diff --git a/src/firejail/shutdown.c b/src/firejail/shutdown.c
index c88683aaa..3671901d0 100644
--- a/src/firejail/shutdown.c
+++ b/src/firejail/shutdown.c
@@ -46,10 +46,6 @@ void shut(pid_t pid) {
         // if the pid is that of a firejail  process, use the pid of a child process inside the sandbox
         char *comm = pid_proc_comm(pid);
         if (comm) {
-                // remove \n
-                char *ptr = strchr(comm, '\n');
-                if (ptr)
-                        *ptr = '\0';
                 if (strcmp(comm, "firejail") == 0) {
                         pid_t child;
                         if (find_child(pid, &child) == 0) {
diff --git a/src/lib/common.c b/src/lib/common.c
index f321c5a47..fd3ab7071 100644
--- a/src/lib/common.c
+++ b/src/lib/common.c
@@ -84,10 +84,6 @@ int name2pid(const char *name, pid_t *pid) {
                 // check if this is a firejail executable
                 char *comm = pid_proc_comm(newpid);
                 if (comm) {
-                        // remove \n
-                        char *ptr = strchr(comm, '\n');
-                        if (ptr)
-                                *ptr = '\0';
                         if (strcmp(comm, "firejail")) {
                                 free(comm);
                                 continue;
@@ -150,6 +146,11 @@ char *pid_proc_comm(const pid_t pid) {
         buffer[len] = '\0';
         close(fd);
 
+        // remove \n
+        char *ptr = strchr(buffer, '\n');
+        if (ptr)
+                *ptr = '\0';
+
         // return a malloc copy of the command line
         char *rv = strdup((char *) buffer);
         if (strlen(rv) == 0) {