cd_linux.c: whitespace.

quakefs.c: -game n[,n ...] support.
snd_oss.c: Compilation support for OSS on BSD systems.

source/cd_linux.c

@@ -67,8 +67,8 @@ static void CDAudio_Eject(void)
 	if (cdfile == -1 || !enabled)
 		return; // no cd init'd
 
-	if ( ioctl(cdfile, CDROMEJECT) == -1 ) 
+	if (ioctl (cdfile, CDROMEJECT) == -1 ) 
-		Con_DPrintf("ioctl cdromeject failed\n");
+		Con_DPrintf ("ioctl cdromeject failed\n");
 }
 
 

source/quakefs.c

@@ -1038,7 +1038,18 @@ COM_InitFilesystem ( void )
 	}
 
 	if ((i = COM_CheckParm ("-game")) && i < com_argc - 1) {
-		COM_CreateGameDirectory(com_argv[i+1]);
+		char *gamedirs = NULL;
+		char *where;
+
+		gamedirs = strdup (com_argv[i+1]);
+		where = strtok (gamedirs, ",");
+		while (where) {
+			where = strtok (NULL, ",");
+			if (where) {
+				COM_CreateGameDirectory (where);
+			}
+		}
+		free (gamedirs);
 	}		
 
 	// any set gamedirs will be freed up to here

source/snd_oss.c

@@ -29,17 +29,31 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <sys/shm.h>
 #include <sys/wait.h>
-#include <linux/soundcard.h>
 #include <stdio.h>
 
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+#endif
+
+#if defined HAVE_SYS_SOUNDCARD_H
+# include <sys/soundcard.h>
+#elif defined HAVE_LINUX_SOUNDCARD_H
+# include <linux/soundcard.h>
+#elif HAVE_MACHINE_SOUNDCARD_H
+# include <machine/soundcard.h>
+#endif
+
 #include "console.h"
 #include "qargs.h"
 #include "sound.h"
@@ -54,9 +68,9 @@ int snd_inited;
 
 static int tryrates[] = { 11025, 22051, 44100, 8000 };
 
-qboolean SNDDMA_Init(void)
+qboolean
+SNDDMA_Init(void)
 {
-
 	int rc;
 	int fmt;
 	int tmp;
@@ -151,7 +165,8 @@ qboolean SNDDMA_Init(void)
 
 	shm->buffer = (unsigned char *) mmap(NULL, info.fragstotal
 		* info.fragsize, PROT_READ|PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0);
-	if (!shm->buffer || shm->buffer == MAP_FAILED) {
+
+	if (shm->buffer == MAP_FAILED) {
 		perror("/dev/dsp");
 		Con_Printf("Could not mmap /dev/dsp\n");
 		close(audio_fd);
@@ -162,53 +177,45 @@ qboolean SNDDMA_Init(void)
 	if (shm->channels == 2)
 		tmp = 1;
 	rc = ioctl(audio_fd, SNDCTL_DSP_STEREO, &tmp);
-    if (rc < 0)
+	if (rc < 0) {
-    {
 		perror("/dev/dsp");
 		Con_Printf("Could not set /dev/dsp to stereo=%d", shm->channels);
 		close(audio_fd);
 		return 0;
 	}
+	
 	if (tmp)
 		shm->channels = 2;
 	else
 		shm->channels = 1;
 
 	rc = ioctl(audio_fd, SNDCTL_DSP_SPEED, &shm->speed);
-    if (rc < 0)
+	if (rc < 0) {
-    {
 		perror("/dev/dsp");
 		Con_Printf("Could not set /dev/dsp speed to %d", shm->speed);
 		close(audio_fd);
 		return 0;
 	}
 
-    if (shm->samplebits == 16)
+	if (shm->samplebits == 16) {
-    {
 		rc = AFMT_S16_LE;
 		rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc);
-        if (rc < 0)
+		if (rc < 0) {
-		{
 			perror("/dev/dsp");
 			Con_Printf("Could not support 16-bit data.  Try 8-bit.\n");
 			close(audio_fd);
 			return 0;
 		}
-    }
+	} else if (shm->samplebits == 8) {
-    else if (shm->samplebits == 8)
-    {
 		rc = AFMT_U8;
 		rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc);
-        if (rc < 0)
+		if (rc < 0) {
-		{
 			perror("/dev/dsp");
 			Con_Printf("Could not support 8-bit data.\n");
 			close(audio_fd);
 			return 0;
 		}
-    }
+	} else {
-	else
-	{
 		perror("/dev/dsp");
 		Con_Printf("%d-bit sound not supported.", shm->samplebits);
 		close(audio_fd);
@@ -219,8 +226,7 @@ qboolean SNDDMA_Init(void)
 
 	tmp = 0;
 	rc  = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
-	if (rc < 0)
+	if (rc < 0) {
-	{
 		perror("/dev/dsp");
 		Con_Printf("Could not toggle.\n");
 		close(audio_fd);
@@ -228,8 +234,7 @@ qboolean SNDDMA_Init(void)
 	}
 	tmp = PCM_ENABLE_OUTPUT;
 	rc = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
-	if (rc < 0)
+	if (rc < 0) {
-	{
 		perror("/dev/dsp");
 		Con_Printf("Could not toggle.\n");
 		close(audio_fd);