diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2010-08-23 11:04:04 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2010-08-23 11:04:04 +0000 |
| commit | 16e1c98c1b2da660e052b64d1255fe68b8219a89 (patch) | |
| tree | a85e7522393507862b45f1f9bfc5a1e43c10808a | |
| parent | 59ecc5766c34a317e914e09bb94c894e645a3b14 (diff) | |
| download | cygnal-16e1c98c1b2da660e052b64d1255fe68b8219a89.tar.gz cygnal-16e1c98c1b2da660e052b64d1255fe68b8219a89.tar.bz2 cygnal-16e1c98c1b2da660e052b64d1255fe68b8219a89.zip | |
* ldd.cc (report): Drop long pathname considerations which result in
invalid path, now that this is done in cygwin_conv_path.
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/ldd.cc | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 5878bebac..824c19b88 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2010-08-21 Corinna Vinschen <corinna@vinschen.de> + + * ldd.cc (report): Drop long pathname considerations which result in + invalid path, now that this is done in cygwin_conv_path. + 2010-08-13 Corinna Vinschen <corinna@vinschen.de> * mount.cc (from_fstab): Fix potentially fatal typo. diff --git a/winsup/utils/ldd.cc b/winsup/utils/ldd.cc index 7dc8216da..073c40bcb 100644 --- a/winsup/utils/ldd.cc +++ b/winsup/utils/ldd.cc @@ -274,16 +274,9 @@ report (const char *in_fn, bool multiple) print_errno_error_and_return (fn); bool isdll; - wchar_t fn_win_buf[len + 1]; - if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, fn, fn_win_buf, len)) + wchar_t fn_win[len + 1]; + if (cygwin_conv_path (CCP_POSIX_TO_WIN_W, fn, fn_win, len)) print_errno_error_and_return (fn); - wchar_t *fn_win = fn_win_buf + 4; - - if (wcsncmp (fn_win_buf, L"\\\\?\\UNC\\", 8) == 0) - { - fn_win += 2; - *fn_win = L'\\'; - } if (!fn || start_process (fn_win, isdll)) print_errno_error_and_return (in_fn); |