r1266 - trunk/code/client

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2008-02-16 17:57:45 -0500 (Sat, 16 Feb 2008)
New Revision: 1266

Modified:
   trunk/code/client/cl_curl.c
Log:
Fall back to libcurl.so.4 or libcurl.so.4 if the default symlink does not exist.


Modified: trunk/code/client/cl_curl.c
===================================================================
--- trunk/code/client/cl_curl.c	2008-02-16 22:23:47 UTC (rev 1265)
+++ trunk/code/client/cl_curl.c	2008-02-16 22:57:45 UTC (rev 1266)
@@ -100,13 +100,28 @@
 		return qfalse;
 #else
 		char fn[1024];
-		Q_strncpyz( fn, Sys_Cwd( ), sizeof( fn ) );
-		strncat(fn, "/", sizeof(fn)-strlen(fn)-1);
-		strncat(fn, cl_cURLLib->string, sizeof(fn)-strlen(fn)-1);
 
-		if( (cURLLib = Sys_LoadLibrary(fn)) == 0 )
+		// On some linux distributions there is no libcurl.so symlink, but only libcurl.so.4
+
+		Q_strncpyz(fn, cl_cURLLib->string, sizeof(fn));
+		strncat(fn, ".4", sizeof(fn)-strlen(fn)-1);
+
+		if((cURLLib = Sys_LoadLibrary(fn)) == 0)
 		{
-			return qfalse;
+			Q_strncpyz(fn, cl_cURLLib->string, sizeof(fn));
+			strncat(fn, ".3", sizeof(fn)-strlen(fn)-1);
+
+			if((cURLLib = Sys_LoadLibrary(fn)) == 0)
+			{
+				Q_strncpyz( fn, Sys_Cwd( ), sizeof( fn ) );
+				strncat(fn, "/", sizeof(fn)-strlen(fn)-1);
+				strncat(fn, cl_cURLLib->string, sizeof(fn)-strlen(fn)-1);
+
+				if( (cURLLib = Sys_LoadLibrary(fn)) == 0 )
+				{
+					return qfalse;
+				}
+			}
 		}
 #endif /* _WIN32 */
 	}