e7f01d1e3d
Several places were expecting that the value returned was the number of characters printed, not what would be printed if there was space. Fix it by using the scnprintf and vscnprintf variants we inherited from the kernel sources. Some corner cases where the number of printed characters were not accounted were fixed too. Reported-by: Anton Blanchard <anton@samba.org> Cc: Anton Blanchard <anton@samba.org> Cc: Eric B Munson <emunson@mgebm.net> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Yanmin Zhang <yanmin_zhang@linux.intel.com> Cc: stable@kernel.org Link: http://lkml.kernel.org/n/tip-kwxo2eh29cxmd8ilixi2005x@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
80 lines
1.4 KiB
C
80 lines
1.4 KiB
C
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "../debug.h"
|
|
#include "helpline.h"
|
|
#include "ui.h"
|
|
#include "libslang.h"
|
|
|
|
void ui_helpline__pop(void)
|
|
{
|
|
}
|
|
|
|
char ui_helpline__current[512];
|
|
|
|
void ui_helpline__push(const char *msg)
|
|
{
|
|
const size_t sz = sizeof(ui_helpline__current);
|
|
|
|
SLsmg_gotorc(SLtt_Screen_Rows - 1, 0);
|
|
SLsmg_set_color(0);
|
|
SLsmg_write_nstring((char *)msg, SLtt_Screen_Cols);
|
|
SLsmg_refresh();
|
|
strncpy(ui_helpline__current, msg, sz)[sz - 1] = '\0';
|
|
}
|
|
|
|
void ui_helpline__vpush(const char *fmt, va_list ap)
|
|
{
|
|
char *s;
|
|
|
|
if (vasprintf(&s, fmt, ap) < 0)
|
|
vfprintf(stderr, fmt, ap);
|
|
else {
|
|
ui_helpline__push(s);
|
|
free(s);
|
|
}
|
|
}
|
|
|
|
void ui_helpline__fpush(const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
|
ui_helpline__vpush(fmt, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void ui_helpline__puts(const char *msg)
|
|
{
|
|
ui_helpline__pop();
|
|
ui_helpline__push(msg);
|
|
}
|
|
|
|
void ui_helpline__init(void)
|
|
{
|
|
ui_helpline__puts(" ");
|
|
}
|
|
|
|
char ui_helpline__last_msg[1024];
|
|
|
|
int ui_helpline__show_help(const char *format, va_list ap)
|
|
{
|
|
int ret;
|
|
static int backlog;
|
|
|
|
pthread_mutex_lock(&ui__lock);
|
|
ret = vscnprintf(ui_helpline__last_msg + backlog,
|
|
sizeof(ui_helpline__last_msg) - backlog, format, ap);
|
|
backlog += ret;
|
|
|
|
if (ui_helpline__last_msg[backlog - 1] == '\n') {
|
|
ui_helpline__puts(ui_helpline__last_msg);
|
|
SLsmg_refresh();
|
|
backlog = 0;
|
|
}
|
|
pthread_mutex_unlock(&ui__lock);
|
|
|
|
return ret;
|
|
}
|