mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-18 00:10:04 +00:00
605108f023
PR: ports/8795 Submitted by: Mikhail Teterin <mi@aldan.ziplink.net> (2) I found another bug: - if (!dsp) do_nothing(); + if (dsp<0) do_nothing(); The bug causes "Program terminated with signal 8, Floating point exception". (3) Typo in pkg/DESCR
134 lines
3.0 KiB
Plaintext
134 lines
3.0 KiB
Plaintext
--- xgal.sndsrv.freebsd.c.orig Wed Mar 31 11:48:40 1999
|
|
+++ xgal.sndsrv.freebsd.c Wed Mar 31 11:48:40 1999
|
|
@@ -19,13 +19,17 @@
|
|
|
|
|
|
|
|
-char *FILENAME[] = {
|
|
+static const char *FILENAME[] = {
|
|
"/explode.raw",
|
|
"/firetorp.raw",
|
|
"/shield.raw",
|
|
"/torphit.raw",
|
|
"/explode_big.raw",
|
|
"/ddloo.raw",
|
|
+/* Two more files are now expected by the xgalaga!
|
|
+\* The order is given in the sound.h -mi */
|
|
+ "/warp.raw",
|
|
+ "/smart.raw"
|
|
};
|
|
|
|
#define NUM_SOUNDS (sizeof(FILENAME)/sizeof(char*))
|
|
@@ -36,17 +40,15 @@
|
|
|
|
|
|
/* Terminate: Signal Handler */
|
|
-void quit ()
|
|
+static void quit ()
|
|
{
|
|
exit (0);
|
|
}
|
|
|
|
-
|
|
-
|
|
-void init (int argc, char **argv)
|
|
+static void init (int argc, char **argv)
|
|
{
|
|
int i;
|
|
- char s[1024];
|
|
+ char s[FILENAME_MAX];
|
|
|
|
if (argc != 3)
|
|
{
|
|
@@ -61,7 +63,7 @@
|
|
if (s[(int)strlen(s) - 1] == '/') FILENAME[i]++;
|
|
strcat (s, FILENAME[i]);
|
|
FILENAME[i] = malloc ((int)strlen (s));
|
|
- strcpy (FILENAME[i],s);
|
|
+ strcpy ((char *)FILENAME[i],s);
|
|
sound_buffer[i]=NULL;
|
|
sound_size[i]=0;
|
|
}
|
|
@@ -77,12 +79,12 @@
|
|
Should set mono mode
|
|
Error checking
|
|
*/
|
|
-int setup_dsp (char *dspdev,int *is_pcsp)
|
|
+static int setup_dsp (char *dspdev,int *is_pcsp)
|
|
{
|
|
int dsp, frag, value;
|
|
int mixer;
|
|
|
|
- dsp = open(dspdev, O_RDWR);
|
|
+ dsp = open(dspdev, O_WRONLY);
|
|
if (dsp < 1)
|
|
{
|
|
fprintf (stderr, "xgal.sndsrv: Couldn't open DSP %s\n",dspdev);
|
|
@@ -133,13 +135,13 @@
|
|
Eventually I'll look at the xgal signal handlers and
|
|
just trap this.
|
|
*/
|
|
-int do_nothing(void)
|
|
+static int do_nothing(void)
|
|
{
|
|
fprintf(stderr,"xgal.sndsrv: doing nothing, something is broken\n");
|
|
while(1) sleep (5);
|
|
}
|
|
|
|
-int read_sound(int k)
|
|
+static int read_sound(int k)
|
|
{
|
|
int i,fd,size;
|
|
|
|
@@ -173,7 +175,7 @@
|
|
}
|
|
|
|
|
|
-void do_everything (int dsp, int is_pcsp)
|
|
+static void do_everything (int dsp, int is_pcsp)
|
|
{
|
|
char k;
|
|
int i, j ;
|
|
@@ -200,8 +202,14 @@
|
|
/*fprintf(stderr,"terminating sound\n");*/ /*DEBUG*/
|
|
terminate = 0;
|
|
} else {
|
|
- if(sound_size[k]==0) read_sound(k);
|
|
- if(sound_size[k]>0 && playnum<16) {
|
|
+ if(k>=NUM_SOUNDS) {
|
|
+ fprintf(stderr,
|
|
+ "Not that many sounds known (%d >= %d)\n",
|
|
+ (int)k, NUM_SOUNDS);
|
|
+ continue;
|
|
+ };
|
|
+ if(sound_size[(int)k]==0) read_sound((int)k);
|
|
+ if(sound_size[(int)k]>0 && playnum<16) {
|
|
position[playnum]=0;
|
|
playing[playnum++]=k;
|
|
/*fprintf(stderr,"sound %d added to play queue\n",playnum-1);*/ /*DEBUG*/
|
|
@@ -251,20 +259,18 @@
|
|
}
|
|
}
|
|
|
|
-
|
|
-
|
|
-void main (argc, argv)
|
|
+int main (argc, argv)
|
|
int argc;
|
|
char **argv;
|
|
{
|
|
- int dsp, is_pcsp, ppid;
|
|
- char filename[512];
|
|
+ int dsp, is_pcsp;
|
|
|
|
fcntl(STDIN_FILENO,F_SETFL,O_NONBLOCK);
|
|
init (argc, argv);
|
|
dsp = setup_dsp (argv[2],&is_pcsp);
|
|
|
|
- if (!dsp) do_nothing();
|
|
+ if (dsp<0) do_nothing();
|
|
|
|
do_everything (dsp, is_pcsp);
|
|
+ return 0;
|
|
}
|