forked from Minki/linux
2ef1ea3826
When building on my Debian/mips system, util/util.c fails to build
because commit 1aed267173 (perf kvm: Do
guest-only counting by default) indirectly includes stdio.h before the
feature selection in util.h is done. This prevents _GNU_SOURCE in
util.h from enabling the declaration of getline(), from now second
inclusion of stdio.h, and the build is broken.
There is another breakage in util/evsel.c caused by include ordering,
but I didn't fully track down the commit that caused it.
The root cause of all this is an inconsistent definition of _GNU_SOURCE,
so I move the definition into the Makefile so that it is passed to all
invocations of the compiler and used uniformly for all system header
files. All other #define and #undef of _GNU_SOURCE are removed as they
cause conflicts with the definition passed to the compiler.
All the features.h definitions (_LARGEFILE64_SOURCE _FILE_OFFSET_BITS=64
and _GNU_SOURCE) are needed by the python glue code too, so they are
moved to BASIC_CFLAGS, and the misleading comments about BASIC_CFLAGS
are removed.
This gives me a clean build on x86_64 (fc12) and mips (Debian).
Cc: David Daney <david.daney@cavium.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Joerg Roedel <joerg.roedel@amd.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1326836461-11952-1-git-send-email-ddaney.cavm@gmail.com
Signed-off-by: David Daney <david.daney@cavium.com>
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 = vsnprintf(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;
|
|
}
|