Skip to content
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

Jump to bottom

Adding an infinite loop option. #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adding an infinite loop option. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
275c1ab
Add a infinite beep sequence loop option.
Nicals Oct 13, 2012
3d92897
also catch SIGTERM for stopping the beep
Nicals Feb 7, 2013
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
Binary file modified beep.1.gz
View file
Open in desktop
Binary file not shown.
32 changes: 27 additions & 5 deletions beep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ char *copyright =
#define NO_END_DELAY 0
#define YES_END_DELAY 1

#define NO_INFINITE 0
#define YES_INFINITE 1

#define NO_STDIN_BEEP 0
#define LINE_STDIN_BEEP 1
#define CHAR_STDIN_BEEP 2
Expand Down Expand Up @@ -130,6 +133,7 @@ void handle_signal(int signum) {

switch(signum) {
case SIGINT:
case SIGTERM:
if(console_fd >= 0) {
/* Kill the sound, quit gracefully */
do_beep(0);
Expand Down Expand Up @@ -166,6 +170,7 @@ void usage_bail(const char *executable_name) {
* "-D <delay in ms>" (similar to -d, but delay after last repetition as well)
* "-s" (beep after each line of input from stdin, echo line to stdout)
* "-c" (beep after each char of input from stdin, echo char to stdout)
* "-i/--infinite" <repeat the beep pattern until SIGINT
* "--verbose/--debug"
* "-h/--help"
* "-v/-V/--version"
Expand All @@ -174,17 +179,19 @@ void usage_bail(const char *executable_name) {
* March 29, 2002 - Daniel Eisenbud points out that c should be int, not char,
* for correctness on platforms with unsigned chars.
*/
void parse_command_line(int argc, char **argv, beep_parms_t *result) {
void parse_command_line(int argc, char **argv, beep_parms_t *result, int* infinite) {
int c;
beep_parms_t* first_parm = result;

struct option opt_list[7] = {{"help", 0, NULL, 'h'},
struct option opt_list[8] = {{"help", 0, NULL, 'h'},
{"version", 0, NULL, 'V'},
{"new", 0, NULL, 'n'},
{"verbose", 0, NULL, 'X'},
{"debug", 0, NULL, 'X'},
{"device", 1, NULL, 'e'},
{"infinite", 0, NULL, 'i'},
{0,0,0,0}};
while((c = getopt_long(argc, argv, "f:l:r:d:D:schvVne:", opt_list, NULL))
while((c = getopt_long(argc, argv, "f:l:r:d:D:schivVne:", opt_list, NULL))
!= EOF) {
int argval = -1; /* handle parsed numbers for various arguments */
float argfreq = -1;
Expand Down Expand Up @@ -258,11 +265,16 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) {
case 'e' : /* also --device */
console_device = strdup(optarg);
break;
case 'i':
*infinite = YES_INFINITE;
break;
case 'h' : /* notice that this is also --help */
default :
usage_bail(argv[0]);
}
}
if (*infinite)
result->next = first_parm;
if (result->freq == 0)
result->freq = DEFAULT_FREQ;
}
Expand Down Expand Up @@ -312,6 +324,8 @@ void play_beep(beep_parms_t parms) {

int main(int argc, char **argv) {
char sin[4096], *ptr;
int infinite = NO_INFINITE;
int save_reps = 0;

beep_parms_t *parms = (beep_parms_t *)malloc(sizeof(beep_parms_t));
parms->freq = 0;
Expand All @@ -324,14 +338,18 @@ int main(int argc, char **argv) {
parms->next = NULL;

signal(SIGINT, handle_signal);
parse_command_line(argc, argv, parms);
signal(SIGTERM, handle_signal);
parse_command_line(argc, argv, parms, &infinite);

/* this outermost while loop handles the possibility that -n/--new has been
used, i.e. that we have multiple beeps specified. Each iteration will
play, then free() one parms instance. */
while(parms) {
beep_parms_t *next = parms->next;

if (infinite)
save_reps = parms->reps;

if(parms->stdin_beep) {
/* in this case, beep is probably part of a pipe, in which case POSIX
says stdin and out should be fuly buffered. This however means very
Expand Down Expand Up @@ -359,7 +377,10 @@ int main(int argc, char **argv) {
}

/* Junk each parms struct after playing it */
free(parms);
if (infinite)
parms->reps = save_reps;
else
free(parms);
parms = next;
}

Expand All @@ -368,3 +389,4 @@ int main(int argc, char **argv) {

return EXIT_SUCCESS;
}