diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-12-16 09:16:03 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-12-16 09:16:03 +0000 |
| commit | 0793492d8fd4a6bf5183c29ff9aa27e575442283 (patch) | |
| tree | 8027152c634384684bddd66c46c93526761cd520 | |
| parent | 705cda717ee7ae28c490c51ba80b55fcd38fb210 (diff) | |
| download | cygnal-0793492d8fd4a6bf5183c29ff9aa27e575442283.tar.gz cygnal-0793492d8fd4a6bf5183c29ff9aa27e575442283.tar.bz2 cygnal-0793492d8fd4a6bf5183c29ff9aa27e575442283.zip | |
* path.cc (warn_msdos): Slightly reformat.
(find_fast_cwd): Change warning message to urge an update before
reporting the problem.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/path.cc | 24 |
2 files changed, 21 insertions, 9 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 7080b244d..674734426 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2014-12-15 Corinna Vinschen <corinna@vinschen.de> + + * path.cc (warn_msdos): Slightly reformat. + (find_fast_cwd): Change warning message to urge an update before + reporting the problem. + 2014-12-10 Corinna Vinschen <corinna@vinschen.de> * winver.rc (LegalCopyright): Fix belatedly (uh-oh). diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 6a3a889a3..774f6601b 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -524,17 +524,21 @@ warn_msdos (const char *src) return; tmp_pathbuf tp; char *posix_path = tp.c_get (); - small_printf ("cygwin warning:\n"); + small_printf ("Cygwin WARNING:\n"); if (cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_RELATIVE, src, posix_path, NT_MAX_PATH)) - small_printf (" MS-DOS style path detected: %ls\n POSIX equivalent preferred.\n", + small_printf ( +" MS-DOS style path detected: %ls\n POSIX equivalent preferred.\n", src); else - small_printf (" MS-DOS style path detected: %ls\n Preferred POSIX equivalent is: %ls\n", + small_printf ( +" MS-DOS style path detected: %ls\n" +" Preferred POSIX equivalent is: %ls\n", src, posix_path); - small_printf (" CYGWIN environment variable option \"nodosfilewarning\" turns off this warning.\n" - " Consult the user's guide for more details about POSIX paths:\n" - " http://cygwin.com/cygwin-ug-net/using.html#using-pathnames\n"); + small_printf ( +" CYGWIN environment variable option \"nodosfilewarning\" turns off this\n" +" warning. Consult the user's guide for more details about POSIX paths:\n" +" http://cygwin.com/cygwin-ug-net/using.html#using-pathnames\n"); user_shared->warned_msdos = true; } @@ -4204,9 +4208,11 @@ find_fast_cwd () used on the system. */ fcwd_access_t **f_cwd_ptr = find_fast_cwd_pointer (); if (!f_cwd_ptr) - system_printf ("WARNING: Couldn't compute FAST_CWD pointer. " - "Please report this problem to\nthe public mailing " - "list cygwin@cygwin.com"); + small_printf ("Cygwin WARNING:\n" +" Couldn't compute FAST_CWD pointer. This typically occurs if you're using\n" +" an older Cygwin version on a newer Windows. Please update to the latest\n" +" available Cygwin version from https://cygwin.com/. If the problem persists,\n" +" report this problem to the public mailing list cygwin@cygwin.com\n\n"); if (f_cwd_ptr && *f_cwd_ptr) { /* Just evaluate structure version. */ |