| | 1 | --- src/emacs.c.orig 2011-01-09 02:45:14.000000000 +0900 |
| | 2 | +++ src/emacs.c 2011-09-09 23:13:44.000000000 +0900 |
| | 3 | @@ -23,6 +23,8 @@ |
| | 4 | #include <signal.h> |
| | 5 | #include <errno.h> |
| | 6 | #include <stdio.h> |
| | 7 | +#include <stdlib.h> |
| | 8 | +#include <string.h> |
| | 9 | |
| | 10 | #include <sys/types.h> |
| | 11 | #include <sys/file.h> |
| | 12 | @@ -839,6 +841,25 @@ |
| | 13 | #ifdef DARWIN_OS |
| | 14 | if (!initialized) |
| | 15 | unexec_init_emacs_zone (); |
| | 16 | + |
| | 17 | + /* Imaxima won't work properly if PATH does not contain the |
| | 18 | + MacPorts directory. The following code is a workaround to |
| | 19 | + avoid this problem. */ |
| | 20 | + { |
| | 21 | + char *oldpath = getenv("PATH"); |
| | 22 | + if (!oldpath) {oldpath = "";} |
| | 23 | + size_t oldpathsize = strlen(oldpath)+1; |
| | 24 | + if (!strstr(oldpath, "__PREFIX__/bin")) { |
| | 25 | + char *newpath; |
| | 26 | + size_t newpathsize = oldpathsize + strlen("__PREFIX__/bin:"); |
| | 27 | + if ((newpath = (char *)malloc(newpathsize)) != NULL) { |
| | 28 | + strlcpy(newpath, "__PREFIX__/bin:", newpathsize); |
| | 29 | + strlcat(newpath, oldpath, newpathsize); |
| | 30 | + setenv("PATH", newpath, 1); |
| | 31 | + free(newpath); |
| | 32 | + } |
| | 33 | + } |
| | 34 | + } |
| | 35 | #endif |
| | 36 | |
| | 37 | sort_args (argc, argv); |
