summaryrefslogtreecommitdiffstats
path: root/lib/Utils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-11-12 16:17:39 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2009-11-12 16:17:39 +0100
commit3938e6e075867ae3a349ba307ee672aa458d2662 (patch)
tree4db5d4c58632519227e535610822f4c8a262c1e4 /lib/Utils
parentf93fc8bc4c4db4547ca7fcdd6ad67f73e1755873 (diff)
downloadabrt-3938e6e075867ae3a349ba307ee672aa458d2662.tar.gz
abrt-3938e6e075867ae3a349ba307ee672aa458d2662.tar.xz
abrt-3938e6e075867ae3a349ba307ee672aa458d2662.zip
SOSreport.cpp: __gnu_cxx::stdio_filebuf<char> is +8k in code, thanks but no
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'lib/Utils')
-rw-r--r--lib/Utils/Makefile.am3
-rw-r--r--lib/Utils/popen_and_save_output.cpp30
-rw-r--r--lib/Utils/stringops.cpp2
3 files changed, 33 insertions, 2 deletions
diff --git a/lib/Utils/Makefile.am b/lib/Utils/Makefile.am
index 0ca7a2b..f752992 100644
--- a/lib/Utils/Makefile.am
+++ b/lib/Utils/Makefile.am
@@ -5,13 +5,14 @@ lib_LTLIBRARIES = libABRTUtils.la
# xconnect.cpp
libABRTUtils_la_SOURCES = \
- stringops.cpp \
+ stringops.cpp \
xfuncs.cpp \
encbase64.cpp \
read_write.cpp \
logging.cpp \
copyfd.cpp \
skip_whitespace.cpp \
+ popen_and_save_output.cpp \
parse_release.cpp \
CrashTypesSocket.cpp \
DebugDump.h DebugDump.cpp \
diff --git a/lib/Utils/popen_and_save_output.cpp b/lib/Utils/popen_and_save_output.cpp
new file mode 100644
index 0000000..4bcbcac
--- /dev/null
+++ b/lib/Utils/popen_and_save_output.cpp
@@ -0,0 +1,30 @@
+/*
+ * Utility routines.
+ *
+ * Licensed under GPLv2 or later, see file COPYING in this tarball for details.
+ */
+#include "abrtlib.h"
+
+using namespace std;
+
+string popen_and_save_output(const char *cmd)
+{
+ string result;
+
+ FILE *fp = popen(cmd, "r");
+ if (fp == NULL) /* fork or pipe failed; or out-of-mem */
+ {
+ return result;
+ }
+
+ size_t sz;
+ char buf[BUFSIZ + 1];
+ while ((sz = fread(buf, 1, sizeof(buf)-1, fp)) > 0)
+ {
+ buf[sz] = '\0';
+ result += buf;
+ }
+ pclose(fp);
+
+ return result;
+}
diff --git a/lib/Utils/stringops.cpp b/lib/Utils/stringops.cpp
index 73084fc..1b3793f 100644
--- a/lib/Utils/stringops.cpp
+++ b/lib/Utils/stringops.cpp
@@ -1,6 +1,6 @@
#include "abrtlib.h"
-void parse_args(const char *psArgs, vector_string_t& pArgs, const char quote)
+void parse_args(const char *psArgs, vector_string_t& pArgs, int quote)
{
unsigned ii;
bool is_quote = false;