mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-05 16:49:09 +00:00
e6849a5722
Commit d0e72011 ("ip: ipaddress.c: add support for json output")
introduced passing -1 as enum color_attr. This is not only wrong as no
color_attr has value -1, but also causes another segfault in color_fprintf()
on this setup as there is no item with index -1 in array of enum attr_colors[].
Using COLOR_CLEAR is valid option.
Reproduce with:
$ COLORFGBG='0;15' ip -c a
NOTE: COLORFGBG is environmental variable used for defining whether user
has light or dark background.
COLORFGBG="0;15" is used to ask for color set suitable for light background,
COLORFGBG="15;0" is used to ask for color set suitable for dark background.
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
70 lines
1.9 KiB
C
70 lines
1.9 KiB
C
/*
|
|
* json_print.h "print regular or json output, based on json_writer".
|
|
*
|
|
* 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.
|
|
*
|
|
* Authors: Julien Fortin, <julien@cumulusnetworks.com>
|
|
*/
|
|
|
|
#ifndef _JSON_PRINT_H_
|
|
#define _JSON_PRINT_H_
|
|
|
|
#include "json_writer.h"
|
|
#include "color.h"
|
|
|
|
json_writer_t *get_json_writer(void);
|
|
|
|
/*
|
|
* use:
|
|
* - PRINT_ANY for context based output
|
|
* - PRINT_FP for non json specific output
|
|
* - PRINT_JSON for json specific output
|
|
*/
|
|
enum output_type {
|
|
PRINT_FP = 1,
|
|
PRINT_JSON = 2,
|
|
PRINT_ANY = 4,
|
|
};
|
|
|
|
void new_json_obj(int json);
|
|
void delete_json_obj(void);
|
|
|
|
bool is_json_context(void);
|
|
|
|
void fflush_fp(void);
|
|
|
|
void open_json_object(const char *str);
|
|
void close_json_object(void);
|
|
void open_json_array(enum output_type type, const char *delim);
|
|
void close_json_array(enum output_type type, const char *delim);
|
|
|
|
#define _PRINT_FUNC(type_name, type) \
|
|
void print_color_##type_name(enum output_type t, \
|
|
enum color_attr color, \
|
|
const char *key, \
|
|
const char *fmt, \
|
|
type value); \
|
|
\
|
|
static inline void print_##type_name(enum output_type t, \
|
|
const char *key, \
|
|
const char *fmt, \
|
|
type value) \
|
|
{ \
|
|
print_color_##type_name(t, COLOR_CLEAR, key, fmt, value); \
|
|
}
|
|
_PRINT_FUNC(int, int);
|
|
_PRINT_FUNC(bool, bool);
|
|
_PRINT_FUNC(null, const char*);
|
|
_PRINT_FUNC(string, const char*);
|
|
_PRINT_FUNC(uint, uint64_t);
|
|
_PRINT_FUNC(hu, unsigned short);
|
|
_PRINT_FUNC(hex, unsigned int);
|
|
_PRINT_FUNC(0xhex, unsigned int);
|
|
_PRINT_FUNC(lluint, unsigned long long int);
|
|
#undef _PRINT_FUNC
|
|
|
|
#endif /* _JSON_PRINT_H_ */
|