fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-04-18 09:40:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools/record: prefix the device list with a # character

Browse source 
Too many recordings end up with the device list at the top when users redirect
stderr and stdout to the recordings file. This breaks yaml parsing and
requires manual removal of the first few lines.

Avoid this by prefixing the lines with a command character, this way the yaml
stays correct.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-09-17 11:08:59 +10:00
parent 2d641e6b7b
commit 6e8aba9354
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/libinput-record.c
View file

@ -1956,12 +1956,16 @@ select_device(void)
char *device_path;
bool has_eaccess = false;
int available_devices = 0;
const char *prefix = "";
if (!isatty(STDERR_FILENO))
prefix = "# ";
ndev = scandir("/dev/input", &namelist, is_event_node, versionsort);
if (ndev <= 0)
return NULL;
fprintf(stderr, "Available devices:\n");
fprintf(stderr, "%sAvailable devices:\n", prefix);
for (int i = 0; i < ndev; i++) {
struct libevdev *device;
char path[PATH_MAX];
@ -1983,7 +1987,7 @@ select_device(void)
if (rc != 0)
continue;
fprintf(stderr, "%s: %s\n", path, libevdev_get_name(device));
fprintf(stderr, "%s%s: %s\n", prefix, path, libevdev_get_name(device));
libevdev_free(device);
available_devices++;
}
@ -2000,7 +2004,7 @@ select_device(void)
return NULL;
}
fprintf(stderr, "Select the device event number: ");
fprintf(stderr, "%sSelect the device event number: ", prefix);
rc = scanf("%d", &selected_device);
if (rc != 1 || selected_device < 0)
@ -2166,7 +2170,9 @@ mainloop(struct record_context *ctx)
ctx->output_file);
break;
}
fprintf(stderr, "Recording to '%s'.\n", ctx->output_file);
fprintf(stderr, "%sRecording to '%s'.\n",
isatty(STDERR_FILENO) ? "" : "# ",
ctx->output_file);
print_header(ctx);
if (autorestart)