diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2001-08-11 06:28:31 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2001-08-11 06:28:31 +0000 |
| commit | dd0f4c7acf8495607c953b28198b86ad56e5232c (patch) | |
| tree | f2807990bb3f042175f1159bf3ffc8d8ab2cb270 /audio/fmio/files | |
| parent | d4084bdd117964ad6d6567cc5794bd3c4318f520 (diff) | |
Notes
Diffstat (limited to 'audio/fmio/files')
| -rw-r--r-- | audio/fmio/files/patch-Makefile | 11 | ||||
| -rw-r--r-- | audio/fmio/files/patch-mixer.c | 37 |
2 files changed, 48 insertions, 0 deletions
diff --git a/audio/fmio/files/patch-Makefile b/audio/fmio/files/patch-Makefile new file mode 100644 index 000000000000..b91a2267e553 --- /dev/null +++ b/audio/fmio/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig Wed Apr 4 07:10:07 2001 ++++ Makefile Fri Aug 10 23:25:54 2001 +@@ -26,7 +26,7 @@ + install: lib fmio man + install -d -o root -g bin $(PREFIX)/bin + install -d -o root -g wheel $(PREFIX)/man/man1 +- install -c -s -o root -g bin -m 4555 fmio $(PREFIX)/bin/fmio ++ install -c -s -o root -g bin -m 555 fmio $(PREFIX)/bin/fmio + install -c -o root -g bin -m 444 fmio.0 $(PREFIX)/man/cat1/fmio.0 + + deinstall: diff --git a/audio/fmio/files/patch-mixer.c b/audio/fmio/files/patch-mixer.c new file mode 100644 index 000000000000..5550b10af99f --- /dev/null +++ b/audio/fmio/files/patch-mixer.c @@ -0,0 +1,37 @@ +--- mixer.c.orig Mon Apr 2 23:12:21 2001 ++++ mixer.c Fri Aug 10 23:22:04 2001 +@@ -49,6 +49,8 @@ + static int num_channels; + #endif /* __OpenBSD__ || __NetBSD__ */ + ++#define MIN(a, b) ((a) < (b) ? (a) : (b)) ++ + static unsigned int volume; + + static int +@@ -167,7 +169,7 @@ + break; + } + } else { +- fprintf(stderr, "Bad numbers %s", q); ++ fprintf(stderr, "Bad numbers %s\n", q); + return -1; + } + } +@@ -298,9 +300,13 @@ + int devlen, dev_volume; + + devlen = strcspn(vol, "="); +- strncpy(dev, vol, devlen); +- strncpy(val, &vol[devlen+1], strlen(vol)-devlen-1); +- ++ if (devlen == strlen(vol)) { ++ fprintf(stderr, "invalid volume specifier %s\n", vol); ++ return -1; ++ } ++ strlcpy(dev, vol, MIN(devlen + 1, sizeof(dev))); ++ strlcpy(val, &vol[devlen+1], MIN(strlen(vol)-devlen, sizeof(val))); ++ + #if defined (__OpenBSD__) || (__NetBSD__) + + for ( ndev = 0 ; ; ndev++ ) { |