summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2006-02-01 19:20:13 +0100
committerAurelien Foret <aurelien@archlinux.org>2006-02-01 19:20:13 +0100
commitcdc97dd6f2731020604fbc8cd3322d5127cdd666 (patch)
treec8e6751a4a616beffc984936f16ec435d8b98cde /src
parentde3a0f164c303371a2ac8813ebeec10025b27e2a (diff)
downloadpacman-cdc97dd6f2731020604fbc8cd3322d5127cdd666.tar.gz
pacman-cdc97dd6f2731020604fbc8cd3322d5127cdd666.tar.xz
added line feeds when needed (patch from VMiklos <vmiklos@frugalware.org>)
Diffstat (limited to 'src')
-rw-r--r--src/pacman/log.c2
-rw-r--r--src/pacman/pacman.c5
-rw-r--r--src/pacman/util.c2
3 files changed, 8 insertions, 1 deletions
diff --git a/src/pacman/log.c b/src/pacman/log.c
index 9d1f0c1d..550065ab 100644
--- a/src/pacman/log.c
+++ b/src/pacman/log.c
@@ -35,7 +35,7 @@
extern config_t *config;
-static int neednl; /* for cleaner message output */
+int neednl; /* for cleaner message output */
/* Callback to handle notifications from the library
*/
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 715b3244..7738a280 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -59,6 +59,8 @@ list_t *pm_targets = NULL;
int maxcols = 80;
+extern int neednl;
+
int main(int argc, char *argv[])
{
int ret = 0;
@@ -246,6 +248,9 @@ void cleanup(int signum)
muntrace();
#endif
+ if(neednl) {
+ putchar('\n');
+ }
fflush(stdout);
exit(signum);
diff --git a/src/pacman/util.c b/src/pacman/util.c
index af77e8ea..16939099 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -40,6 +40,7 @@
#include "conf.h"
extern int maxcols;
+extern int neednl;
extern config_t *config;
/* does the same thing as 'mkdir -p' */
@@ -203,6 +204,7 @@ int yesno(char *fmt, ...)
vprintf(fmt, args);
va_end(args);
fflush(stdout);
+ neednl = 1;
if(fgets(response, 32, stdin)) {
/* trim whitespace and newlines */
char *pch = response;