asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-22 17:26:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

axfer: minor code arrangement in a point of stdio detection

Browse source 
Current implementation sets stdio member in a condition branch, however
it's convenient to set it always regardless of any condition.

This commit arranges assignment to the member.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Takashi Sakamoto 2021-03-11 14:21:33 +09:00 committed by Jaroslav Kysela
parent d81a0f93bc
commit 81c93f6460
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
axfer/container.c
View file

@ -169,6 +169,14 @@ int container_parser_init(struct container_context *cntr,
// Open a target descriptor.
if (!strcmp(path, "-")) {
cntr->fd = fileno(stdin);
} else {
cntr->fd = open(path, O_RDONLY);
if (cntr->fd < 0)
return -errno;
}
cntr->stdio = (cntr->fd == fileno(stdin));
if (cntr->stdio) {
if (isatty(cntr->fd)) {
fprintf(stderr,
"A terminal is referred for standard input. "
@ -176,11 +184,6 @@ int container_parser_init(struct container_context *cntr,
"should be referred instead.\n");
return -EIO;
}
cntr->stdio = true;
} else {
cntr->fd = open(path, O_RDONLY);
if (cntr->fd < 0)
return -errno;
}
err = set_nonblock_flag(cntr->fd);
@ -254,6 +257,14 @@ int container_builder_init(struct container_context *cntr,
return -EINVAL;
if (!strcmp(path, "-")) {
cntr->fd = fileno(stdout);
} else {
cntr->fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0644);
if (cntr->fd < 0)
return -errno;
}
cntr->stdio = (cntr->fd == fileno(stdout));
if (cntr->stdio) {
if (isatty(cntr->fd)) {
fprintf(stderr,
"A terminal is referred for standard output. "
@ -261,11 +272,6 @@ int container_builder_init(struct container_context *cntr,
"should be referred instead.\n");
return -EIO;
}
cntr->stdio = true;
} else {
cntr->fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0644);
if (cntr->fd < 0)
return -errno;
}
err = set_nonblock_flag(cntr->fd);