loader/loader.cpp
changeset 869 77495cf8aa58
parent 868 09e446e57deb
child 896 0f4ca0bedc67
     1.1 --- a/loader/loader.cpp	Thu Oct 24 13:24:31 2013 -0400
     1.2 +++ b/loader/loader.cpp	Thu Oct 24 13:30:44 2013 -0400
     1.3 @@ -235,31 +235,30 @@
     1.4  
     1.5  #elif defined __linux__
     1.6  	FILE *pFile = fopen("/proc/self/cmdline", "rb");
     1.7 -	if (!pFile)
     1.8 -		return false;
     1.9 -
    1.10 -	char *arg = NULL;
    1.11 -	size_t argsize = 0;
    1.12 -	bool bNextIsGame = false;
    1.13 +	if (pFile)
    1.14 +	{
    1.15 +		char *arg = NULL;
    1.16 +		size_t argsize = 0;
    1.17 +		bool bNextIsGame = false;
    1.18  
    1.19 -	while (getdelim(&arg, &argsize, 0, pFile) != -1)
    1.20 -	{
    1.21 -		if (bNextIsGame)
    1.22 +		while (getdelim(&arg, &argsize, 0, pFile) != -1)
    1.23  		{
    1.24 -			strncpy(buffer, arg, size);
    1.25 -			buffer[size-1] = '\0';
    1.26 -			break;
    1.27 +			if (bNextIsGame)
    1.28 +			{
    1.29 +				strncpy(buffer, arg, size);
    1.30 +				buffer[size-1] = '\0';
    1.31 +				break;
    1.32 +			}
    1.33 +
    1.34 +			if (strcmp(arg, "-game") == 0)
    1.35 +			{
    1.36 +				bNextIsGame = true;
    1.37 +			}
    1.38  		}
    1.39  
    1.40 -		if (strcmp(arg, "-game") == 0)
    1.41 -		{
    1.42 -			bNextIsGame = true;
    1.43 -		}
    1.44 +		free(arg);
    1.45 +		fclose(pFile);
    1.46  	}
    1.47 -
    1.48 -	free(arg);
    1.49 -	fclose(pFile);
    1.50 -
    1.51  #else
    1.52  #error unsupported platform
    1.53  #endif