c412765afe
The daemon is now configured in /etc/lirc/lirc_options.conf and remotes in individual files in /etc/lirc/lircd.conf.d/
66 lines
2.3 KiB
Diff
66 lines
2.3 KiB
Diff
commit 35d9b9aa0290d393767f9169b7cdf6333be11c6f
|
|
Author: Alec Leamas <leamas.alec@gmail.com>
|
|
Date: Fri Jan 9 12:46:36 2015 +0100
|
|
|
|
lirc-lsplugins: Bugfixes, list also default device (#90).
|
|
|
|
Since we should use the default device, it should also be
|
|
possible to check. Added to the -l output.
|
|
|
|
diff --git a/tools/lirc-lsplugins.c b/tools/lirc-lsplugins.c
|
|
index 139fa1e..9ed8f57 100644
|
|
--- a/tools/lirc-lsplugins.c
|
|
+++ b/tools/lirc-lsplugins.c
|
|
@@ -86,6 +86,7 @@ typedef struct {
|
|
const char* features;
|
|
const char* version;
|
|
const char* info;
|
|
+ const char* device;
|
|
} line_t;
|
|
|
|
static const line_t* lines[MAX_PLUGINS];
|
|
@@ -126,6 +127,7 @@ static line_t* line_new(const char* path)
|
|
line->errors = NULL;
|
|
line->info = NULL;
|
|
line->version = NULL;
|
|
+ line->device = NULL;
|
|
line->features = opt_long ? " " : "";
|
|
return line;
|
|
}
|
|
@@ -212,7 +214,8 @@ static void line_print_long(const line_t* line)
|
|
}
|
|
|
|
printf("Plugin path:\t%s\n", line->path);
|
|
- printf("Driver name:\t%s\n", line->path ? line->name : "-");
|
|
+ printf("Driver name:\t%s\n", line->name ? line->name : "-");
|
|
+ printf("Default device:\t%s\n", line->device ? line->device : "-");
|
|
printf("Load state:\t%s\n", loadstate);
|
|
printf("Timing info:\t%s\n", handles_timing);
|
|
printf("Can send:\t%s\n", can_send);
|
|
@@ -264,17 +267,22 @@ static void format_drivers(struct driver** drivers,
|
|
continue;
|
|
}
|
|
if ((*drivers)->name) {
|
|
- strncpy(buf, (*drivers)->name, sizeof(buf));
|
|
+ strncpy(buf, (*drivers)->name, sizeof(buf) - 1);
|
|
line->name = strdup(buf);
|
|
}
|
|
if ((*drivers)->driver_version) {
|
|
- strncpy(buf, (*drivers)->driver_version, sizeof(buf));
|
|
+ strncpy(buf,
|
|
+ (*drivers)->driver_version, sizeof(buf) - 1);
|
|
line->version = strdup(buf);
|
|
}
|
|
if ((*drivers)->info) {
|
|
- strncpy(buf, (*drivers)->info, sizeof(buf));
|
|
+ strncpy(buf, (*drivers)->info, sizeof(buf) - 1);
|
|
line->info = strdup(buf);
|
|
}
|
|
+ if ((*drivers)->device) {
|
|
+ strncpy(buf, (*drivers)->device, sizeof(buf) - 1);
|
|
+ line->device = strdup(buf);
|
|
+ }
|
|
snprintf(buf, sizeof(buf), "-%c%c",
|
|
get(CAN_ANY, 'a', *drivers),
|
|
get(CAN_SEND, 's', *drivers));
|