mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-20 15:10:05 +01:00
e6870789b5
Until now we have used a static width defined for each column for tabular output. Even if this worked in most cases, it was not optimal, because by using too wide columns we wasted space, and in case of a too narrow column the alignment broke. So, we need to know the longest string in a column to be able to align columns in the tabular output. Thus, the printing has to be postponed till we have all data available, and can find the widest column. This value is then used for aligning while printing the data. Arrays of NmcOutputField (rows) are inserted into output_data array. When all data have been added, print_data() can be used to print the whole output_data array with proper alignment. A single row can be printed using print_required_fields(). Also, output flags are redone to better match the new output_data array. The flags are needed for every row (in tabular output); they are stored in the first field (NmcOutputField) for the whole row. Addapted set_val_str() and set_val_arr() to set value type (char * x char **). Added set_val_strc(), set_val_arrc() for const values that should not be freed. output_data takes ownership of the data added to it and takes care of freeing the memory. See e.g. https://bugzilla.gnome.org/show_bug.cgi?id=699503
87 lines
3.9 KiB
C
87 lines
3.9 KiB
C
/* nmcli - command-line tool to control NetworkManager
|
|
*
|
|
* 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.
|
|
*
|
|
* (C) Copyright 2010 - 2012 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef NMC_UTILS_H
|
|
#define NMC_UTILS_H
|
|
|
|
#include <glib.h>
|
|
|
|
#include "nmcli.h"
|
|
|
|
/* === Types === */
|
|
|
|
typedef struct {
|
|
const char *name;
|
|
gboolean has_value;
|
|
const char **value;
|
|
gboolean mandatory;
|
|
gboolean found;
|
|
} nmc_arg_t;
|
|
|
|
/* === Functions === */
|
|
int matches (const char *cmd, const char *pattern);
|
|
int next_arg (int *argc, char ***argv);
|
|
gboolean nmc_arg_is_help (const char *arg);
|
|
gboolean nmc_parse_args (nmc_arg_t *arg_arr, gboolean last, int *argc, char ***argv, GError **error);
|
|
char *ssid_to_printable (const char *str, gsize len);
|
|
gboolean nmc_string_to_int_base (const char *str,
|
|
int base,
|
|
gboolean range_check,
|
|
long int min,
|
|
long int max,
|
|
long int *value);
|
|
gboolean nmc_string_to_uint_base (const char *str,
|
|
int base,
|
|
gboolean range_check,
|
|
unsigned long int min,
|
|
unsigned long int max,
|
|
unsigned long int *value);
|
|
gboolean nmc_string_to_int (const char *str,
|
|
gboolean range_check,
|
|
long int min,
|
|
long int max,
|
|
long int *value);
|
|
gboolean nmc_string_to_uint (const char *str,
|
|
gboolean range_check,
|
|
unsigned long int min,
|
|
unsigned long int max,
|
|
unsigned long int *value);
|
|
gboolean nmc_string_to_bool (const char *str, gboolean *val_bool, GError **error);
|
|
char *nmc_ip4_address_as_string (guint32 ip, GError **error);
|
|
char *nmc_ip6_address_as_string (const struct in6_addr *ip, GError **error);
|
|
void nmc_terminal_erase_line (void);
|
|
void nmc_terminal_show_progress (const char *str);
|
|
char *nmc_get_user_input (const char *ask_str);
|
|
int nmc_string_to_arg_array (const char *line, const char *delim, char ***argv, int *argc);
|
|
const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error);
|
|
int nmc_string_screen_width (const char *start, const char *end);
|
|
void set_val_str (NmcOutputField fields_array[], guint32 index, char *value);
|
|
void set_val_strc (NmcOutputField fields_array[], guint32 index, const char *value);
|
|
void set_val_arr (NmcOutputField fields_array[], guint32 index, char **value);
|
|
void set_val_arrc (NmcOutputField fields_array[], guint32 index, const char **value);
|
|
void nmc_free_output_field_values (NmcOutputField fields_array[]);
|
|
GArray *parse_output_fields (const char *fields_str, const NmcOutputField fields_array[], GError **error);
|
|
gboolean nmc_terse_option_check (NMCPrintOutput print_output, const char *fields, GError **error);
|
|
NmcOutputField *nmc_dup_fields_array (NmcOutputField fields[], size_t size, guint32 flags);
|
|
void nmc_empty_output_fields (NmCli *nmc);
|
|
void print_required_fields (NmCli *nmc, const NmcOutputField field_values[]);
|
|
void print_data (NmCli *nmc);
|
|
gboolean nmc_versions_match (NmCli *nmc);
|
|
|
|
#endif /* NMC_UTILS_H */
|