]> git.deb.at Git - pkg/beep.git/blob - debian/patches/03_multiple-freq
Imported Debian patch 1.2.2-22
[pkg/beep.git] / debian / patches / 03_multiple-freq
1 Index: beep-1.2.2/beep.c
2 ===================================================================
3 --- beep-1.2.2.orig/beep.c
4 +++ beep-1.2.2/beep.c
5 @@ -159,6 +159,9 @@ void parse_command_line(int argc, char *
6          (argfreq <= 0))
7         usage_bail(argv[0]);
8        else
9 +       if (result->freq != 0)
10 +         fprintf(stderr, "WARNING: multiple -f values given, only last "
11 +           "one is used.\n");
12         result->freq = argfreq;    
13        break;
14      case 'l' : /* length */
15 @@ -201,8 +204,10 @@ void parse_command_line(int argc, char *
16        exit(0);
17        break;
18      case 'n' : /* also --new - create another beep */
19 +      if (result->freq == 0)
20 +       result->freq = DEFAULT_FREQ;
21        result->next = (beep_parms_t *)malloc(sizeof(beep_parms_t));
22 -      result->next->freq       = DEFAULT_FREQ;
23 +      result->next->freq       = 0;
24        result->next->length     = DEFAULT_LENGTH;
25        result->next->reps       = DEFAULT_REPS;
26        result->next->delay      = DEFAULT_DELAY;
27 @@ -220,6 +225,8 @@ void parse_command_line(int argc, char *
28        usage_bail(argv[0]);
29      }
30    }
31 +  if (result->freq == 0)
32 +    result->freq = DEFAULT_FREQ;
33  }  
34  
35  void play_beep(beep_parms_t parms) {
36 @@ -260,7 +267,7 @@ int main(int argc, char **argv) {
37    char sin[4096], *ptr;
38    
39    beep_parms_t *parms = (beep_parms_t *)malloc(sizeof(beep_parms_t));
40 -  parms->freq       = DEFAULT_FREQ;
41 +  parms->freq       = 0;
42    parms->length     = DEFAULT_LENGTH;
43    parms->reps       = DEFAULT_REPS;
44    parms->delay      = DEFAULT_DELAY;