moved get_cmdline() and daemon_is_ok() to abrtlib

4 files changed, 150 insertions, 122 deletions

diff --git a/inc/abrtlib.h b/inc/abrtlib.h
index c5ca60f7..28140d80 100644
--- a/inc/abrtlib.h
+++ b/inc/abrtlib.h
@@ -210,6 +210,16 @@ char* xmalloc_sockaddr2dotted_noport(const struct sockaddr *sa);
 /* Random utility functions */
 uid_t getuidbyname(const char* login);
 
+/* Returns command line of running program.
+ * Caller is responsible to free() the returned value.
+ * If the pid is not valid or command line can not be obtained,
+ * empty string is returned.
+ */
+char* get_cmdline(pid_t pid);
+
+/* Returns 1 if abrtd daemon is running, 0 otherwise. */
+int daemon_is_ok();
+
 /* Returns malloc'ed block */
 char *encode_base64(const void *src, int length);
 bool dot_or_dotdot(const char *filename);
diff --git a/lib/Utils/Makefile.am b/lib/Utils/Makefile.am
index 4f6670b8..d5e9d98b 100644
--- a/lib/Utils/Makefile.am
+++ b/lib/Utils/Makefile.am
@@ -13,6 +13,7 @@ libABRTUtils_la_SOURCES = \
     read_write.cpp \
     logging.cpp \
     copyfd.cpp \
+    daemon.cpp \
     skip_whitespace.cpp \
     xatonum.cpp \
     popen_and_save_output.cpp \
diff --git a/lib/Utils/daemon.cpp b/lib/Utils/daemon.cpp
new file mode 100644
index 00000000..7aa891c2
--- /dev/null
+++ b/lib/Utils/daemon.cpp
@@ -0,0 +1,139 @@
+/*
+    Copyright (C) 2009  RedHat inc.
+
+    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 "abrtlib.h"
+#define FILENAME_CMDLINE        "cmdline"
+#define VAR_RUN_PID_FILE        VAR_RUN"/abrt.pid"
+
+static char *append_escaped(char *start, const char *s)
+{
+    char hex_char_buf[] = "\\x00";
+
+    *start++ = ' ';
+    char *dst = start;
+    const unsigned char *p = (unsigned char *)s;
+
+    while (1)
+    {
+        const unsigned char *old_p = p;
+        while (*p > ' ' && *p <= 0x7e && *p != '\"' && *p != '\'' && *p != '\\')
+            p++;
+        if (dst == start)
+        {
+            if (p != (unsigned char *)s && *p == '\0')
+            {
+                /* entire word does not need escaping and quoting */
+                strcpy(dst, s);
+                dst += strlen(s);
+                return dst;
+            }
+            *dst++ = '\'';
+        }
+
+        strncpy(dst, s, (p - old_p));
+        dst += (p - old_p);
+
+        if (*p == '\0')
+        {
+            *dst++ = '\'';
+            *dst = '\0';
+            return dst;
+        }
+        const char *a;
+        switch (*p)
+        {
+        case '\r': a = "\\r"; break;
+        case '\n': a = "\\n"; break;
+        case '\t': a = "\\t"; break;
+        case '\'': a = "\\\'"; break;
+        case '\"': a = "\\\""; break;
+        case '\\': a = "\\\\"; break;
+        case ' ': a = " "; break;
+        default:
+            hex_char_buf[2] = "0123456789abcdef"[*p >> 4];
+            hex_char_buf[3] = "0123456789abcdef"[*p & 0xf];
+            a = hex_char_buf;
+        }
+        strcpy(dst, a);
+        dst += strlen(a);
+        p++;
+    }
+}
+
+// taken from kernel
+#define COMMAND_LINE_SIZE 2048
+char* get_cmdline(pid_t pid)
+{
+    char path[sizeof("/proc/%u/cmdline") + sizeof(int)*3];
+    char cmdline[COMMAND_LINE_SIZE];
+    char escaped_cmdline[COMMAND_LINE_SIZE*4 + 4];
+
+    escaped_cmdline[1] = '\0';
+    sprintf(path, "/proc/%u/cmdline", (int)pid);
+    int fd = open(path, O_RDONLY);
+    if (fd >= 0)
+    {
+        int len = read(fd, cmdline, sizeof(cmdline) - 1);
+        close(fd);
+
+        if (len > 0)
+        {
+            cmdline[len] = '\0';
+            char *src = cmdline;
+            char *dst = escaped_cmdline;
+            while ((src - cmdline) < len)
+            {
+                dst = append_escaped(dst, src);
+                src += strlen(src) + 1;
+            }
+        }
+    }
+
+    return xstrdup(escaped_cmdline + 1); /* +1 skips extraneous leading space */
+}
+
+int daemon_is_ok()
+{
+    int fd = open(VAR_RUN_PID_FILE, O_RDONLY);
+    if (fd < 0)
+    {
+        return 0;
+    }
+
+    char pid[sizeof(pid_t)*3 + 2];
+    int len = read(fd, pid, sizeof(pid)-1);
+    close(fd);
+    if (len <= 0)
+        return 0;
+
+    pid[len] = '\0';
+    *strchrnul(pid, '\n') = '\0';
+    /* paranoia: we don't want to check /proc//stat or /proc///stat */
+    if (pid[0] == '\0' || pid[0] == '/')
+        return 0;
+
+    /* TODO: maybe readlink and check that it is "xxx/abrt"? */
+    char path[sizeof("/proc/%s/stat") + sizeof(pid)];
+    sprintf(path, "/proc/%s/stat", pid);
+    struct stat sb;
+    if (stat(path, &sb) == -1)
+    {
+        return 0;
+    }
+
+    return 1;
+}
diff --git a/src/Hooks/CCpp.cpp b/src/Hooks/CCpp.cpp
index a2db2ec3..3a133588 100644
--- a/src/Hooks/CCpp.cpp
+++ b/src/Hooks/CCpp.cpp
@@ -24,11 +24,8 @@
 #include <syslog.h>
 
 #define FILENAME_EXECUTABLE     "executable"
-#define FILENAME_CMDLINE        "cmdline"
 #define FILENAME_COREDUMP       "coredump"
 
-#define VAR_RUN_PID_FILE        VAR_RUN"/abrt.pid"
-
 using namespace std;
 
 static char* malloc_readlink(const char *linkname)
@@ -61,125 +58,6 @@ static char* get_cwd(pid_t pid)
     return malloc_readlink(buf);
 }
 
-static char *append_escaped(char *start, const char *s)
-{
-    char hex_char_buf[] = "\\x00";
-
-    *start++ = ' ';
-    char *dst = start;
-    const unsigned char *p = (unsigned char *)s;
-
-    while (1)
-    {
-        const unsigned char *old_p = p;
-        while (*p > ' ' && *p <= 0x7e && *p != '\"' && *p != '\'' && *p != '\\')
-            p++;
-        if (dst == start)
-        {
-            if (p != (unsigned char *)s && *p == '\0')
-            {
-                /* entire word does not need escaping and quoting */
-                strcpy(dst, s);
-                dst += strlen(s);
-                return dst;
-            }
-            *dst++ = '\'';
-        }
-
-        strncpy(dst, s, (p - old_p));
-        dst += (p - old_p);
-
-        if (*p == '\0')
-        {
-            *dst++ = '\'';
-            *dst = '\0';
-            return dst;
-        }
-        const char *a;
-        switch (*p)
-        {
-        case '\r': a = "\\r"; break;
-        case '\n': a = "\\n"; break;
-        case '\t': a = "\\t"; break;
-        case '\'': a = "\\\'"; break;
-        case '\"': a = "\\\""; break;
-        case '\\': a = "\\\\"; break;
-        case ' ': a = " "; break;
-        default:
-            hex_char_buf[2] = "0123456789abcdef"[*p >> 4];
-            hex_char_buf[3] = "0123456789abcdef"[*p & 0xf];
-            a = hex_char_buf;
-        }
-        strcpy(dst, a);
-        dst += strlen(a);
-        p++;
-    }
-}
-
-// taken from kernel
-#define COMMAND_LINE_SIZE 2048
-static char* get_cmdline(pid_t pid)
-{
-    char path[sizeof("/proc/%u/cmdline") + sizeof(int)*3];
-    char cmdline[COMMAND_LINE_SIZE];
-    char escaped_cmdline[COMMAND_LINE_SIZE*4 + 4];
-
-    escaped_cmdline[1] = '\0';
-    sprintf(path, "/proc/%u/cmdline", (int)pid);
-    int fd = open(path, O_RDONLY);
-    if (fd >= 0)
-    {
-        int len = read(fd, cmdline, sizeof(cmdline) - 1);
-        close(fd);
-
-        if (len > 0)
-        {
-            cmdline[len] = '\0';
-            char *src = cmdline;
-            char *dst = escaped_cmdline;
-            while ((src - cmdline) < len)
-            {
-                dst = append_escaped(dst, src);
-                src += strlen(src) + 1;
-            }
-        }
-    }
-
-    return xstrdup(escaped_cmdline + 1); /* +1 skips extraneous leading space */
-}
-
-static int daemon_is_ok()
-{
-    int fd = open(VAR_RUN_PID_FILE, O_RDONLY);
-    if (fd < 0)
-    {
-        return 0;
-    }
-
-    char pid[sizeof(pid_t)*3 + 2];
-    int len = read(fd, pid, sizeof(pid)-1);
-    close(fd);
-    if (len <= 0)
-        return 0;
-
-    pid[len] = '\0';
-    *strchrnul(pid, '\n') = '\0';
-    /* paranoia: we don't want to check /proc//stat or /proc///stat */
-    if (pid[0] == '\0' || pid[0] == '/')
-        return 0;
-
-    /* TODO: maybe readlink and check that it is "xxx/abrt"? */
-    char path[sizeof("/proc/%s/stat") + sizeof(pid)];
-    sprintf(path, "/proc/%s/stat", pid);
-    struct stat sb;
-    if (stat(path, &sb) == -1)
-    {
-        return 0;
-    }
-
-    return 1;
-}
-
 int main(int argc, char** argv)
 {
     int fd;