| DRC | 3b9ecdf | 2011-02-16 20:30:28 +0000 | [diff] [blame] | 1 | Only in b/xkb: ._xkbInit.c |
| 2 | diff -r -C2 a/xkb/xkbInit.c b/xkb/xkbInit.c |
| 3 | *** a/xkb/xkbInit.c 2011-02-16 14:07:03.000000000 -0600 |
| 4 | --- b/xkb/xkbInit.c 2011-02-16 14:08:08.000000000 -0600 |
| 5 | *************** |
| 6 | *** 875,879 **** |
| 7 | --- 875,900 ---- |
| 8 | } |
| 9 | return j; |
| 10 | + } else if (strncmp(argv[i], "-xkbcompdir", 11)==0) { |
| 11 | + if (++i < argc) { |
| 12 | + #if !defined(WIN32) && !defined(__CYGWIN__) |
| 13 | + if (getuid() != geteuid()) { |
| 14 | + LogMessage(X_WARNING, "-xkbdir is not available for setuid X servers\n"); |
| 15 | + return -1; |
| 16 | + } else |
| 17 | + #endif |
| 18 | + { |
| 19 | + if (strlen(argv[i]) < PATH_MAX) { |
| 20 | + XkbBinDirectory = argv[i]; |
| 21 | + return 2; |
| 22 | + } else { |
| 23 | + LogMessage(X_ERROR, "-xkbcompdir pathname too long\n"); |
| 24 | + return -1; |
| 25 | + } |
| 26 | + } |
| 27 | + } else { |
| 28 | + return -1; |
| 29 | + } |
| 30 | } |
| 31 | + |
| 32 | if ((strcmp(argv[i], "-ardelay") == 0) || |
| 33 | (strcmp (argv[i], "-ar1") == 0)) { /* -ardelay int */ |