Rev 19 | Details | Compare with Previous | Last modification | View Log | RSS feed
Rev | Author | Line No. | Line |
---|---|---|---|
19 | magnus | 1 | Author: Magnus Holmgren <holmgren@debian.org> |
2 | Description: Use hardcoded (and correct for the Debian package) path to ultraftp.jar |
||
3 | if SSVNC_ULTRA_FTP_JAR is unset. |
||
6 | magnus | 4 | |
5 | diff -urNad trunk~/vnc_unixsrc/vncviewer/argsresources.c trunk/vnc_unixsrc/vncviewer/argsresources.c |
||
6 | --- trunk~/vnc_unixsrc/vncviewer/argsresources.c 2009-10-27 04:26:12.000000000 +0100 |
||
7 | +++ trunk/vnc_unixsrc/vncviewer/argsresources.c 2009-10-31 15:22:46.000000000 +0100 |
||
8 | @@ -1624,35 +1624,8 @@ |
||
9 | appData.useBGR233 = 0; |
||
10 | } |
||
11 | |||
12 | - if (getenv("SSVNC_ULTRA_FTP_JAR") == NULL && programName != NULL) { |
||
13 | - int len = strlen(programName) + 200; |
||
14 | - char *q, *jar = (char *) malloc(len); |
||
15 | - |
||
16 | - sprintf(jar, "%s", programName); |
||
17 | - q = strrchr(jar, '/'); |
||
18 | - if (q) { |
||
19 | - struct stat sb; |
||
20 | - *(q+1) = '\0'; |
||
21 | - strcat(jar, "../lib/ssvnc/util/ultraftp.jar"); |
||
22 | - if (stat(jar, &sb) == 0) { |
||
23 | - char *put = (char *) malloc(len); |
||
24 | - sprintf(put, "SSVNC_ULTRA_FTP_JAR=%s", jar); |
||
25 | - fprintf(stderr, "Setting: %s\n\n", put); |
||
26 | - putenv(put); |
||
27 | - } else { |
||
28 | - sprintf(jar, "%s", programName); |
||
29 | - q = strrchr(jar, '/'); |
||
30 | - *(q+1) = '\0'; |
||
31 | - strcat(jar, "util/ultraftp.jar"); |
||
32 | - if (stat(jar, &sb) == 0) { |
||
33 | - char *put = (char *) malloc(len); |
||
34 | - sprintf(put, "SSVNC_ULTRA_FTP_JAR=%s", jar); |
||
35 | - fprintf(stderr, "Setting: %s\n\n", put); |
||
36 | - putenv(put); |
||
37 | - } |
||
38 | - } |
||
39 | - } |
||
40 | - free(jar); |
||
41 | + if (getenv("SSVNC_ULTRA_FTP_JAR") == NULL) { |
||
42 | + putenv("SSVNC_ULTRA_FTP_JAR=/usr/lib/ssvnc/util/ultraftp.jar"); |
||
43 | } |
||
44 | |||
45 |