Skip to content

fix: handle CR in agent yes/no prompts #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arsis-dev wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −21
Open

fix: handle CR in agent yes/no prompts #215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 30 additions & 21 deletions ds4_agent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8918,7 +8918,6 @@ static const char *agent_yes_no_auto_name(agent_yes_no_auto answer) {
static bool agent_prompt_yes_no_ex(const char *prompt,
const agent_yes_no_options *opts,
bool *timed_out) {
char buf[32];
int timeout_sec = opts ? opts->timeout_sec : 0;
agent_yes_no_auto auto_answer = opts ?
opts->timeout_answer : AGENT_YES_NO_AUTO_NONE;
Expand All @@ -8934,31 +8933,41 @@ static bool agent_prompt_yes_no_ex(const char *prompt,
printf("[auto-%s in %ds] ", agent_yes_no_auto_name(auto_answer), rem);
}
fflush(stdout);
if (use_timeout) {
double rem_sec = deadline - now_sec();
if (rem_sec <= 0.0) {
if (timed_out) *timed_out = true;
int answer = 0;
for (;;) {
if (use_timeout) {
double rem_sec = deadline - now_sec();
if (rem_sec <= 0.0) {
if (timed_out) *timed_out = true;
printf("\n");
return auto_answer == AGENT_YES_NO_AUTO_YES;
}
struct pollfd pfd = {.fd = STDIN_FILENO, .events = POLLIN};
int timeout_ms = (int)(rem_sec * 1000.0) + 1;
int rc;
do {
rc = poll(&pfd, 1, timeout_ms);
} while (rc < 0 && errno == EINTR);
if (rc == 0) {
if (timed_out) *timed_out = true;
printf("\n");
return auto_answer == AGENT_YES_NO_AUTO_YES;
}
if (rc < 0) return false;
}
int c = getchar();
if (c == EOF || c == 4) {
printf("\n");
return auto_answer == AGENT_YES_NO_AUTO_YES;
return false;
}
struct pollfd pfd = {.fd = STDIN_FILENO, .events = POLLIN};
int timeout_ms = (int)(rem_sec * 1000.0) + 1;
int rc;
do {
rc = poll(&pfd, 1, timeout_ms);
} while (rc < 0 && errno == EINTR);
if (rc == 0) {
if (timed_out) *timed_out = true;
if (c == '\n' || c == '\r') {
printf("\n");
return auto_answer == AGENT_YES_NO_AUTO_YES;
if (answer == 'y' || answer == 'Y') return true;
if (answer == 'n' || answer == 'N' || !answer) return false;
break;
}
if (rc < 0) return false;
if (!answer && c != ' ' && c != '\t') answer = c;
}
if (!fgets(buf, sizeof(buf), stdin)) return false;
char *p = buf;
while (*p == ' ' || *p == '\t') p++;
if (*p == 'y' || *p == 'Y') return true;
if (*p == 'n' || *p == 'N') return false;
}
}

Expand Down