fixup! Rename dll from cygwin to msys

Rename various log/errors messages back from msys to cygwin.
msys2 · Jul 9, 2024 · 7484c55 · 7484c55
1 parent 445e3ed
commit 7484c55
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
@@ -388,12 +388,12 @@ check_sanity_and_sync (per_process *p)
 
   /* magic_biscuit must be SIZEOF_PER_PROCESS.  */
   if (p->magic_biscuit != SIZEOF_PER_PROCESS)
-    api_fatal ("Incompatible msys .dll -- incompatible per_process info %u != %u",
+    api_fatal ("Incompatible cygwin .dll -- incompatible per_process info %u != %u",
 	       p->magic_biscuit, SIZEOF_PER_PROCESS);
 
   /* Complain if incompatible API changes made */
   if (p->api_major > cygwin_version.api_major)
-    api_fatal ("msys DLL and APP are out of sync -- API version mismatch %u > %u",
+    api_fatal ("cygwin DLL and APP are out of sync -- API version mismatch %u > %u",
 	       p->api_major, cygwin_version.api_major);
 }
 

diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
@@ -194,7 +194,7 @@ pinfo::maybe_set_exit_code_from_windows ()
       GetExitCodeProcess (hProcess, &x);
       set_exit_code (x);
     }
-  sigproc_printf ("pid %d, exit value - old %y, windows %y, MSYS %y",
+  sigproc_printf ("pid %d, exit value - old %y, windows %y, cygwin %y",
 		  self->pid, oexitcode, x, self->exitcode);
 }
 

diff --git a/winsup/cygwin/pseudo-reloc.cc b/winsup/cygwin/pseudo-reloc.cc
@@ -85,7 +85,7 @@ __report_error (const char *msg, ...)
   char buf[128];
   char *posix_module = NULL;
   static const char UNKNOWN_MODULE[] = "<unknown module>: ";
-  static const char CYGWIN_FAILURE_MSG[] = "MSYS runtime failure: ";
+  static const char CYGWIN_FAILURE_MSG[] = "Cygwin runtime failure: ";
   HANDLE errh = GetStdHandle (STD_ERROR_HANDLE);
   va_list args;
 

diff --git a/winsup/testsuite/winsup.api/cygload.cc b/winsup/testsuite/winsup.api/cygload.cc
@@ -152,7 +152,7 @@ cygwin::connector::connector (const char *dll)
   if ((_library = LoadLibrary (dll)) == NULL)
     throw windows_error ("LoadLibrary", dll);
 
-  *out << "Initializing msys..." << endl;
+  *out << "Initializing cygwin..." << endl;
 
   // This calls dcrt0.cc:msys_dll_init(), which calls dll_crt0_1(),
   // which will, among other things:

diff --git a/winsup/utils/mingw/cygcheck.cc b/winsup/utils/mingw/cygcheck.cc
@@ -558,7 +558,7 @@ static void
 cygwin_info (HANDLE h)
 {
   char *buf, *bufend, *buf_start = NULL;
-  const char *hello = "    Msys DLL version info:\n";
+  const char *hello = "    Cygwin DLL version info:\n";
   DWORD size = GetFileSize (h, NULL);
   DWORD n;
 
@@ -1290,7 +1290,7 @@ dump_sysinfo_services ()
 
   /* inform the user if nothing found */
   if (no_services)
-    puts ("No Msys services found.\n");
+    puts ("No Cygwin services found.\n");
 }
 
 enum handle_reg_t
@@ -1305,7 +1305,7 @@ handle_reg_installation (handle_reg_t what)
   HKEY key;
 
   if (what == PRINT_KEY)
-    printf ("Msys installations found in the registry:\n");
+    printf ("Cygwin installations found in the registry:\n");
   for (int i = 0; i < 2; ++i)
     if (RegOpenKeyEx (i ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE,
 		      "SOFTWARE\\Msys\\Installations", 0,
@@ -1404,7 +1404,7 @@ dump_sysinfo ()
       _wputenv (comspec);
     }
 
-  printf ("\nMsys Configuration Diagnostics\n");
+  printf ("\nCygwin Configuration Diagnostics\n");
   time (&now);
   printf ("Current System Time: %s\n", ctime (&now));
 
@@ -1732,7 +1732,7 @@ dump_sysinfo ()
 
 
   if (givehelp)
-    printf ("Here's some environment variables that may affect msys:\n");
+    printf ("Here's some environment variables that may affect cygwin:\n");
   for (i = 0; environ[i]; i++)
     {
       char *eq = strchr (environ[i], '=');
@@ -1960,7 +1960,7 @@ dump_sysinfo ()
   printf ("\n");
 
   if (givehelp)
-    printf ("Looking for various Msys DLLs...  (-v gives version info)\n");
+    printf ("Looking for various Cygwin DLLs...  (-v gives version info)\n");
   int cygwin_dll_count = 0;
   char cygdll_path[32768];
   for (pathlike *pth = paths; pth->dir; pth++)
@@ -2992,8 +2992,8 @@ static char opts[] = "cdnsrvkfliephV";
 static void
 print_version ()
 {
-  printf ("cygcheck (msys) %d.%d.%d\n"
-	  "System Checker for Msys\n"
+  printf ("cygcheck (cygwin) %d.%d.%d\n"
+	  "System Checker for Cygwin\n"
 	  "Copyright (C) 1998 - %s Cygwin Authors\n"
 	  "This is free software; see the source for copying conditions.  "
 	  "There is NO\n"

diff --git a/winsup/utils/mingw/strace.cc b/winsup/utils/mingw/strace.cc
@@ -835,7 +835,7 @@ dotoggle (pid_t pid)
   child_pid = (DWORD) cygwin_internal (CW_CYGWIN_PID_TO_WINPID, pid);
   if (!child_pid)
     {
-      warn (0, "no such msys pid - %d", pid);
+      warn (0, "no such cygwin pid - %d", pid);
       child_pid = pid;
     }
   if (cygwin_internal (CW_STRACE_TOGGLE, child_pid))