From 3d8d0cad460722317a1b95d99c669b98042056d6 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 13 Oct 2009 14:34:42 +0200 Subject: Manpage registered in autotools. --- src/CLI/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am index 9447791..a428c74 100644 --- a/src/CLI/Makefile.am +++ b/src/CLI/Makefile.am @@ -3,6 +3,7 @@ bin_PROGRAMS = abrt-cli abrt_cli_SOURCES = \ CLI.cpp \ ABRTSocket.h ABRTSocket.cpp + abrt_cli_CPPFLAGS = \ -I$(srcdir)/../../inc \ -I$(srcdir)/../../lib/Utils \ @@ -11,5 +12,10 @@ abrt_cli_CPPFLAGS = \ $(DBUS_CFLAGS) \ -D_GNU_SOURCE # $(GTK_CFLAGS) + abrt_cli_LDADD = \ ../../lib/Utils/libABRTUtils.la + +man_MANS = abrt-cli.1 +EXTRA_DIST = $(man_MANS) + -- cgit From 02181285b7cd564baa3898641798c66fdacddfaf Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 13 Oct 2009 15:36:30 +0200 Subject: Initial bash completition file for abrt-cli --- src/CLI/abrt-cli.bash-completition | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/CLI/abrt-cli.bash-completition (limited to 'src') diff --git a/src/CLI/abrt-cli.bash-completition b/src/CLI/abrt-cli.bash-completition new file mode 100644 index 0000000..089d5a3 --- /dev/null +++ b/src/CLI/abrt-cli.bash-completition @@ -0,0 +1,34 @@ +# bash-completion add-on for abrt-cli(1) +# http://bash-completion.alioth.debian.org/ + +_abrt_cli() +{ + local cur prev opts + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + opts="--help --version --get-list --get-list-full --report --report-always --delete" + + # + # Complete the arguments to some of the basic commands. + # + case "${prev}" in + --report|--report-always|--delete) + local uuids=$(abrt-cli --get-list | grep UUID | awk '{print $3}') + COMPREPLY=( $(compgen -W "${uuids}" -- ${cur}) ) + return 0 + ;; + esac + + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 +} +complete -F _abrt_cli abrt-cli + +# Local variables: +# mode: shell-script +# sh-basic-offset: 4 +# sh-indent-comment: t +# indent-tabs-mode: nil +# End: +# ex: ts=4 sw=4 et filetype=sh \ No newline at end of file -- cgit From 83098ad13a244a5d64595750764b88dc4371bc71 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 13 Oct 2009 15:45:41 +0200 Subject: Better name for the bash completion script --- src/CLI/abrt-cli.bash | 34 ++++++++++++++++++++++++++++++++++ src/CLI/abrt-cli.bash-completition | 34 ---------------------------------- 2 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 src/CLI/abrt-cli.bash delete mode 100644 src/CLI/abrt-cli.bash-completition (limited to 'src') diff --git a/src/CLI/abrt-cli.bash b/src/CLI/abrt-cli.bash new file mode 100644 index 0000000..089d5a3 --- /dev/null +++ b/src/CLI/abrt-cli.bash @@ -0,0 +1,34 @@ +# bash-completion add-on for abrt-cli(1) +# http://bash-completion.alioth.debian.org/ + +_abrt_cli() +{ + local cur prev opts + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + opts="--help --version --get-list --get-list-full --report --report-always --delete" + + # + # Complete the arguments to some of the basic commands. + # + case "${prev}" in + --report|--report-always|--delete) + local uuids=$(abrt-cli --get-list | grep UUID | awk '{print $3}') + COMPREPLY=( $(compgen -W "${uuids}" -- ${cur}) ) + return 0 + ;; + esac + + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 +} +complete -F _abrt_cli abrt-cli + +# Local variables: +# mode: shell-script +# sh-basic-offset: 4 +# sh-indent-comment: t +# indent-tabs-mode: nil +# End: +# ex: ts=4 sw=4 et filetype=sh \ No newline at end of file diff --git a/src/CLI/abrt-cli.bash-completition b/src/CLI/abrt-cli.bash-completition deleted file mode 100644 index 089d5a3..0000000 --- a/src/CLI/abrt-cli.bash-completition +++ /dev/null @@ -1,34 +0,0 @@ -# bash-completion add-on for abrt-cli(1) -# http://bash-completion.alioth.debian.org/ - -_abrt_cli() -{ - local cur prev opts - COMPREPLY=() - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" - opts="--help --version --get-list --get-list-full --report --report-always --delete" - - # - # Complete the arguments to some of the basic commands. - # - case "${prev}" in - --report|--report-always|--delete) - local uuids=$(abrt-cli --get-list | grep UUID | awk '{print $3}') - COMPREPLY=( $(compgen -W "${uuids}" -- ${cur}) ) - return 0 - ;; - esac - - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 -} -complete -F _abrt_cli abrt-cli - -# Local variables: -# mode: shell-script -# sh-basic-offset: 4 -# sh-indent-comment: t -# indent-tabs-mode: nil -# End: -# ex: ts=4 sw=4 et filetype=sh \ No newline at end of file -- cgit From 9675b33dd8e0f4b5fe4fe1ac41b3bd147b49c20f Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 13 Oct 2009 15:51:35 +0200 Subject: Bash completion installed during "make install" --- src/CLI/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am index a428c74..0167149 100644 --- a/src/CLI/Makefile.am +++ b/src/CLI/Makefile.am @@ -19,3 +19,6 @@ abrt_cli_LDADD = \ man_MANS = abrt-cli.1 EXTRA_DIST = $(man_MANS) +completiondir = $(sysconfdir)/bash_completion.d +completion_DATA = abrt-cli.bash + -- cgit From ba6ab638512e5619b9955470b7158b3b1035de90 Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Thu, 15 Oct 2009 14:11:23 +0200 Subject: made polkit policy to be more permissive - debuginfo install only worked under root --- src/Daemon/org.fedoraproject.abrt.policy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Daemon/org.fedoraproject.abrt.policy b/src/Daemon/org.fedoraproject.abrt.policy index 1c2c0bb..9261acd 100644 --- a/src/Daemon/org.fedoraproject.abrt.policy +++ b/src/Daemon/org.fedoraproject.abrt.policy @@ -30,9 +30,9 @@ Copyright (c) 2009 Red Hat inc. Install debuginfos Installing debuginfos requires authentication - no + yes yes - no + yes -- cgit From 87eef1ad558b1d5b61e81ef21c03b754b1524513 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 16 Oct 2009 14:37:50 +0200 Subject: lib/Plugins/CCpp.cpp: fix a bug with detecting missing debuginfos Signed-off-by: Denys Vlasenko --- src/CLI/abrt-cli.1 | 4 ++-- src/Gui/ABRTExceptions.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/CLI/abrt-cli.1 b/src/CLI/abrt-cli.1 index fb0a7c8..5f132df 100644 --- a/src/CLI/abrt-cli.1 +++ b/src/CLI/abrt-cli.1 @@ -2,12 +2,12 @@ .SH NAME abrt\-cli \- a command line interface to abrt .SH SYNOPSIS -.B abrt\-cli +.B abrt\-cli [option] .SH DESCRIPTION .I abrt\-cli is a command line tool that manages application crashes catched by -.I abrtd +.I abrtd daemon. It enables access to crash data, and allows to report crashes depending on active abrt plugins. .SH OPTIONS diff --git a/src/Gui/ABRTExceptions.py b/src/Gui/ABRTExceptions.py index 3049638..0d357a3 100644 --- a/src/Gui/ABRTExceptions.py +++ b/src/Gui/ABRTExceptions.py @@ -14,11 +14,11 @@ class WrongData(Exception): def __str__(self): return self.what - + class ConfBackendInitError(Exception): def __init__(self, msg): Exception.__init__(self) self.what = msg - + def __str__(self): return self.what -- cgit From d61b353da2093a6dba08e11d08f786f407f8588d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 16 Oct 2009 17:48:39 +0200 Subject: adding abrt-debuginfo-install script Signed-off-by: Denys Vlasenko --- src/Daemon/Makefile.am | 5 +- src/Daemon/abrt-debuginfo-install | 135 ++++++++++++++++++++++++++++++++++++++ src/Gui/abrt-gui | 2 +- 3 files changed, 140 insertions(+), 2 deletions(-) create mode 100755 src/Daemon/abrt-debuginfo-install mode change 100644 => 100755 src/Gui/abrt-gui (limited to 'src') diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am index 29c7f1b..0067e5d 100644 --- a/src/Daemon/Makefile.am +++ b/src/Daemon/Makefile.am @@ -1,3 +1,5 @@ +bin_SCRIPTS = abrt-debuginfo-install + sbin_PROGRAMS = abrtd abrtd_SOURCES = \ @@ -43,7 +45,8 @@ comredhatabrtservicedir = ${datadir}/dbus-1/system-services dist_comredhatabrtservice_DATA = com.redhat.abrt.service man_MANS = abrtd.8 abrt.conf.5 -EXTRA_DIST = $(man_MANS) + +EXTRA_DIST = $(man_MANS) abrt-debuginfo-install DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install new file mode 100755 index 0000000..d8d306a --- /dev/null +++ b/src/Daemon/abrt-debuginfo-install @@ -0,0 +1,135 @@ +#!/bin/sh + +core=$1 +tempdir=$2 +cachedir=$3 +debug=false + +# Exitcodes: +# 0 - all debuginfos are installed +# 1 - not all debuginfos are installed +# 2+ - serious problem + +test -f "$core" || exit 2 +# cahcedir is optional +test x"$cachedir" = x"" || test -d "$cachedir" || exit 2 +# tempdir must not exist +test -d "$tempdir" && exit 2 +mkdir "$tempdir" || exit 2 +cd "$tempdir" || exit 2 + +$debug && echo "Installing rpms to $tempdir" + +# eu-unstrip output example: +# 0x400000+0x209000 23c77451cf6adff77fc1f5ee2a01d75de6511dda@0x40024c - - [exe] +# or +# 0x400000+0x20d000 233aa1a57e9ffda65f53efdaf5e5058657a39993@0x40024c /usr/libexec/im-settings-daemon /usr/lib/debug/usr/libexec/im-settings-daemon.debug [exe] +# 0x7fff5cdff000+0x1000 0d3eb4326fd7489fcf9b598269f1edc420e2c560@0x7fff5cdff2f8 . - linux-vdso.so.1 +# 0x3d15600000+0x208000 20196628d1bc062279622615cc9955554e5bb227@0x3d156001a0 /usr/lib64/libnotify.so.1.1.3 /usr/lib/debug/usr/lib64/libnotify.so.1.1.3.debug libnotify.so.1 +# 0x7fd8ae931000+0x62d000 dd49f44f958b5a11a1635523b2f09cb2e45c1734@0x7fd8ae9311a0 /usr/lib64/libgtk-x11-2.0.so.0.1600.6 /usr/lib/debug/usr/lib64/libgtk-x11-2.0.so.0.1600.6.debug +eu_unstrip_OUT=`eu-unstrip "--core=$core" -n 2>&1` +err=$? +printf "%s\nexitcode:%s\n" "$eu_unstrip_OUT" $err >eu_unstrip.OUT +test $err = 0 || exit 2 + +# Get space-separated list of all build-ids +# There can be duplicates (observed in real world) +build_ids=`printf "%s\n" "$eu_unstrip_OUT" \ +| while read junk1 build_id binary_file di_file lib_name junk2; do + build_id=${build_id%%@*} + + # This filters out linux-vdso.so, among others + test x"$lib_name" != x"[exe]" && test x"${binary_file:0:1}" != x"/" && continue + # Sanitize build_id: must be longer than 2 chars + test ${#build_id} -le 2 && continue + # Sanitize build_id: must have only hex digits + test x"${build_id//[0-9a-f]/}" != x"" && continue + + echo "$build_id" +done | sort | uniq | xargs` +$debug && echo "build_ids:$build_ids" + +# Which debuginfo files are missing? +missing_debuginfo_files=`for build_id in $build_ids; do + build_id1=${build_id:0:2} + build_id2=${build_id:2} + file="usr/lib/debug/.build-id/$build_id1/$build_id2.debug" + test -f "/$file" && continue + test x"$cachedir" != x"" && test -f "$cachedir/$file" && continue + echo -n "/$file " +done` +$debug && echo "missing_debuginfo_files:$missing_debuginfo_files" + +test x"$missing_debuginfo_files" = x"" && exit 0 + +# We'll run something like: +# yum --enablerepo='*debuginfo*' --quiet provides \ +# /usr/lib/debug/.build-id/bb/11528d59940983f495e9cb099cafb0cb206051.debug \ +# /usr/lib/debug/.build-id/c5/b84c0ad3676509dc30bfa7d42191574dac5b06.debug ... +yum_provides_OUT=`yum --enablerepo='*debuginfo*' --quiet provides $missing_debuginfo_files 2>&1` +err=$? +printf "%s\nexitcode:%s\n" "$yum_provides_OUT" $err >yum_provides.OUT +test $err = 0 || exit 2 + +# The output is pretty machine-unfriendly: +# glibc-debuginfo-2.10.90-24.x86_64 : Debug information for package glibc +# Repo : rawhide-debuginfo +# Matched from: +# Filename : /usr/lib/debug/.build-id/5b/c784c8d63f87dbdeb747a773940956a18ecd2f.debug +# +# 1:dbus-debuginfo-1.2.12-2.fc11.x86_64 : Debug information for package dbus +# Repo : updates-debuginfo +# Matched from: +# Filename : /usr/lib/debug/.build-id/bc/da7d09eb6c9ee380dae0ed3d591d4311decc31.debug +# Need to massage it a lot. +# There can be duplicates (one package may provide many debuginfos). +packages=`printf "%s\n" "$yum_provides_OUT" \ +| grep -- -debuginfo- \ +| sed 's/^[0-9]*://' \ +| sed -e 's/ .*//' -e 's/:.*//' \ +| sort | uniq | xargs` +$debug && echo "packages:$packages" + +# yum may return "" here if it found no packages (say, if coredump is from a new, +# unreleased package fresh from koji). +test x"$packages" = x"" && exit 1 + +# Redirecting, since progress bar stuff only messes up our output +yumdownloader --enablerepo='*debuginfo*' --quiet $packages >yumdownloader.OUT 2>&1 +err=$? +echo "exitcode:$err" >>yumdownloader.OUT +test $err = 0 || exit 2 + +for f in *.rpm; do + # Happens if no .rpm's were downloaded (yumdownloader problem) + # In this case, $f is the literal "*.rpm" string + test -f "$f" || exit 2 + $debug && echo "Processing: $f" + echo "Processing: $f" >>unpack.OUT + rpm2cpio <"$f" 2>>unpack.OUT | cpio -id >>unpack.OUT 2>&1 +done + +# Which debuginfo files are still missing, including those we just unpacked? +missing_debuginfo_files2=`for build_id in $build_ids; do + build_id1=${build_id:0:2} + build_id2=${build_id:2} + file="usr/lib/debug/.build-id/$build_id1/$build_id2.debug" + test -f "/$file" && continue + test x"$cachedir" != x"" && test -f "$cachedir/$file" && continue + if test -f "$file"; then + # file is one of those we just installed. + # Cache it if cachedir is specified. + if test x"$cachedir" != x"" && test -d "$cachedir"; then + mkdir -p "$cachedir/usr/lib/debug/.build-id/$build_id1" + # Note: this does not preserve symlinks. This is intentional + cp "$file" "$cachedir/$file" + fi + continue + fi + echo -n "/$file " +done` +$debug && echo "missing_debuginfo_files2:$missing_debuginfo_files2" + +test x"$missing_debuginfo_files2" = x"" && exit 0 + +exit 1 diff --git a/src/Gui/abrt-gui b/src/Gui/abrt-gui old mode 100644 new mode 100755 index dd0897c..85bdebb --- a/src/Gui/abrt-gui +++ b/src/Gui/abrt-gui @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh export PYTHONPATH=/usr/share/abrt export XLOGNAME=$LOGNAME exec /usr/bin/python /usr/share/abrt/CCMainWindow.py "$@" -- cgit From a0ad2aada47afdc78d6b807e7c51c854d50accda Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 19 Oct 2009 01:40:28 +0200 Subject: wire up abrt-debuginfo-install to lib/Plugins/CCpp.cpp Tested. Seems to work better than what we had before. Signed-off-by: Denys Vlasenko --- src/Daemon/abrt-debuginfo-install | 62 ++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install index d8d306a..fe55250 100755 --- a/src/Daemon/abrt-debuginfo-install +++ b/src/Daemon/abrt-debuginfo-install @@ -5,19 +5,28 @@ tempdir=$2 cachedir=$3 debug=false +count_words() { + echo $# +} + +exec 2>&1 + +# Output goes to GUI as debigunfo install log. +# "MISSING:xxxx" messages result in xxxx being prepended to backtrace + # Exitcodes: # 0 - all debuginfos are installed # 1 - not all debuginfos are installed # 2+ - serious problem test -f "$core" || exit 2 -# cahcedir is optional +# cachedir is optional test x"$cachedir" = x"" || test -d "$cachedir" || exit 2 # tempdir must not exist -test -d "$tempdir" && exit 2 +test -e "$tempdir" && exit 2 + mkdir "$tempdir" || exit 2 cd "$tempdir" || exit 2 - $debug && echo "Installing rpms to $tempdir" # eu-unstrip output example: @@ -27,6 +36,7 @@ $debug && echo "Installing rpms to $tempdir" # 0x7fff5cdff000+0x1000 0d3eb4326fd7489fcf9b598269f1edc420e2c560@0x7fff5cdff2f8 . - linux-vdso.so.1 # 0x3d15600000+0x208000 20196628d1bc062279622615cc9955554e5bb227@0x3d156001a0 /usr/lib64/libnotify.so.1.1.3 /usr/lib/debug/usr/lib64/libnotify.so.1.1.3.debug libnotify.so.1 # 0x7fd8ae931000+0x62d000 dd49f44f958b5a11a1635523b2f09cb2e45c1734@0x7fd8ae9311a0 /usr/lib64/libgtk-x11-2.0.so.0.1600.6 /usr/lib/debug/usr/lib64/libgtk-x11-2.0.so.0.1600.6.debug +echo "Getting list of build IDs" eu_unstrip_OUT=`eu-unstrip "--core=$core" -n 2>&1` err=$? printf "%s\nexitcode:%s\n" "$eu_unstrip_OUT" $err >eu_unstrip.OUT @@ -53,9 +63,19 @@ $debug && echo "build_ids:$build_ids" missing_debuginfo_files=`for build_id in $build_ids; do build_id1=${build_id:0:2} build_id2=${build_id:2} + file="usr/lib/debug/.build-id/$build_id1/$build_id2.debug" + if test x"$cachedir" != x"" && test x"$cachedir" != x"/" ; then + test -f "$cachedir/$file" && continue + if test -f "/$file"; then + mkdir -p "$cachedir/usr/lib/debug/.build-id/$build_id1" + # Note: this does not preserve symlinks. This is intentional + $debug && echo Copying "$file" to "$cachedir/$file" >&2 + cp "$file" "$cachedir/$file" + continue + fi + fi test -f "/$file" && continue - test x"$cachedir" != x"" && test -f "$cachedir/$file" && continue echo -n "/$file " done` $debug && echo "missing_debuginfo_files:$missing_debuginfo_files" @@ -66,6 +86,7 @@ test x"$missing_debuginfo_files" = x"" && exit 0 # yum --enablerepo='*debuginfo*' --quiet provides \ # /usr/lib/debug/.build-id/bb/11528d59940983f495e9cb099cafb0cb206051.debug \ # /usr/lib/debug/.build-id/c5/b84c0ad3676509dc30bfa7d42191574dac5b06.debug ... +echo "Determining list of packages for `count_words $missing_debuginfo_files` missing debuginfos" yum_provides_OUT=`yum --enablerepo='*debuginfo*' --quiet provides $missing_debuginfo_files 2>&1` err=$? printf "%s\nexitcode:%s\n" "$yum_provides_OUT" $err >yum_provides.OUT @@ -95,6 +116,7 @@ $debug && echo "packages:$packages" test x"$packages" = x"" && exit 1 # Redirecting, since progress bar stuff only messes up our output +echo "Downloading `count_words $packages` packages" yumdownloader --enablerepo='*debuginfo*' --quiet $packages >yumdownloader.OUT 2>&1 err=$? echo "exitcode:$err" >>yumdownloader.OUT @@ -104,32 +126,50 @@ for f in *.rpm; do # Happens if no .rpm's were downloaded (yumdownloader problem) # In this case, $f is the literal "*.rpm" string test -f "$f" || exit 2 - $debug && echo "Processing: $f" + echo "Unpacking: $f" echo "Processing: $f" >>unpack.OUT rpm2cpio <"$f" 2>>unpack.OUT | cpio -id >>unpack.OUT 2>&1 done # Which debuginfo files are still missing, including those we just unpacked? -missing_debuginfo_files2=`for build_id in $build_ids; do +missing_build_ids=`for build_id in $build_ids; do build_id1=${build_id:0:2} build_id2=${build_id:2} + file="usr/lib/debug/.build-id/$build_id1/$build_id2.debug" + test -f "/$file" && continue - test x"$cachedir" != x"" && test -f "$cachedir/$file" && continue + test x"$cachedir" != x"" \ + && test x"$cachedir" != x"/" \ + && test -f "$cachedir/$file" && continue + if test -f "$file"; then # file is one of those we just installed. # Cache it if cachedir is specified. if test x"$cachedir" != x"" && test -d "$cachedir"; then mkdir -p "$cachedir/usr/lib/debug/.build-id/$build_id1" # Note: this does not preserve symlinks. This is intentional - cp "$file" "$cachedir/$file" + $debug && echo Copying "$file" to "$cachedir/$file" >&2 + cp --remove-destination "$file" "$cachedir/$file" fi continue fi - echo -n "/$file " + echo -n "$build_id " done` -$debug && echo "missing_debuginfo_files2:$missing_debuginfo_files2" +$debug && echo "missing_build_ids:$missing_build_ids" + +# If cachedir is specified, tempdir is just a staging area. Delete it +if test x"$cachedir" != x""; then + $debug && echo "Removing $tempdir" + rm -rf "$tempdir" +fi + +test x"$missing_build_ids" = x"" && exit 0 + +for missing in $missing_build_ids; do + echo "MISSING:$missing" +done -test x"$missing_debuginfo_files2" = x"" && exit 0 +echo "`count_words $missing_build_ids` debuginfos can't be found" exit 1 -- cgit From c9f43d22c5bf1d1bb392ee426c72d383b2241bbe Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Mon, 19 Oct 2009 12:02:25 +0200 Subject: ABRTSocket renamed DisConnect to Disconnect, CLI added localization support and commandline editor work in progress --- src/CLI/ABRTSocket.cpp | 9 +- src/CLI/ABRTSocket.h | 2 +- src/CLI/CLI.cpp | 219 ++++++++++++++++++++++++++++++++++++------------- src/CLI/Makefile.am | 1 + 4 files changed, 169 insertions(+), 62 deletions(-) (limited to 'src') diff --git a/src/CLI/ABRTSocket.cpp b/src/CLI/ABRTSocket.cpp index 1f90f63..d31c7a4 100644 --- a/src/CLI/ABRTSocket.cpp +++ b/src/CLI/ABRTSocket.cpp @@ -8,13 +8,12 @@ #include #include -CABRTSocket::CABRTSocket() : - m_nSocket(-1) +CABRTSocket::CABRTSocket() : m_nSocket(-1) {} CABRTSocket::~CABRTSocket() { - DisConnect(); + Disconnect(); } void CABRTSocket::Send(const std::string& pMessage) @@ -91,12 +90,10 @@ void CABRTSocket::Connect(const std::string& pPath) } } -void CABRTSocket::DisConnect() +void CABRTSocket::Disconnect() { if (m_nSocket != -1) - { close(m_nSocket); - } } vector_crash_infos_t CABRTSocket::GetCrashInfos() diff --git a/src/CLI/ABRTSocket.h b/src/CLI/ABRTSocket.h index d476411..5d5383f 100644 --- a/src/CLI/ABRTSocket.h +++ b/src/CLI/ABRTSocket.h @@ -18,7 +18,7 @@ class CABRTSocket ~CABRTSocket(); void Connect(const std::string& pPath); - void DisConnect(); + void Disconnect(); vector_crash_infos_t GetCrashInfos(); map_crash_report_t CreateReport(const std::string& pUUID); diff --git a/src/CLI/CLI.cpp b/src/CLI/CLI.cpp index 33272df..d4e2bb4 100644 --- a/src/CLI/CLI.cpp +++ b/src/CLI/CLI.cpp @@ -24,6 +24,15 @@ #if HAVE_CONFIG_H #include #endif +#if HAVE_LOCALE_H + #include +#endif +#if ENABLE_NLS + #include + #define _(S) gettext(S) +#else + #define _(S) (S) +#endif /* Program options */ enum @@ -47,25 +56,54 @@ static void print_crash_infos(vector_crash_infos_t& pCrashInfos, int pMode) map_crash_info_t& info = pCrashInfos[ii]; if (pMode == OPT_GET_LIST_FULL || info.find(CD_REPORTED)->second[CD_CONTENT] != "1") { - printf("%u.\n" - "\tUID : %s\n" - "\tUUID : %s\n" - "\tPackage : %s\n" - "\tExecutable: %s\n" - "\tCrash time: %s\n" - "\tCrash Rate: %s\n", - ii, - info[CD_UID][CD_CONTENT].c_str(), - info[CD_UUID][CD_CONTENT].c_str(), - info[CD_PACKAGE][CD_CONTENT].c_str(), - info[CD_EXECUTABLE][CD_CONTENT].c_str(), - info[CD_TIME][CD_CONTENT].c_str(), - info[CD_COUNT][CD_CONTENT].c_str() - ); + const char *timestr = info[CD_TIME][CD_CONTENT].c_str(); + long time = strtol(timestr, 0, 10); + if (time == 0) + error_msg_and_die("Error while converting time string."); + + char timeloc[256]; + int success = strftime(timeloc, 128, "%c", localtime(&time)); + if (!success) + error_msg_and_die("Error while converting time to string."); + + printf(_("%u.\n" + "\tUID : %s\n" + "\tUUID : %s\n" + "\tPackage : %s\n" + "\tExecutable : %s\n" + "\tCrash Time : %s\n" + "\tCrash Count: %s\n"), + ii, + info[CD_UID][CD_CONTENT].c_str(), + info[CD_UUID][CD_CONTENT].c_str(), + info[CD_PACKAGE][CD_CONTENT].c_str(), + info[CD_EXECUTABLE][CD_CONTENT].c_str(), + timeloc, + info[CD_COUNT][CD_CONTENT].c_str() + ); } } } +/* Saves the crash report to a file. + * Fp must be opened before write_crash_report is called. + * Returned Value: + * If the report is successfully stored to the file, a zero value is returned. + * On failure, nonzero value is returned. + */ +static int write_crash_report(const map_crash_report_t& report, FILE *fp) +{ + for (map_crash_report_t::const_iterator it = report.begin(); it != report.end(); it++) + { + if (it->second[CD_TYPE] == CD_SYS) + continue; + + fprintf(fp, "\n%s\n-----\n%s\n", it->first.c_str(), it->second[CD_CONTENT].c_str()); + } + + return 0; +} + static void print_crash_report(const map_crash_report_t& pCrashReport) { map_crash_report_t::const_iterator it = pCrashReport.begin(); @@ -92,6 +130,7 @@ static DBusMessage* new_call_msg(const char* method) die_out_of_memory(); return msg; } + static DBusMessage* send_get_reply_and_unref(DBusMessage* msg) { DBusError err; @@ -99,7 +138,7 @@ static DBusMessage* send_get_reply_and_unref(DBusMessage* msg) DBusMessage *reply = dbus_connection_send_with_reply_and_block(s_dbus_conn, msg, /*timeout*/ -1, &err); if (reply == NULL) { -//TODO: analyse err + //TODO: analyse err error_msg_and_die("Error sending DBus message"); } dbus_message_unref(msg); @@ -109,7 +148,6 @@ static DBusMessage* send_get_reply_and_unref(DBusMessage* msg) static vector_crash_infos_t call_GetCrashInfos() { DBusMessage* msg = new_call_msg("GetCrashInfos"); - DBusMessage *reply = send_get_reply_and_unref(msg); vector_crash_infos_t argout; @@ -189,6 +227,76 @@ static void handle_dbus_err(bool error_flag, DBusError *err) CC_DBUS_NAME); } +int launch_editor(const char *path, const char *report, char **output) +{ + const char *editor, *terminal; + + editor = getenv("VISUAL"); + if (!editor) + editor = getenv("EDITOR"); + + terminal = getenv("TERM"); + if (!editor && (!terminal || !strcmp(terminal, "dumb"))) + { + error_msg(_("Terminal is dumb but no VISUAL nor EDITOR defined.")); + return 1; + } + + if (!editor) + editor = "vi"; + + return 0; +} + +/* Reports the crash with corresponding uuid over DBus. */ +int report(const char *uuid, bool always) +{ + map_crash_report_t cr = call_CreateReport(uuid); + + if (always) + { + call_Report(cr); + return 0; + } + + print_crash_report(cr); + + /* Open a temporary file and write the crash report to it. */ + char filename[] = "/tmp/abrt-report.XXXXXX"; + int fd = mkstemp(filename); + if (fd == -1) + { + error_msg("could not generate temporary file name"); + return 1; + } + + FILE *fp = fdopen(fd, "w"); + if (!fp) + { + error_msg("could not open '%s' to save the crash report", filename); + return 1; + } + + write_crash_report(cr, fp); + + if (fclose(fp)) + { + error_msg("could not close '%s'", filename); + return 2; + } + + printf(_("\nDo you want to send the report? [y/n]: ")); + fflush(NULL); + char answer[16] = "n"; + fgets(answer, sizeof(answer), stdin); + if (answer[0] == 'Y' || answer[0] == 'y') + { + call_Report(cr); + } + + return 0; +} + static const struct option longopts[] = { /* name, has_arg, flag, val */ @@ -202,7 +310,7 @@ static const struct option longopts[] = { 0, 0, 0, 0 } /* prevents crashes for unknown options*/ }; -/* Gets program name from command line argument. */ +/* Gets the program name from the first command line argument. */ static char *progname(char *argv0) { char* name = strrchr(argv0, '/'); @@ -212,12 +320,38 @@ static char *progname(char *argv0) return argv0; } +/* Prints abrt-cli version and some help text. */ +static void usage(char *argv0) +{ + char *name = progname(argv0); + printf("%s " VERSION "\n\n", name); + + /* Message has embedded tabs. */ + printf(_("Usage: %s [OPTION]\n\n" + "Startup:\n" + " -V, --version display the version of %s and exit\n" + " -?, --help print this help\n\n" + "Actions:\n" + " --get-list print list of crashes which are not reported yet\n" + " --get-list-full print list of all crashes\n" + " --report UUID create and send a report\n" + " --report-always UUID create and send a report without asking\n" + " --delete UUID remove crash\n"), + name, name); +} + int main(int argc, char** argv) { char* uuid = NULL; int op = -1; char *name; + setlocale(LC_ALL,""); +#if ENABLE_NLS + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); +#endif + while (1) { int option_index; @@ -233,7 +367,7 @@ int main(int argc, char** argv) case OPT_GET_LIST_FULL: if (op == -1) break; - error_msg("You must specify exactly one operation."); + error_msg(_("You must specify exactly one operation.")); return 1; case -1: /* end of options */ if (op != -1) /* if some operation was specified... */ @@ -242,25 +376,12 @@ int main(int argc, char** argv) default: case '?': case OPT_HELP: - name = progname(argv[0]); - printf("%s " VERSION "\n\n", name); - /* note: message has embedded tabs */ - printf("Usage: %s [OPTION]\n\n" - "Startup:\n" - " -V, --version display the version of %s and exit\n" - " -?, --help print this help\n\n" - "Actions:\n" - " --get-list print list of crashes which are not reported yet\n" - " --get-list-full print list of all crashes\n" - " --report UUID create and send a report\n" - " --report-always UUID create and send a report without asking\n" - " --delete UUID remove crash\n", - name, name); - return 1; + usage(argv[0]); + return 1; case 'V': case OPT_VERSION: - printf("%s " VERSION "\n", progname(argv[0])); - return 0; + printf("%s " VERSION "\n", progname(argv[0])); + return 0; } if (c == -1) break; @@ -276,6 +397,7 @@ int main(int argc, char** argv) CABRTSocket ABRTDaemon; ABRTDaemon.Connect(VAR_RUN"/abrt.socket"); #endif + switch (op) { case OPT_GET_LIST: @@ -286,33 +408,20 @@ int main(int argc, char** argv) break; } case OPT_REPORT: - { - map_crash_report_t cr = call_CreateReport(uuid); - print_crash_report(cr); - printf("\nDo you want to send the report? [y/n]: "); - fflush(NULL); - char answer[16] = "n"; - fgets(answer, sizeof(answer), stdin); - if (answer[0] == 'Y' || answer[0] == 'y') - { - call_Report(cr); - } - break; - } + report(uuid, false); + break; case OPT_REPORT_ALWAYS: - { - map_crash_report_t cr = call_CreateReport(uuid); - call_Report(cr); - break; - } + report(uuid, true); + break; case OPT_DELETE: { call_DeleteDebugDump(uuid); break; } } + #if ENABLE_SOCKET - ABRTDaemon.DisConnect(); + ABRTDaemon.Disconnect(); #endif return 0; diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am index 0167149..6810953 100644 --- a/src/CLI/Makefile.am +++ b/src/CLI/Makefile.am @@ -22,3 +22,4 @@ EXTRA_DIST = $(man_MANS) completiondir = $(sysconfdir)/bash_completion.d completion_DATA = abrt-cli.bash +DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -- cgit From 3fbf763781ebe31b8f970aa197db0d06dc421d9b Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 19 Oct 2009 15:06:39 +0200 Subject: abrt-debuginfo-install: add mini-doc Signed-off-by: Denys Vlasenko --- src/Daemon/abrt-debuginfo-install | 58 +++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install index fe55250..e9b398a 100755 --- a/src/Daemon/abrt-debuginfo-install +++ b/src/Daemon/abrt-debuginfo-install @@ -1,4 +1,54 @@ #!/bin/sh +# Called by abrtd before producing a backtrace. +# The task of this script is to install debuginfos. +# +# Just using [pk-]debuginfo-install does not work well. +# - they can't install more than one version of debuginfo +# for a package +# - their output is unsuitable for scripting +# - debuginfo-install aborts if yum lock is busy +# - pk-debuginfo-install was observed to hang +# +# Usage: abrt-debuginfo-install CORE TEMPDIR [CACHEDIR] +# If CACHEDIR is specified, debuginfos should be installed there. +# If not, debuginfos should be installed into TEMPDIR. +# +# Currently, we are called with CACHEDIR set to "/", but in the future +# it may be omitted or set to something else. script must be ready +# for those cases too. +# +# Algorithm: +# - Create TEMPDIR +# - Extract build-ids from coredump +# - For every build-id, check /usr/lib/debug/.build-id/XX/XXXX.debug +# and CACHEDIR/usr/lib/debug/.build-id/XX/XXXX.debug +# - If they all exist, exit 0 +# - Using "yum provides /usr/lib/debug/.build-id/XX/XXXX.debug", +# figure out which debuginfo packages are needed +# - Download them using "yumdownloader PACKAGE..." +# - Unpack them with rpm2cpio | cpio to TEMPDIR +# - If CACHEDIR is specified, copy usr/lib/debug/.build-id/XX/XXXX.debug +# to CACHEDIR/usr/lib/debug/.build-id/XX/XXXX.debug and delete TEMPDIR +# - Report which XX/XXXX.debug are still missing. +# +# In the future, we may want to use a separate CACHEDIR (say, /var/cache/abrt-di) +# and use it with this gdb command: +# set debug-file-directory /usr/lib/debug/.build-id:CACHEDIR/usr/lib/debug/.build-id +# but current gdb can't handle DIR1:DIR2. +# So, currently we are called with CACHEDIR set to "/", and don't pass +# "set debug-file-directory" to gdb. +# This is ugly, since it messes up /usr/lib/debug/.build-id over time +# by piling up debuginfos there without any means to control their amount, +# but it's the only way to make it work with current gdb. +# +# Output goes to GUI as debigunfo install log. +# "MISSING:xxxx" messages result in xxxx being prepended to backtrace +# +# Exitcodes: +# 0 - all debuginfos are installed +# 1 - not all debuginfos are installed +# 2+ - serious problem + core=$1 tempdir=$2 @@ -11,14 +61,6 @@ count_words() { exec 2>&1 -# Output goes to GUI as debigunfo install log. -# "MISSING:xxxx" messages result in xxxx being prepended to backtrace - -# Exitcodes: -# 0 - all debuginfos are installed -# 1 - not all debuginfos are installed -# 2+ - serious problem - test -f "$core" || exit 2 # cachedir is optional test x"$cachedir" = x"" || test -d "$cachedir" || exit 2 -- cgit From 4df20906ef57432edb505ce28179fd979729c975 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 19 Oct 2009 18:12:39 +0200 Subject: abrt-debuginfo-install: expand doc Signed-off-by: Denys Vlasenko --- src/Daemon/abrt-debuginfo-install | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install index e9b398a..fc5380b 100755 --- a/src/Daemon/abrt-debuginfo-install +++ b/src/Daemon/abrt-debuginfo-install @@ -17,6 +17,17 @@ # it may be omitted or set to something else. script must be ready # for those cases too. # +# Output goes to GUI as debuginfo install log. The script should be careful +# to give useful, but not overly cluttered info to stdout. +# Additionally, abrt daemon handles "MISSING:xxxx" messages specially: +# xxxx will be prepended to backtrace. This is used to inform about +# missing debuginfos. +# +# Exitcodes: +# 0 - all debuginfos are installed +# 1 - not all debuginfos are installed +# 2+ - serious problem +# # Algorithm: # - Create TEMPDIR # - Extract build-ids from coredump @@ -31,6 +42,10 @@ # to CACHEDIR/usr/lib/debug/.build-id/XX/XXXX.debug and delete TEMPDIR # - Report which XX/XXXX.debug are still missing. # +# For better debuggability, eu_unstrip.OUT, yum_provides.OUT etc files +# are saved in TEMPDIR, and TEMPDIR is not deleted if we exit with exitcode 2 +# ("serious problem"). +# # In the future, we may want to use a separate CACHEDIR (say, /var/cache/abrt-di) # and use it with this gdb command: # set debug-file-directory /usr/lib/debug/.build-id:CACHEDIR/usr/lib/debug/.build-id @@ -40,14 +55,6 @@ # This is ugly, since it messes up /usr/lib/debug/.build-id over time # by piling up debuginfos there without any means to control their amount, # but it's the only way to make it work with current gdb. -# -# Output goes to GUI as debigunfo install log. -# "MISSING:xxxx" messages result in xxxx being prepended to backtrace -# -# Exitcodes: -# 0 - all debuginfos are installed -# 1 - not all debuginfos are installed -# 2+ - serious problem core=$1 -- cgit From 9e8a1ba0c9ddfa0108050f6fedc88de63b4b7c3f Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 20 Oct 2009 15:54:05 +0200 Subject: Initial implementation of crash report editor. Splitted CLI.cpp into multiple files for clarity. --- src/CLI/CLI.cpp | 226 +------------------------------ src/CLI/Makefile.am | 9 +- src/CLI/dbus.cpp | 130 ++++++++++++++++++ src/CLI/dbus.h | 34 +++++ src/CLI/report.cpp | 344 ++++++++++++++++++++++++++++++++++++++++++++++++ src/CLI/report.h | 24 ++++ src/CLI/run-command.cpp | 87 ++++++++++++ src/CLI/run-command.h | 23 ++++ 8 files changed, 657 insertions(+), 220 deletions(-) create mode 100644 src/CLI/dbus.cpp create mode 100644 src/CLI/dbus.h create mode 100644 src/CLI/report.cpp create mode 100644 src/CLI/report.h create mode 100644 src/CLI/run-command.cpp create mode 100644 src/CLI/run-command.h (limited to 'src') diff --git a/src/CLI/CLI.cpp b/src/CLI/CLI.cpp index d4e2bb4..a782a59 100644 --- a/src/CLI/CLI.cpp +++ b/src/CLI/CLI.cpp @@ -21,17 +21,19 @@ #include "abrtlib.h" #include "abrt_dbus.h" #include "DBusCommon.h" +#include "report.h" +#include "dbus.h" #if HAVE_CONFIG_H - #include +#include #endif #if HAVE_LOCALE_H - #include +#include #endif #if ENABLE_NLS - #include - #define _(S) gettext(S) +#include +#define _(S) gettext(S) #else - #define _(S) (S) +#define _(S) (S) #endif /* Program options */ @@ -46,8 +48,6 @@ enum OPT_DELETE }; -static DBusConnection* s_dbus_conn; - static void print_crash_infos(vector_crash_infos_t& pCrashInfos, int pMode) { unsigned int ii; @@ -85,218 +85,6 @@ static void print_crash_infos(vector_crash_infos_t& pCrashInfos, int pMode) } } -/* Saves the crash report to a file. - * Fp must be opened before write_crash_report is called. - * Returned Value: - * If the report is successfully stored to the file, a zero value is returned. - * On failure, nonzero value is returned. - */ -static int write_crash_report(const map_crash_report_t& report, FILE *fp) -{ - for (map_crash_report_t::const_iterator it = report.begin(); it != report.end(); it++) - { - if (it->second[CD_TYPE] == CD_SYS) - continue; - - fprintf(fp, "\n%s\n-----\n%s\n", it->first.c_str(), it->second[CD_CONTENT].c_str()); - } - - return 0; -} - -static void print_crash_report(const map_crash_report_t& pCrashReport) -{ - map_crash_report_t::const_iterator it = pCrashReport.begin(); - for (; it != pCrashReport.end(); it++) - { - if (it->second[CD_TYPE] != CD_SYS) - { - printf("\n%s\n" - "-----\n" - "%s\n", it->first.c_str(), it->second[CD_CONTENT].c_str()); - } - } -} - -/* - * DBus member calls - */ - -/* helpers */ -static DBusMessage* new_call_msg(const char* method) -{ - DBusMessage* msg = dbus_message_new_method_call(CC_DBUS_NAME, CC_DBUS_PATH, CC_DBUS_IFACE, method); - if (!msg) - die_out_of_memory(); - return msg; -} - -static DBusMessage* send_get_reply_and_unref(DBusMessage* msg) -{ - DBusError err; - dbus_error_init(&err); - DBusMessage *reply = dbus_connection_send_with_reply_and_block(s_dbus_conn, msg, /*timeout*/ -1, &err); - if (reply == NULL) - { - //TODO: analyse err - error_msg_and_die("Error sending DBus message"); - } - dbus_message_unref(msg); - return reply; -} - -static vector_crash_infos_t call_GetCrashInfos() -{ - DBusMessage* msg = new_call_msg("GetCrashInfos"); - DBusMessage *reply = send_get_reply_and_unref(msg); - - vector_crash_infos_t argout; - DBusMessageIter in_iter; - dbus_message_iter_init(reply, &in_iter); - int r = load_val(&in_iter, argout); - if (r != ABRT_DBUS_LAST_FIELD) /* more values present, or bad type */ - error_msg_and_die("dbus call %s: return type mismatch", "GetCrashInfos"); - dbus_message_unref(reply); - return argout; -} - -static map_crash_report_t call_CreateReport(const char* uuid) -{ - /* Yes, call name is not "CreateReport" but "GetJobResult". - * We need to clean up the names one day. */ - DBusMessage* msg = new_call_msg("GetJobResult"); - dbus_message_append_args(msg, - DBUS_TYPE_STRING, &uuid, - DBUS_TYPE_INVALID); - - DBusMessage *reply = send_get_reply_and_unref(msg); - - map_crash_report_t argout; - DBusMessageIter in_iter; - dbus_message_iter_init(reply, &in_iter); - int r = load_val(&in_iter, argout); - if (r != ABRT_DBUS_LAST_FIELD) /* more values present, or bad type */ - error_msg_and_die("dbus call %s: return type mismatch", "GetJobResult"); - dbus_message_unref(reply); - return argout; -} - -static void call_Report(const map_crash_report_t& report) -{ - DBusMessage* msg = new_call_msg("Report"); - DBusMessageIter out_iter; - dbus_message_iter_init_append(msg, &out_iter); - store_val(&out_iter, report); - - DBusMessage *reply = send_get_reply_and_unref(msg); - //it returns a single value of report_status_t type, - //but we don't use it (yet?) - - dbus_message_unref(reply); - return; -} - -static void call_DeleteDebugDump(const char* uuid) -{ - DBusMessage* msg = new_call_msg("DeleteDebugDump"); - dbus_message_append_args(msg, - DBUS_TYPE_STRING, &uuid, - DBUS_TYPE_INVALID); - - DBusMessage *reply = send_get_reply_and_unref(msg); - //it returns a single boolean value, - //but we don't use it (yet?) - - dbus_message_unref(reply); - return; -} - -static void handle_dbus_err(bool error_flag, DBusError *err) -{ - if (dbus_error_is_set(err)) - { - error_msg("dbus error: %s", err->message); - /* dbus_error_free(&err); */ - error_flag = true; - } - if (!error_flag) - return; - error_msg_and_die( - "error requesting DBus name %s, possible reasons: " - "abrt run by non-root; dbus config is incorrect", - CC_DBUS_NAME); -} - -int launch_editor(const char *path, const char *report, char **output) -{ - const char *editor, *terminal; - - editor = getenv("VISUAL"); - if (!editor) - editor = getenv("EDITOR"); - - terminal = getenv("TERM"); - if (!editor && (!terminal || !strcmp(terminal, "dumb"))) - { - error_msg(_("Terminal is dumb but no VISUAL nor EDITOR defined.")); - return 1; - } - - if (!editor) - editor = "vi"; - - return 0; -} - -/* Reports the crash with corresponding uuid over DBus. */ -int report(const char *uuid, bool always) -{ - map_crash_report_t cr = call_CreateReport(uuid); - - if (always) - { - call_Report(cr); - return 0; - } - - print_crash_report(cr); - - /* Open a temporary file and write the crash report to it. */ - char filename[] = "/tmp/abrt-report.XXXXXX"; - int fd = mkstemp(filename); - if (fd == -1) - { - error_msg("could not generate temporary file name"); - return 1; - } - - FILE *fp = fdopen(fd, "w"); - if (!fp) - { - error_msg("could not open '%s' to save the crash report", filename); - return 1; - } - - write_crash_report(cr, fp); - - if (fclose(fp)) - { - error_msg("could not close '%s'", filename); - return 2; - } - - printf(_("\nDo you want to send the report? [y/n]: ")); - fflush(NULL); - char answer[16] = "n"; - fgets(answer, sizeof(answer), stdin); - if (answer[0] == 'Y' || answer[0] == 'y') - { - call_Report(cr); - } - - return 0; -} - static const struct option longopts[] = { /* name, has_arg, flag, val */ diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am index 6810953..7b10bfb 100644 --- a/src/CLI/Makefile.am +++ b/src/CLI/Makefile.am @@ -2,7 +2,14 @@ bin_PROGRAMS = abrt-cli abrt_cli_SOURCES = \ CLI.cpp \ - ABRTSocket.h ABRTSocket.cpp + ABRTSocket.h \ + ABRTSocket.cpp \ + run-command.h \ + run-command.cpp \ + report.h \ + report.cpp \ + dbus.h \ + dbus.cpp abrt_cli_CPPFLAGS = \ -I$(srcdir)/../../inc \ diff --git a/src/CLI/dbus.cpp b/src/CLI/dbus.cpp new file mode 100644 index 0000000..3a2999e --- /dev/null +++ b/src/CLI/dbus.cpp @@ -0,0 +1,130 @@ +/* + 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 "dbus.h" +#include "DBusCommon.h" + +DBusConnection* s_dbus_conn; + +/* + * DBus member calls + */ + +/* helpers */ +DBusMessage* new_call_msg(const char* method) +{ + DBusMessage* msg = dbus_message_new_method_call(CC_DBUS_NAME, CC_DBUS_PATH, CC_DBUS_IFACE, method); + if (!msg) + die_out_of_memory(); + return msg; +} + +DBusMessage* send_get_reply_and_unref(DBusMessage* msg) +{ + DBusError err; + dbus_error_init(&err); + DBusMessage *reply; + reply = dbus_connection_send_with_reply_and_block(s_dbus_conn, + msg, /*timeout*/ -1, &err); + if (reply == NULL) + { + //TODO: analyse err + error_msg_and_die("Error sending DBus message"); + } + dbus_message_unref(msg); + return reply; +} + +vector_crash_infos_t call_GetCrashInfos() +{ + DBusMessage* msg = new_call_msg("GetCrashInfos"); + DBusMessage *reply = send_get_reply_and_unref(msg); + + vector_crash_infos_t argout; + DBusMessageIter in_iter; + dbus_message_iter_init(reply, &in_iter); + int r = load_val(&in_iter, argout); + if (r != ABRT_DBUS_LAST_FIELD) /* more values present, or bad type */ + error_msg_and_die("dbus call %s: return type mismatch", "GetCrashInfos"); + dbus_message_unref(reply); + return argout; +} + +map_crash_report_t call_CreateReport(const char* uuid) +{ + /* Yes, call name is not "CreateReport" but "GetJobResult". + * We need to clean up the names one day. */ + DBusMessage* msg = new_call_msg("GetJobResult"); + dbus_message_append_args(msg, + DBUS_TYPE_STRING, &uuid, + DBUS_TYPE_INVALID); + + DBusMessage *reply = send_get_reply_and_unref(msg); + + map_crash_report_t argout; + DBusMessageIter in_iter; + dbus_message_iter_init(reply, &in_iter); + int r = load_val(&in_iter, argout); + if (r != ABRT_DBUS_LAST_FIELD) /* more values present, or bad type */ + error_msg_and_die("dbus call %s: return type mismatch", "GetJobResult"); + dbus_message_unref(reply); + return argout; +} + +void call_Report(const map_crash_report_t& report) +{ + DBusMessage* msg = new_call_msg("Report"); + DBusMessageIter out_iter; + dbus_message_iter_init_append(msg, &out_iter); + store_val(&out_iter, report); + + DBusMessage *reply = send_get_reply_and_unref(msg); + //it returns a single value of report_status_t type, + //but we don't use it (yet?) + + dbus_message_unref(reply); +} + +void call_DeleteDebugDump(const char* uuid) +{ + DBusMessage* msg = new_call_msg("DeleteDebugDump"); + dbus_message_append_args(msg, + DBUS_TYPE_STRING, &uuid, + DBUS_TYPE_INVALID); + + DBusMessage *reply = send_get_reply_and_unref(msg); + //it returns a single boolean value, + //but we don't use it (yet?) + + dbus_message_unref(reply); +} + +void handle_dbus_err(bool error_flag, DBusError *err) +{ + if (dbus_error_is_set(err)) + { + error_msg("dbus error: %s", err->message); + /* dbus_error_free(&err); */ + error_flag = true; + } + if (!error_flag) + return; + error_msg_and_die( + "error requesting DBus name %s, possible reasons: " + "abrt run by non-root; dbus config is incorrect", + CC_DBUS_NAME); +} diff --git a/src/CLI/dbus.h b/src/CLI/dbus.h new file mode 100644 index 0000000..febcb94 --- /dev/null +++ b/src/CLI/dbus.h @@ -0,0 +1,34 @@ +/* + 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. +*/ +#ifndef ABRT_CLI_DBUS_H +#define ABRT_CLI_DBUS_H + +#include "abrt_dbus.h" +#include "CrashTypes.h" + +extern DBusConnection* s_dbus_conn; + +extern DBusMessage* new_call_msg(const char* method); +extern DBusMessage* send_get_reply_and_unref(DBusMessage* msg); +extern vector_crash_infos_t call_GetCrashInfos(); +extern map_crash_report_t call_CreateReport(const char* uuid); +extern void call_Report(const map_crash_report_t& report); +extern void call_DeleteDebugDump(const char* uuid); +extern void handle_dbus_err(bool error_flag, DBusError *err); + +#endif diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp new file mode 100644 index 0000000..6f2ba6a --- /dev/null +++ b/src/CLI/report.cpp @@ -0,0 +1,344 @@ +/* + 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 "report.h" +#include "run-command.h" +#include "dbus.h" +#include "abrtlib.h" +#if HAVE_CONFIG_H +#include +#endif +#if ENABLE_NLS +#include +#define _(S) gettext(S) +#else +#define _(S) (S) +#endif + +#define FIELD_SEP "%----" + +/* Escapes the field content string to avoid confusion with file comments. + Returned field must be free()d by caller. */ +static char *escape(const char *str) +{ + // Determine the size of resultant string. + // Count the required number of escape characters. + // 1. NEWLINE followed by # + // 2. NEWLINE followed by \# (escaped version) + const char *ptr = str; + bool newline = true; + int count = 0; + while (*ptr) + { + if (newline) + { + if (*ptr == '#') + ++count; + if (*ptr == '\\' && *(ptr + 1) == '#') + ++count; + } + + newline = (*ptr == '\n'); + ++ptr; + } + + // Copy the input string to the resultant string, and escape all + // occurences of \# and #. + char *result = (char*)malloc(strlen(str) + 1 + count); + if (!result) + error_msg_and_die("Memory error while escaping a field."); + + const char *src = str; + char *dest = result; + newline = true; + while (*src) + { + if (newline) + { + if (*src == '#') + *dest++ = '\\'; + else if (*src == '\\' && *(src + 1) == '#') + *dest++ = '\\'; + } + + newline = (*src == '\n'); + *dest++ = *src++; + } + *dest = '\0'; + return result; +} + +/* Removes all comment lines, and unescapes the string previously escaped + by escape(). Works in-place. */ +static char *remove_comments_and_unescape(char *str) +{ + char *src = str, *dest = str; + bool newline = true; + while (*src) + { + if (newline) + { + if (*src == '#') + { // Skip the comment line! + while (*src && *src != '\n') + ++src; + + if (*src == '\0') + break; + + ++src; + continue; + } + else if (*src == '\\' && + (*(src + 1) == '#' || + (*(src + 1) == '\\' && *(src + 2) == '#'))) + { + ++src; // Unescape escaped char. + } + } + + newline = (*src == '\n'); + *dest++ = *src++; + } + *dest = '\0'; +} + +/* Writes a field of crash report to a file. + * Field must be writable. + */ +static void write_crash_report_field(FILE *fp, const map_crash_report_t &report, + const char *field, const char *description) +{ + const map_crash_report_t::const_iterator it = report.find(field); + if (it == report.end()) + { + error_msg("Field %s not found.\n", field); + return; + } + + if (it->second[CD_TYPE] == CD_SYS) + { + error_msg("Cannot write field %s because it is a system value\n", field); + return; + } + + fprintf(fp, "%s%s\n", FIELD_SEP, it->first.c_str()); + + bool readonly = (it->second[CD_EDITABLE] != CD_ISEDITABLE); + fprintf(fp, readonly ? _("# %s (read only)\n") : "# %s\n", description); + + char *escaped_content = escape(it->second[CD_CONTENT].c_str()); + fprintf(fp, "%s\n", escaped_content); + free(escaped_content); +} + +/* Saves the crash report to a file. + * Fp must be opened before write_crash_report is called. + * Returned Value: + * If the report is successfully stored to the file, a zero value is returned. + * On failure, nonzero value is returned. + */ +static int write_crash_report(const map_crash_report_t &report, FILE *fp) +{ + fprintf(fp, "# Please check this report. Lines starting with '#' will be ignored.\n" + "# Lines starting with '%%----' separate fields, please do not delete them.\n\n"); + + write_crash_report_field(fp, report, "Comment", + _("Describe the circumstances of this crash below.")); + write_crash_report_field(fp, report, "How to reproduce", + _("How to reproduce the crash?")); + write_crash_report_field(fp, report, "backtrace", + _("Backtrace. Check that it does not contain any sensitive data such as passwords.")); + write_crash_report_field(fp, report, "UUID", "UUID"); + write_crash_report_field(fp, report, "architecture", "Architecture"); + write_crash_report_field(fp, report, "cmdline", "Command line"); + write_crash_report_field(fp, report, "component", "Component"); + write_crash_report_field(fp, report, "coredump", "Core dump"); + write_crash_report_field(fp, report, "executable", "Executable"); + write_crash_report_field(fp, report, "kernel", "Kernel"); + write_crash_report_field(fp, report, "package", "Package"); + write_crash_report_field(fp, report, "reason", "Reason"); + write_crash_report_field(fp, report, "release", "Release"); + + return 0; +} + +/* + * Updates appropriate field in the report from the text. The text can + * contain multiple fields. + */ +static void read_crash_report_field(const char *text, map_crash_report_t &report, + const char *field) +{ + char separator[strlen("\n" FIELD_SEP) + strlen(field) + 2]; // 2 = '\n\0' + sprintf(separator, "\n%s%s\n", FIELD_SEP, field); + const char *textfield = strstr(text, separator); + if (!textfield) + return; + + textfield += strlen(separator); + int length = 0; + const char *end = strstr(textfield, "\n" FIELD_SEP); + if (!end) + length = strlen(textfield); + else + length = end - textfield; + + const map_crash_report_t::iterator it = report.find(field); + if (it == report.end()) + { + error_msg("Field %s not found.\n", field); + return; + } + + if (it->second[CD_TYPE] == CD_SYS) + { + error_msg("Cannot update field %s because it is a system value.\n", field); + return; + } + + if (it->second[CD_EDITABLE] == CD_ISEDITABLE) + it->second[CD_CONTENT].assign(textfield, length); +} + +/* + * Updates the crash report 'report' from the text. The text must not contain + * any comments. + */ +static int read_crash_report(map_crash_report_t &report, const char *text) +{ + read_crash_report_field(text, report, "Comment"); + read_crash_report_field(text, report, "How to reproduce"); + read_crash_report_field(text, report, "backtrace"); + read_crash_report_field(text, report, "UUID"); + read_crash_report_field(text, report, "architecture"); + read_crash_report_field(text, report, "cmdline"); + read_crash_report_field(text, report, "component"); + read_crash_report_field(text, report, "coredump"); + read_crash_report_field(text, report, "executable"); + read_crash_report_field(text, report, "kernel"); + read_crash_report_field(text, report, "package"); + read_crash_report_field(text, report, "reason"); + read_crash_report_field(text, report, "release"); + + return 0; +} + +/* Runs external editor. */ +int launch_editor(const char *path) +{ + const char *editor, *terminal; + + editor = getenv("ABRT_EDITOR"); + if (!editor) + editor = getenv("VISUAL"); + if (!editor) + editor = getenv("EDITOR"); + + terminal = getenv("TERM"); + if (!editor && (!terminal || !strcmp(terminal, "dumb"))) + { + error_msg(_("Terminal is dumb but no VISUAL nor EDITOR defined.")); + return 1; + } + + if (!editor) + editor = "vi"; + + const char *args[6]; + args[0] = editor; + args[1] = path; + run_command(args); + + return 0; +} + +/* Reports the crash with corresponding uuid over DBus. */ +int report(const char *uuid, bool always) +{ + map_crash_report_t cr = call_CreateReport(uuid); + + if (always) + { + call_Report(cr); + return 0; + } + + /* Open a temporary file and write the crash report to it. */ + char filename[] = "/tmp/abrt-report.XXXXXX"; + int fd = mkstemp(filename); + if (fd == -1) + { + error_msg("could not generate temporary file name"); + return 1; + } + + FILE *fp = fdopen(fd, "w"); + if (!fp) + { + error_msg("could not open '%s' to save the crash report", filename); + return 1; + } + + write_crash_report(cr, fp); + + if (fclose(fp)) + { + error_msg("could not close '%s'", filename); + return 2; + } + + launch_editor(filename); + + fp = fopen(filename, "r"); + if (!fp) + { + error_msg("could not open '%s' to read the crash report", filename); + return 1; + } + + fseek(fp, 0, SEEK_END); + long size = ftell(fp); + printf("%d", size); + fseek(fp, 0, SEEK_SET); + + char *text = (char*)malloc(size + 1); + if (fread(text, 1, size, fp) != size) + { + error_msg("could not read '%s'", filename); + return 1; + } + text[size] = '\0'; + fclose(fp); + + remove_comments_and_unescape(text); + read_crash_report(cr, text); + free(text); + + /*int result = */unlink(filename); + + printf(_("\nReport has been updated.\nDo you want to send the report? [y/n]: ")); + fflush(NULL); + char answer[16] = "n"; + fgets(answer, sizeof(answer), stdin); + if (answer[0] == 'Y' || answer[0] == 'y') + { + call_Report(cr); + } + + return 0; +} diff --git a/src/CLI/report.h b/src/CLI/report.h new file mode 100644 index 0000000..888babf --- /dev/null +++ b/src/CLI/report.h @@ -0,0 +1,24 @@ +/* + 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. +*/ +#ifndef ABRT_CLI_REPORT_H +#define ABRT_CLI_REPORT_H + +/* Reports the crash with corresponding uuid over DBus. */ +extern int report(const char *uuid, bool always); + +#endif diff --git a/src/CLI/run-command.cpp b/src/CLI/run-command.cpp new file mode 100644 index 0000000..df29b0e --- /dev/null +++ b/src/CLI/run-command.cpp @@ -0,0 +1,87 @@ +/* + 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 "run-command.h" +#include "abrtlib.h" + +/* + Inspired by git code. + http://git.kernel.org/?p=git/git.git;a=blob;f=run-command.c;hb=HEAD +*/ + +struct child_process +{ + const char **argv; + pid_t pid; +}; + +static int start_command(struct child_process *cmd) +{ + cmd->pid = fork(); + if (cmd->pid == 0) + { // new process + execvp(cmd->argv[0], (char *const*)cmd->argv); + exit(127); + } + if (cmd->pid < 0) + { + error_msg_and_die("Unable to fork for %s: %s", cmd->argv[0], strerror(errno)); + return -1; + } + return 0; +} + +static int finish_command(struct child_process *cmd) +{ + pid_t waiting; + int status, code = -1; + while ((waiting = waitpid(cmd->pid, &status, 0)) < 0 && errno == EINTR) + ; /* nothing */ + + if (waiting < 0) + error_msg_and_die("waitpid for %s failed: %s", cmd->argv[0], strerror(errno)); + else if (waiting != cmd->pid) + error_msg_and_die("waitpid is confused (%s)", cmd->argv[0]); + else if (WIFSIGNALED(status)) + { + code = WTERMSIG(status); + error_msg("%s died of signal %d", cmd->argv[0], code); + } + else if (WIFEXITED(status)) + { + code = WEXITSTATUS(status); + if (code == 127) + { + code = -1; + error_msg_and_die("cannot run %s: %s", cmd->argv[0], strerror(ENOENT)); + } + } + else + error_msg_and_die("waitpid is confused (%s)", cmd->argv[0]); + + return code; +} + +int run_command(const char **argv) +{ + struct child_process cmd; + cmd.argv = argv; + int code = start_command(&cmd); + if (code) + return code; + return finish_command(&cmd); +} diff --git a/src/CLI/run-command.h b/src/CLI/run-command.h new file mode 100644 index 0000000..45a85af --- /dev/null +++ b/src/CLI/run-command.h @@ -0,0 +1,23 @@ +/* + 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. +*/ +#ifndef ABRT_CLI_RUN_COMMAND_H +#define ABRT_CLI_RUN_COMMAND_H + +int run_command(const char **argv); + +#endif -- cgit From b1e759fb921564afd675721f6ad67edb35eb738f Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 20 Oct 2009 16:14:46 +0200 Subject: Manpage documents environment variable usage. --- src/CLI/abrt-cli.1 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/CLI/abrt-cli.1 b/src/CLI/abrt-cli.1 index 5f132df..9ccc615 100644 --- a/src/CLI/abrt-cli.1 +++ b/src/CLI/abrt-cli.1 @@ -24,11 +24,17 @@ Prints list of crashes which are not reported yet. .IP "\-\-get-list-full" Prints list of all crashes. .IP "\-\-report \fIUUID\fR" -Creates and sends a report. +Creates a crash report and then the text editor is invoked on that +report. When you are done with editing the report just exit the editor +and then you will be asked if you want to send the report. .IP "\-\-report-always \fIUUID\fR" -Creates and sends a report without asking. +Creates and sends the crash report without asking. .IP "\-\-delete \fIUUID\fR" -Removes crash. +Removes data about particular crash. +.SH ENVIRONMENT VARIABLES +The editor used to edit the crash report is chosen from the ABRT_EDITOR +environment variable, the VISUAL environment variable, or the EDITOR +environment variable, in that order. .SH "SEE ALSO" .IR abrtd (8), .IR abrt.conf (5), -- cgit From f16349195d117198603d6c951b7af434afda2339 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 20 Oct 2009 16:45:15 +0200 Subject: Code comments. Better UI texts. --- src/CLI/report.cpp | 58 +++++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp index 6f2ba6a..57dc625 100644 --- a/src/CLI/report.cpp +++ b/src/CLI/report.cpp @@ -29,10 +29,13 @@ #define _(S) (S) #endif +/* Field separator for the crash report file that is edited by user. */ #define FIELD_SEP "%----" -/* Escapes the field content string to avoid confusion with file comments. - Returned field must be free()d by caller. */ +/* + * Escapes the field content string to avoid confusion with file comments. + * Returned field must be free()d by caller. + */ static char *escape(const char *str) { // Determine the size of resultant string. @@ -82,8 +85,10 @@ static char *escape(const char *str) return result; } -/* Removes all comment lines, and unescapes the string previously escaped - by escape(). Works in-place. */ +/* + * Removes all comment lines, and unescapes the string previously escaped + * by escape(). Works in-place. + */ static char *remove_comments_and_unescape(char *str) { char *src = str, *dest = str; @@ -138,17 +143,19 @@ static void write_crash_report_field(FILE *fp, const map_crash_report_t &report, fprintf(fp, "%s%s\n", FIELD_SEP, it->first.c_str()); - bool readonly = (it->second[CD_EDITABLE] != CD_ISEDITABLE); - fprintf(fp, readonly ? _("# %s (read only)\n") : "# %s\n", description); + fprintf(fp, "%s\n", description); + if (it->second[CD_EDITABLE] != CD_ISEDITABLE) + fprintf(fp, _("# This field is read only.\n")); char *escaped_content = escape(it->second[CD_CONTENT].c_str()); fprintf(fp, "%s\n", escaped_content); free(escaped_content); } -/* Saves the crash report to a file. - * Fp must be opened before write_crash_report is called. - * Returned Value: +/* + * Saves the crash report to a file. + * Parameter 'fp' must be opened before write_crash_report is called. + * Returned value: * If the report is successfully stored to the file, a zero value is returned. * On failure, nonzero value is returned. */ @@ -158,22 +165,22 @@ static int write_crash_report(const map_crash_report_t &report, FILE *fp) "# Lines starting with '%%----' separate fields, please do not delete them.\n\n"); write_crash_report_field(fp, report, "Comment", - _("Describe the circumstances of this crash below.")); + _("# Describe the circumstances of this crash below.")); write_crash_report_field(fp, report, "How to reproduce", - _("How to reproduce the crash?")); + _("# How to reproduce the crash?")); write_crash_report_field(fp, report, "backtrace", - _("Backtrace. Check that it does not contain any sensitive data such as passwords.")); - write_crash_report_field(fp, report, "UUID", "UUID"); - write_crash_report_field(fp, report, "architecture", "Architecture"); - write_crash_report_field(fp, report, "cmdline", "Command line"); - write_crash_report_field(fp, report, "component", "Component"); - write_crash_report_field(fp, report, "coredump", "Core dump"); - write_crash_report_field(fp, report, "executable", "Executable"); - write_crash_report_field(fp, report, "kernel", "Kernel"); - write_crash_report_field(fp, report, "package", "Package"); - write_crash_report_field(fp, report, "reason", "Reason"); - write_crash_report_field(fp, report, "release", "Release"); - + _("# Stack trace: a list of active stack frames at the time the crash occurred\n# Check that it does not contain any sensitive data such as passwords.")); + write_crash_report_field(fp, report, "UUID", _("# UUID")); + write_crash_report_field(fp, report, "architecture", _("# Architecture")); + write_crash_report_field(fp, report, "cmdline", _("# Command line")); + write_crash_report_field(fp, report, "component", _("# Component")); + write_crash_report_field(fp, report, "coredump", _("# Core dump")); + write_crash_report_field(fp, report, "executable", _("# Executable")); + write_crash_report_field(fp, report, "kernel", _("# Kernel version")); + write_crash_report_field(fp, report, "package", _("# Package")); + write_crash_report_field(fp, report, "reason", _("# Reason of crash")); + write_crash_report_field(fp, report, "release", _("# Release string of the operating system")); + return 0; } @@ -313,7 +320,6 @@ int report(const char *uuid, bool always) fseek(fp, 0, SEEK_END); long size = ftell(fp); - printf("%d", size); fseek(fp, 0, SEEK_SET); char *text = (char*)malloc(size + 1); @@ -331,14 +337,12 @@ int report(const char *uuid, bool always) /*int result = */unlink(filename); - printf(_("\nReport has been updated.\nDo you want to send the report? [y/n]: ")); + printf(_("\nThe report has been updated.\nDo you want to send the report? [y/N]: ")); fflush(NULL); char answer[16] = "n"; fgets(answer, sizeof(answer), stdin); if (answer[0] == 'Y' || answer[0] == 'y') - { call_Report(cr); - } return 0; } -- cgit From 8ea7097910579362f994ceaf17b9d256ce894826 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 20 Oct 2009 16:49:10 +0200 Subject: Print error on unlink failure. --- src/CLI/report.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp index 57dc625..e1a0cd2 100644 --- a/src/CLI/report.cpp +++ b/src/CLI/report.cpp @@ -335,7 +335,8 @@ int report(const char *uuid, bool always) read_crash_report(cr, text); free(text); - /*int result = */unlink(filename); + if (unlink(filename) != 0) + error_msg("could not unlink %s: %s", filename, strerror(errno)); printf(_("\nThe report has been updated.\nDo you want to send the report? [y/N]: ")); fflush(NULL); -- cgit From 8f5fdfffdb74a69b5008f11d4d922eba11c842ac Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 20 Oct 2009 16:56:27 +0200 Subject: new_call_msg and send_get_reply_and_unref made static --- src/CLI/dbus.cpp | 4 ++-- src/CLI/dbus.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/CLI/dbus.cpp b/src/CLI/dbus.cpp index 3a2999e..64dac09 100644 --- a/src/CLI/dbus.cpp +++ b/src/CLI/dbus.cpp @@ -25,7 +25,7 @@ DBusConnection* s_dbus_conn; */ /* helpers */ -DBusMessage* new_call_msg(const char* method) +static DBusMessage* new_call_msg(const char* method) { DBusMessage* msg = dbus_message_new_method_call(CC_DBUS_NAME, CC_DBUS_PATH, CC_DBUS_IFACE, method); if (!msg) @@ -33,7 +33,7 @@ DBusMessage* new_call_msg(const char* method) return msg; } -DBusMessage* send_get_reply_and_unref(DBusMessage* msg) +static DBusMessage* send_get_reply_and_unref(DBusMessage* msg) { DBusError err; dbus_error_init(&err); diff --git a/src/CLI/dbus.h b/src/CLI/dbus.h index febcb94..c6cb82a 100644 --- a/src/CLI/dbus.h +++ b/src/CLI/dbus.h @@ -23,8 +23,6 @@ extern DBusConnection* s_dbus_conn; -extern DBusMessage* new_call_msg(const char* method); -extern DBusMessage* send_get_reply_and_unref(DBusMessage* msg); extern vector_crash_infos_t call_GetCrashInfos(); extern map_crash_report_t call_CreateReport(const char* uuid); extern void call_Report(const map_crash_report_t& report); -- cgit From c88b42d31d786dddf4dda5a4beb6bc34a405fecc Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 20 Oct 2009 17:11:08 +0200 Subject: More comments. --- src/CLI/report.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp index e1a0cd2..88cb1ce 100644 --- a/src/CLI/report.cpp +++ b/src/CLI/report.cpp @@ -122,7 +122,8 @@ static char *remove_comments_and_unescape(char *str) *dest = '\0'; } -/* Writes a field of crash report to a file. +/* + * Writes a field of crash report to a file. * Field must be writable. */ static void write_crash_report_field(FILE *fp, const map_crash_report_t &report, @@ -277,10 +278,12 @@ int launch_editor(const char *path) /* Reports the crash with corresponding uuid over DBus. */ int report(const char *uuid, bool always) { + // Ask for an initial report. map_crash_report_t cr = call_CreateReport(uuid); if (always) { + // Send the report immediately. call_Report(cr); return 0; } @@ -308,9 +311,11 @@ int report(const char *uuid, bool always) error_msg("could not close '%s'", filename); return 2; } - + + // Start a text editor on the temporary file. launch_editor(filename); + // Read the file back and update the report from the file. fp = fopen(filename, "r"); if (!fp) { @@ -332,12 +337,13 @@ int report(const char *uuid, bool always) fclose(fp); remove_comments_and_unescape(text); - read_crash_report(cr, text); + read_crash_report(cr, text); // Updates the crash report from the file text. free(text); - if (unlink(filename) != 0) + if (unlink(filename) != 0) // Delete the tempfile. error_msg("could not unlink %s: %s", filename, strerror(errno)); + // Report only if the user is sure. printf(_("\nThe report has been updated.\nDo you want to send the report? [y/N]: ")); fflush(NULL); char answer[16] = "n"; -- cgit From e1a887790d3e98f695f9f88e4d12dd675c7211b9 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 20 Oct 2009 17:47:59 +0200 Subject: Inform whether some changes were detected in the crash report. --- src/CLI/report.cpp | 108 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 84 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp index 88cb1ce..5506532 100644 --- a/src/CLI/report.cpp +++ b/src/CLI/report.cpp @@ -32,6 +32,33 @@ /* Field separator for the crash report file that is edited by user. */ #define FIELD_SEP "%----" +/* + * Trims whitespace characters both from left and right side of a string. + * Modifies the string in-place. Returns the trimmed string. + */ +char *trim(char *str) +{ + if (!str) + return NULL; + + // Remove leading spaces. + char *ibuf; + for (ibuf = str; *ibuf && isspace(*ibuf); ++ibuf) + ; + if (str != ibuf) + memmove(str, ibuf, ibuf - str); + + // Remove trailing spaces. + int i = strlen(str); + while (--i >= 0) + { + if (!isspace(str[i])) + break; + } + str[++i] = NULL; + return str; +} + /* * Escapes the field content string to avoid confusion with file comments. * Returned field must be free()d by caller. @@ -188,15 +215,19 @@ static int write_crash_report(const map_crash_report_t &report, FILE *fp) /* * Updates appropriate field in the report from the text. The text can * contain multiple fields. + * Returns: + * 0 if no change to the field was detected. + * 1 if the field was changed. + * Changes to read-only fields are ignored. */ -static void read_crash_report_field(const char *text, map_crash_report_t &report, - const char *field) +static int read_crash_report_field(const char *text, map_crash_report_t &report, + const char *field) { char separator[strlen("\n" FIELD_SEP) + strlen(field) + 2]; // 2 = '\n\0' sprintf(separator, "\n%s%s\n", FIELD_SEP, field); const char *textfield = strstr(text, separator); if (!textfield) - return; + return 0; textfield += strlen(separator); int length = 0; @@ -210,40 +241,63 @@ static void read_crash_report_field(const char *text, map_crash_report_t &report if (it == report.end()) { error_msg("Field %s not found.\n", field); - return; + return 0; } if (it->second[CD_TYPE] == CD_SYS) { error_msg("Cannot update field %s because it is a system value.\n", field); - return; + return 0; } - if (it->second[CD_EDITABLE] == CD_ISEDITABLE) - it->second[CD_CONTENT].assign(textfield, length); + // Do not change noneditable fields. + if (it->second[CD_EDITABLE] != CD_ISEDITABLE) + return 0; + + // Compare the old field contents with the new field contents. + char newvalue[length + 1]; + strncpy(newvalue, textfield, length); + newvalue[length] = '\0'; + trim(newvalue); + + char oldvalue[it->second[CD_CONTENT].length() + 1]; + strcpy(oldvalue, it->second[CD_CONTENT].c_str()); + trim(oldvalue); + + // Return if no change in the contents detected. + int cmp = strcmp(newvalue, oldvalue); + if (!cmp) + return 0; + + it->second[CD_CONTENT].assign(newvalue); + return 1; } /* * Updates the crash report 'report' from the text. The text must not contain * any comments. + * Returns: + * 0 if no field was changed. + * 1 if any field was changed. + * Changes to read-only fields are ignored. */ static int read_crash_report(map_crash_report_t &report, const char *text) { - read_crash_report_field(text, report, "Comment"); - read_crash_report_field(text, report, "How to reproduce"); - read_crash_report_field(text, report, "backtrace"); - read_crash_report_field(text, report, "UUID"); - read_crash_report_field(text, report, "architecture"); - read_crash_report_field(text, report, "cmdline"); - read_crash_report_field(text, report, "component"); - read_crash_report_field(text, report, "coredump"); - read_crash_report_field(text, report, "executable"); - read_crash_report_field(text, report, "kernel"); - read_crash_report_field(text, report, "package"); - read_crash_report_field(text, report, "reason"); - read_crash_report_field(text, report, "release"); - - return 0; + int result = 0; + result |= read_crash_report_field(text, report, "Comment"); + result |= read_crash_report_field(text, report, "How to reproduce"); + result |= read_crash_report_field(text, report, "backtrace"); + result |= read_crash_report_field(text, report, "UUID"); + result |= read_crash_report_field(text, report, "architecture"); + result |= read_crash_report_field(text, report, "cmdline"); + result |= read_crash_report_field(text, report, "component"); + result |= read_crash_report_field(text, report, "coredump"); + result |= read_crash_report_field(text, report, "executable"); + result |= read_crash_report_field(text, report, "kernel"); + result |= read_crash_report_field(text, report, "package"); + result |= read_crash_report_field(text, report, "reason"); + result |= read_crash_report_field(text, report, "release"); + return result; } /* Runs external editor. */ @@ -337,14 +391,20 @@ int report(const char *uuid, bool always) fclose(fp); remove_comments_and_unescape(text); - read_crash_report(cr, text); // Updates the crash report from the file text. + // Updates the crash report from the file text. + int report_changed = read_crash_report(cr, text); + if (report_changed) + puts(_("\nThe report has been updated.")); + else + puts(_("\nNo changes were detected in the report.")); + free(text); if (unlink(filename) != 0) // Delete the tempfile. error_msg("could not unlink %s: %s", filename, strerror(errno)); // Report only if the user is sure. - printf(_("\nThe report has been updated.\nDo you want to send the report? [y/N]: ")); + printf(_("Do you want to send the report? [y/N]: ")); fflush(NULL); char answer[16] = "n"; fgets(answer, sizeof(answer), stdin); -- cgit From 908ba185ac9651945f4c4c4f8fb5155875cd246c Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Tue, 20 Oct 2009 17:54:53 +0200 Subject: Tell user about sending the report. --- src/CLI/report.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp index 5506532..b9c6d41 100644 --- a/src/CLI/report.cpp +++ b/src/CLI/report.cpp @@ -409,7 +409,13 @@ int report(const char *uuid, bool always) char answer[16] = "n"; fgets(answer, sizeof(answer), stdin); if (answer[0] == 'Y' || answer[0] == 'y') + { + puts(_("Reporting...")); call_Report(cr); + puts(_("Crash report was successfully sent.")); + } + else + puts(_("Crash report was not sent.")); return 0; } -- cgit From c5cbf4ac39edb168810eb94a55c3282aa30b0620 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Wed, 21 Oct 2009 14:55:32 +0200 Subject: Use defines instead of strings where possible. --- src/CLI/report.cpp | 46 ++++++++++++++++++++++++---------------------- src/Daemon/MiddleWare.cpp | 2 +- 2 files changed, 25 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp index b9c6d41..8dedf03 100644 --- a/src/CLI/report.cpp +++ b/src/CLI/report.cpp @@ -19,6 +19,7 @@ #include "run-command.h" #include "dbus.h" #include "abrtlib.h" +#include "DebugDump.h" // FILENAME_* defines #if HAVE_CONFIG_H #include #endif @@ -159,7 +160,8 @@ static void write_crash_report_field(FILE *fp, const map_crash_report_t &report, const map_crash_report_t::const_iterator it = report.find(field); if (it == report.end()) { - error_msg("Field %s not found.\n", field); + // exit silently, all fields are optional for now + //error_msg("Field %s not found.\n", field); return; } @@ -192,22 +194,22 @@ static int write_crash_report(const map_crash_report_t &report, FILE *fp) fprintf(fp, "# Please check this report. Lines starting with '#' will be ignored.\n" "# Lines starting with '%%----' separate fields, please do not delete them.\n\n"); - write_crash_report_field(fp, report, "Comment", + write_crash_report_field(fp, report, CD_COMMENT, _("# Describe the circumstances of this crash below.")); - write_crash_report_field(fp, report, "How to reproduce", + write_crash_report_field(fp, report, CD_REPRODUCE, _("# How to reproduce the crash?")); write_crash_report_field(fp, report, "backtrace", _("# Stack trace: a list of active stack frames at the time the crash occurred\n# Check that it does not contain any sensitive data such as passwords.")); - write_crash_report_field(fp, report, "UUID", _("# UUID")); - write_crash_report_field(fp, report, "architecture", _("# Architecture")); + write_crash_report_field(fp, report, CD_UUID, _("# UUID")); + write_crash_report_field(fp, report, FILENAME_ARCHITECTURE, _("# Architecture")); write_crash_report_field(fp, report, "cmdline", _("# Command line")); - write_crash_report_field(fp, report, "component", _("# Component")); + write_crash_report_field(fp, report, FILENAME_COMPONENT, _("# Component")); write_crash_report_field(fp, report, "coredump", _("# Core dump")); - write_crash_report_field(fp, report, "executable", _("# Executable")); - write_crash_report_field(fp, report, "kernel", _("# Kernel version")); - write_crash_report_field(fp, report, "package", _("# Package")); - write_crash_report_field(fp, report, "reason", _("# Reason of crash")); - write_crash_report_field(fp, report, "release", _("# Release string of the operating system")); + write_crash_report_field(fp, report, FILENAME_EXECUTABLE, _("# Executable")); + write_crash_report_field(fp, report, FILENAME_KERNEL, _("# Kernel version")); + write_crash_report_field(fp, report, FILENAME_PACKAGE, _("# Package")); + write_crash_report_field(fp, report, FILENAME_REASON, _("# Reason of crash")); + write_crash_report_field(fp, report, FILENAME_RELEASE, _("# Release string of the operating system")); return 0; } @@ -227,7 +229,7 @@ static int read_crash_report_field(const char *text, map_crash_report_t &report, sprintf(separator, "\n%s%s\n", FIELD_SEP, field); const char *textfield = strstr(text, separator); if (!textfield) - return 0; + return 0; // exit silently because all fields are optional textfield += strlen(separator); int length = 0; @@ -284,19 +286,19 @@ static int read_crash_report_field(const char *text, map_crash_report_t &report, static int read_crash_report(map_crash_report_t &report, const char *text) { int result = 0; - result |= read_crash_report_field(text, report, "Comment"); - result |= read_crash_report_field(text, report, "How to reproduce"); + result |= read_crash_report_field(text, report, CD_COMMENT); + result |= read_crash_report_field(text, report, CD_REPRODUCE); result |= read_crash_report_field(text, report, "backtrace"); - result |= read_crash_report_field(text, report, "UUID"); - result |= read_crash_report_field(text, report, "architecture"); + result |= read_crash_report_field(text, report, CD_UUID); + result |= read_crash_report_field(text, report, FILENAME_ARCHITECTURE); result |= read_crash_report_field(text, report, "cmdline"); - result |= read_crash_report_field(text, report, "component"); + result |= read_crash_report_field(text, report, FILENAME_COMPONENT); result |= read_crash_report_field(text, report, "coredump"); - result |= read_crash_report_field(text, report, "executable"); - result |= read_crash_report_field(text, report, "kernel"); - result |= read_crash_report_field(text, report, "package"); - result |= read_crash_report_field(text, report, "reason"); - result |= read_crash_report_field(text, report, "release"); + result |= read_crash_report_field(text, report, FILENAME_EXECUTABLE); + result |= read_crash_report_field(text, report, FILENAME_KERNEL); + result |= read_crash_report_field(text, report, FILENAME_PACKAGE); + result |= read_crash_report_field(text, report, FILENAME_REASON); + result |= read_crash_report_field(text, report, FILENAME_RELEASE); return result; } diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index 05abc9b..9060d79 100644 --- a/src/Daemon/MiddleWare.cpp +++ b/src/Daemon/MiddleWare.cpp @@ -499,7 +499,7 @@ void LoadOpenGPGPublicKey(const char* key) * @return It return results of operation. See mw_result_t. */ static mw_result_t SavePackageDescriptionToDebugDump(const std::string& pExecutable, - const std::string& pDebugDumpDir) + const std::string& pDebugDumpDir) { std::string package; std::string packageName; -- cgit From f824969d3a8e77a41dac30997b47a0268cc01cbd Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 21 Oct 2009 15:49:01 +0200 Subject: fix warning and whitespace damage Signed-off-by: Denys Vlasenko --- src/CLI/CLI.cpp | 3 +- src/CLI/abrt-cli.1 | 10 +++---- src/CLI/abrt-cli.bash | 2 +- src/CLI/dbus.cpp | 2 +- src/CLI/report.cpp | 78 ++++++++++++++++++++++++------------------------- src/CLI/run-command.cpp | 22 +++++++------- 6 files changed, 58 insertions(+), 59 deletions(-) (limited to 'src') diff --git a/src/CLI/CLI.cpp b/src/CLI/CLI.cpp index a782a59..18e99dc 100644 --- a/src/CLI/CLI.cpp +++ b/src/CLI/CLI.cpp @@ -65,7 +65,7 @@ static void print_crash_infos(vector_crash_infos_t& pCrashInfos, int pMode) int success = strftime(timeloc, 128, "%c", localtime(&time)); if (!success) error_msg_and_die("Error while converting time to string."); - + printf(_("%u.\n" "\tUID : %s\n" "\tUUID : %s\n" @@ -132,7 +132,6 @@ int main(int argc, char** argv) { char* uuid = NULL; int op = -1; - char *name; setlocale(LC_ALL,""); #if ENABLE_NLS diff --git a/src/CLI/abrt-cli.1 b/src/CLI/abrt-cli.1 index 9ccc615..4fe4bb4 100644 --- a/src/CLI/abrt-cli.1 +++ b/src/CLI/abrt-cli.1 @@ -24,16 +24,16 @@ Prints list of crashes which are not reported yet. .IP "\-\-get-list-full" Prints list of all crashes. .IP "\-\-report \fIUUID\fR" -Creates a crash report and then the text editor is invoked on that -report. When you are done with editing the report just exit the editor -and then you will be asked if you want to send the report. +Creates a crash report and then the text editor is invoked on that +report. When you are done with editing the report just exit the editor +and then you will be asked if you want to send the report. .IP "\-\-report-always \fIUUID\fR" Creates and sends the crash report without asking. .IP "\-\-delete \fIUUID\fR" Removes data about particular crash. .SH ENVIRONMENT VARIABLES -The editor used to edit the crash report is chosen from the ABRT_EDITOR -environment variable, the VISUAL environment variable, or the EDITOR +The editor used to edit the crash report is chosen from the ABRT_EDITOR +environment variable, the VISUAL environment variable, or the EDITOR environment variable, in that order. .SH "SEE ALSO" .IR abrtd (8), diff --git a/src/CLI/abrt-cli.bash b/src/CLI/abrt-cli.bash index 089d5a3..10b086a 100644 --- a/src/CLI/abrt-cli.bash +++ b/src/CLI/abrt-cli.bash @@ -1,7 +1,7 @@ # bash-completion add-on for abrt-cli(1) # http://bash-completion.alioth.debian.org/ -_abrt_cli() +_abrt_cli() { local cur prev opts COMPREPLY=() diff --git a/src/CLI/dbus.cpp b/src/CLI/dbus.cpp index 64dac09..420fe70 100644 --- a/src/CLI/dbus.cpp +++ b/src/CLI/dbus.cpp @@ -38,7 +38,7 @@ static DBusMessage* send_get_reply_and_unref(DBusMessage* msg) DBusError err; dbus_error_init(&err); DBusMessage *reply; - reply = dbus_connection_send_with_reply_and_block(s_dbus_conn, + reply = dbus_connection_send_with_reply_and_block(s_dbus_conn, msg, /*timeout*/ -1, &err); if (reply == NULL) { diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp index 8dedf03..b9a1391 100644 --- a/src/CLI/report.cpp +++ b/src/CLI/report.cpp @@ -33,15 +33,15 @@ /* Field separator for the crash report file that is edited by user. */ #define FIELD_SEP "%----" -/* - * Trims whitespace characters both from left and right side of a string. +/* + * Trims whitespace characters both from left and right side of a string. * Modifies the string in-place. Returns the trimmed string. */ char *trim(char *str) { if (!str) return NULL; - + // Remove leading spaces. char *ibuf; for (ibuf = str; *ibuf && isspace(*ibuf); ++ibuf) @@ -60,9 +60,9 @@ char *trim(char *str) return str; } -/* - * Escapes the field content string to avoid confusion with file comments. - * Returned field must be free()d by caller. +/* + * Escapes the field content string to avoid confusion with file comments. + * Returned field must be free()d by caller. */ static char *escape(const char *str) { @@ -87,12 +87,12 @@ static char *escape(const char *str) ++ptr; } - // Copy the input string to the resultant string, and escape all + // Copy the input string to the resultant string, and escape all // occurences of \# and #. char *result = (char*)malloc(strlen(str) + 1 + count); if (!result) error_msg_and_die("Memory error while escaping a field."); - + const char *src = str; char *dest = result; newline = true; @@ -109,15 +109,15 @@ static char *escape(const char *str) newline = (*src == '\n'); *dest++ = *src++; } - *dest = '\0'; + *dest = '\0'; return result; } /* - * Removes all comment lines, and unescapes the string previously escaped - * by escape(). Works in-place. + * Removes all comment lines, and unescapes the string previously escaped + * by escape(). Works in-place. */ -static char *remove_comments_and_unescape(char *str) +static void remove_comments_and_unescape(char *str) { char *src = str, *dest = str; bool newline = true; @@ -125,7 +125,7 @@ static char *remove_comments_and_unescape(char *str) { if (newline) { - if (*src == '#') + if (*src == '#') { // Skip the comment line! while (*src && *src != '\n') ++src; @@ -136,25 +136,25 @@ static char *remove_comments_and_unescape(char *str) ++src; continue; } - else if (*src == '\\' && - (*(src + 1) == '#' || + else if (*src == '\\' && + (*(src + 1) == '#' || (*(src + 1) == '\\' && *(src + 2) == '#'))) { ++src; // Unescape escaped char. } } - + newline = (*src == '\n'); *dest++ = *src++; } *dest = '\0'; } -/* +/* * Writes a field of crash report to a file. * Field must be writable. */ -static void write_crash_report_field(FILE *fp, const map_crash_report_t &report, +static void write_crash_report_field(FILE *fp, const map_crash_report_t &report, const char *field, const char *description) { const map_crash_report_t::const_iterator it = report.find(field); @@ -168,9 +168,9 @@ static void write_crash_report_field(FILE *fp, const map_crash_report_t &report, if (it->second[CD_TYPE] == CD_SYS) { error_msg("Cannot write field %s because it is a system value\n", field); - return; + return; } - + fprintf(fp, "%s%s\n", FIELD_SEP, it->first.c_str()); fprintf(fp, "%s\n", description); @@ -182,8 +182,8 @@ static void write_crash_report_field(FILE *fp, const map_crash_report_t &report, free(escaped_content); } -/* - * Saves the crash report to a file. +/* + * Saves the crash report to a file. * Parameter 'fp' must be opened before write_crash_report is called. * Returned value: * If the report is successfully stored to the file, a zero value is returned. @@ -194,7 +194,7 @@ static int write_crash_report(const map_crash_report_t &report, FILE *fp) fprintf(fp, "# Please check this report. Lines starting with '#' will be ignored.\n" "# Lines starting with '%%----' separate fields, please do not delete them.\n\n"); - write_crash_report_field(fp, report, CD_COMMENT, + write_crash_report_field(fp, report, CD_COMMENT, _("# Describe the circumstances of this crash below.")); write_crash_report_field(fp, report, CD_REPRODUCE, _("# How to reproduce the crash?")); @@ -210,19 +210,19 @@ static int write_crash_report(const map_crash_report_t &report, FILE *fp) write_crash_report_field(fp, report, FILENAME_PACKAGE, _("# Package")); write_crash_report_field(fp, report, FILENAME_REASON, _("# Reason of crash")); write_crash_report_field(fp, report, FILENAME_RELEASE, _("# Release string of the operating system")); - + return 0; } -/* +/* * Updates appropriate field in the report from the text. The text can - * contain multiple fields. + * contain multiple fields. * Returns: * 0 if no change to the field was detected. * 1 if the field was changed. * Changes to read-only fields are ignored. */ -static int read_crash_report_field(const char *text, map_crash_report_t &report, +static int read_crash_report_field(const char *text, map_crash_report_t &report, const char *field) { char separator[strlen("\n" FIELD_SEP) + strlen(field) + 2]; // 2 = '\n\0' @@ -236,9 +236,9 @@ static int read_crash_report_field(const char *text, map_crash_report_t &report, const char *end = strstr(textfield, "\n" FIELD_SEP); if (!end) length = strlen(textfield); - else + else length = end - textfield; - + const map_crash_report_t::iterator it = report.find(field); if (it == report.end()) { @@ -249,7 +249,7 @@ static int read_crash_report_field(const char *text, map_crash_report_t &report, if (it->second[CD_TYPE] == CD_SYS) { error_msg("Cannot update field %s because it is a system value.\n", field); - return 0; + return 0; } // Do not change noneditable fields. @@ -275,12 +275,12 @@ static int read_crash_report_field(const char *text, map_crash_report_t &report, return 1; } -/* - * Updates the crash report 'report' from the text. The text must not contain - * any comments. +/* + * Updates the crash report 'report' from the text. The text must not contain + * any comments. * Returns: * 0 if no field was changed. - * 1 if any field was changed. + * 1 if any field was changed. * Changes to read-only fields are ignored. */ static int read_crash_report(map_crash_report_t &report, const char *text) @@ -306,20 +306,20 @@ static int read_crash_report(map_crash_report_t &report, const char *text) int launch_editor(const char *path) { const char *editor, *terminal; - + editor = getenv("ABRT_EDITOR"); if (!editor) editor = getenv("VISUAL"); if (!editor) editor = getenv("EDITOR"); - + terminal = getenv("TERM"); if (!editor && (!terminal || !strcmp(terminal, "dumb"))) { error_msg(_("Terminal is dumb but no VISUAL nor EDITOR defined.")); return 1; } - + if (!editor) editor = "vi"; @@ -367,7 +367,7 @@ int report(const char *uuid, bool always) error_msg("could not close '%s'", filename); return 2; } - + // Start a text editor on the temporary file. launch_editor(filename); @@ -394,7 +394,7 @@ int report(const char *uuid, bool always) remove_comments_and_unescape(text); // Updates the crash report from the file text. - int report_changed = read_crash_report(cr, text); + int report_changed = read_crash_report(cr, text); if (report_changed) puts(_("\nThe report has been updated.")); else diff --git a/src/CLI/run-command.cpp b/src/CLI/run-command.cpp index df29b0e..80184cf 100644 --- a/src/CLI/run-command.cpp +++ b/src/CLI/run-command.cpp @@ -23,7 +23,7 @@ http://git.kernel.org/?p=git/git.git;a=blob;f=run-command.c;hb=HEAD */ -struct child_process +struct child_process { const char **argv; pid_t pid; @@ -51,28 +51,28 @@ static int finish_command(struct child_process *cmd) int status, code = -1; while ((waiting = waitpid(cmd->pid, &status, 0)) < 0 && errno == EINTR) ; /* nothing */ - - if (waiting < 0) + + if (waiting < 0) error_msg_and_die("waitpid for %s failed: %s", cmd->argv[0], strerror(errno)); - else if (waiting != cmd->pid) + else if (waiting != cmd->pid) error_msg_and_die("waitpid is confused (%s)", cmd->argv[0]); - else if (WIFSIGNALED(status)) + else if (WIFSIGNALED(status)) { code = WTERMSIG(status); error_msg("%s died of signal %d", cmd->argv[0], code); - } - else if (WIFEXITED(status)) + } + else if (WIFEXITED(status)) { code = WEXITSTATUS(status); - if (code == 127) + if (code == 127) { code = -1; error_msg_and_die("cannot run %s: %s", cmd->argv[0], strerror(ENOENT)); } - } - else + } + else error_msg_and_die("waitpid is confused (%s)", cmd->argv[0]); - + return code; } -- cgit