| … | |
… | |
| 40 | #include "init.h" |
40 | #include "init.h" |
| 41 | |
41 | |
| 42 | #include <limits> |
42 | #include <limits> |
| 43 | |
43 | |
| 44 | #include <csignal> |
44 | #include <csignal> |
|
|
45 | |
|
|
46 | #ifdef HAVE_XSETLOCALE |
|
|
47 | # define X_LOCALE |
|
|
48 | # include <X11/Xlocale.h> |
|
|
49 | #else |
|
|
50 | # ifdef HAVE_SETLOCALE |
|
|
51 | # include <clocale> |
|
|
52 | # endif |
|
|
53 | #endif |
|
|
54 | |
|
|
55 | #ifdef HAVE_NL_LANGINFO |
|
|
56 | # include <langinfo.h> |
|
|
57 | #endif |
| 45 | |
58 | |
| 46 | #ifdef DISPLAY_IS_IP |
59 | #ifdef DISPLAY_IS_IP |
| 47 | /* On Solaris link with -lsocket and -lnsl */ |
60 | /* On Solaris link with -lsocket and -lnsl */ |
| 48 | #include <sys/types.h> |
61 | #include <sys/types.h> |
| 49 | #include <sys/socket.h> |
62 | #include <sys/socket.h> |
| … | |
… | |
| 356 | break; |
369 | break; |
| 357 | |
370 | |
| 358 | if (r_argc == argc) |
371 | if (r_argc == argc) |
| 359 | cmd_argv = NULL; |
372 | cmd_argv = NULL; |
| 360 | else if (!argv[r_argc + 1]) |
373 | else if (!argv[r_argc + 1]) |
| 361 | rxvt_fatal ("-e requires an argument\n"); |
374 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
| 362 | else |
375 | else |
| 363 | { |
376 | { |
| 364 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
377 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
| 365 | |
378 | |
| 366 | for (i = 0; i < argc - r_argc - 1; i++) |
379 | for (i = 0; i < argc - r_argc - 1; i++) |
| … | |
… | |
| 644 | |
657 | |
| 645 | this->locale = "C"; |
658 | this->locale = "C"; |
| 646 | } |
659 | } |
| 647 | |
660 | |
| 648 | |
661 | |
| 649 | this->locale = rxvt_strdup (this->locale); |
662 | this->locale = strdup (this->locale); |
| 650 | SET_LOCALE (this->locale); |
663 | SET_LOCALE (this->locale); |
| 651 | mbstate.reset (); |
664 | mbstate.reset (); |
| 652 | #endif |
665 | #endif |
| 653 | |
666 | |
| 654 | #if HAVE_NL_LANGINFO |
667 | #if HAVE_NL_LANGINFO |
