… | |
… | |
36 | |
36 | |
37 | char *dst = r; |
37 | char *dst = r; |
38 | while (len--) |
38 | while (len--) |
39 | { |
39 | { |
40 | ssize_t l = wcrtomb (dst, *str++, mbs); |
40 | ssize_t l = wcrtomb (dst, *str++, mbs); |
|
|
41 | |
41 | if (l < 0) |
42 | if (l < 0) |
42 | *dst++ = '?'; |
43 | *dst++ = '?'; |
43 | else |
44 | else |
44 | dst += l; |
45 | dst += l; |
45 | } |
46 | } |
… | |
… | |
524 | char *f; |
525 | char *f; |
525 | |
526 | |
526 | if (file == NULL || *file == '\0') |
527 | if (file == NULL || *file == '\0') |
527 | return NULL; |
528 | return NULL; |
528 | |
529 | |
529 | /* search environment variables here too */ |
|
|
530 | if ((f = rxvt_File_search_path (path, file, ext)) == NULL) |
530 | f = rxvt_File_search_path (path, file, ext); |
531 | #ifdef PATH_ENV |
|
|
532 | if ((f = rxvt_File_search_path (getenv (PATH_ENV), file, ext)) == NULL) |
|
|
533 | #endif |
|
|
534 | f = rxvt_File_search_path (getenv ("PATH"), file, ext); |
|
|
535 | |
531 | |
536 | #ifdef DEBUG_SEARCH_PATH |
532 | #ifdef DEBUG_SEARCH_PATH |
537 | if (f) |
533 | if (f) |
538 | fprintf (stderr, "found: \"%s\"\n", f); |
534 | fprintf (stderr, "found: \"%s\"\n", f); |
539 | #endif |
535 | #endif |