Skip to content

Feature/allow-exiting-watch-return-code #23

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
jeanbaptistelab wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −2
Open

Feature/allow-exiting-watch-return-code #23

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
11 changes: 9 additions & 2 deletions src/builtins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,13 @@ static int slash_builtin_watch(struct slash *slash)

unsigned int interval = 1000;
unsigned int count = 0;
int exit = 0xFFFFFF;

optparse_t * parser = optparse_new("watch", "<command...>");
optparse_add_help(parser);
optparse_add_unsigned(parser, 'n', "interval", "NUM", 0, &interval, "interval in milliseconds (default = <env timeout>)");
optparse_add_unsigned(parser, 'c', "count", "NUM", 0, &count, "number of times to repeat (default = infinite)");
optparse_add_unsigned(parser, 'e', "exit", "NUM", 0, &exit, "stop watch when command returns the given exit code (default = ignore exit code completely)");

int argi = optparse_parse(parser, slash->argc - 1, (const char **) slash->argv + 1);
if (argi < 0) {
Expand All @@ -137,7 +139,7 @@ static int slash_builtin_watch(struct slash *slash)
}

printf("Executing \"%s\" each %u ms - press <enter> to stop\n", line, interval);

int cmd_exit_code;
while(1) {

/* Make another copy, since slash_exec will modify this */
Expand All @@ -149,7 +151,12 @@ static int slash_builtin_watch(struct slash *slash)
clock_gettime(CLOCK_MONOTONIC, &time_before);

/* Execute command */
slash_execute(slash, cmd_exec);
cmd_exit_code = slash_execute(slash, cmd_exec);
if(exit != 0xFFFFFF) {
if(exit == cmd_exit_code) {
break;
}
}

clock_gettime(CLOCK_MONOTONIC, &time_after);

Expand Down