colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: include system information properties in the info command output

Browse Source
This commit is contained in:
Aleksander Morgado
2011-08-20 11:44:29 +02:00
parent fed5ad5623
commit 90f6a5ec75
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cli/mmcli-modem.c
View File

@@ -174,6 +174,11 @@ get_info_process_reply (gboolean result,
const gchar *revision) const gchar *revision)
{ {
gchar *prefixed_revision; gchar *prefixed_revision;
gchar *master_device;
gchar *device;
gchar *device_id;
gchar *driver;
gchar *plugin;
if (!result) { if (!result) {
g_printerr ("couldn't get info from modem: '%s'\n", g_printerr ("couldn't get info from modem: '%s'\n",
@@ -181,6 +186,14 @@ get_info_process_reply (gboolean result,
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
/* Get additional info from properties */
master_device = mm_modem_get_master_device (ctxt.modem);
device = mm_modem_get_device (ctxt.modem);
device_id = mm_modem_get_device_identifier (ctxt.modem);
driver = mm_modem_get_driver (ctxt.modem);
plugin = mm_modem_get_plugin (ctxt.modem);
/* Rework possible multiline strings */
prefixed_revision = prefix_newlines (" | ", prefixed_revision = prefix_newlines (" | ",
revision); revision);
@@ -190,13 +203,29 @@ get_info_process_reply (gboolean result,
" Hardware | manufacturer: '%s'\n" " Hardware | manufacturer: '%s'\n"
" | model: '%s'\n" " | model: '%s'\n"
" | revision: '%s'\n" " | revision: '%s'\n"
" -------------------------\n"
" System | master device: '%s'\n"
" | device: '%s'\n"
" | device id: '%s'\n"
" | driver: '%s'\n"
" | plugin: '%s'\n"
"\n", "\n",
ctxt.modem_str, ctxt.modem_str,
manufacturer, manufacturer,
model, model,
prefixed_revision ? prefixed_revision : revision); prefixed_revision ? prefixed_revision : revision,
master_device,
device,
device_id,
driver,
plugin);
g_free (prefixed_revision); g_free (prefixed_revision);
g_free (master_device);
g_free (device);
g_free (device_id);
g_free (driver);
g_free (plugin);
} }
static void static void