Re: Fixing strace and cygcheck so that they work with mount -X

[Michael Schaap <cygwin at mscha dot org>]

On 25-May-2005 2:17, Charles Wilson wrote:

> Michael Schaap wrote:
>
>> Well, now that Chuck has just released a new version of Cygutils, I
>> don't want to have to make him go through another one.  ;-)
>> But next time there is a "proper" change to cygstart, I'll see if I can
>> sneak something in...
>>
>>  - Michael
>>
>> (Hmm, sneaking a Hippo in might be tricky...)
>>
>
> See, this is what happens when I don't keep an eye on you guys.  I go
> off for a while and you guys start trying to slip hippopotami into my
> packages.
>
> Here's what I want to know: whatever happened to otters, dadgummit?
>
Okay, okay, revised patch attached...

 - Michael

--- ORIG/cygstart.c	2005-05-16 22:18:52.000000000 +0200
+++ ./cygstart.c	2005-05-25 18:36:18.186375000 +0200
@@ -40,7 +40,11 @@
 #define MSDN_URL "http://msdn.microsoft.com/library/en-us/shellcc/platform/"; \
                  "Shell/reference/functions/shellexecute.asp"
 
-static const char versionID[] = "1.2";
+/* Hippo and otter URLs */
+#define HIPPO_URL "http://dessent.net/tmp/cyghippo.jpg";
+#define OTTER_URL "http://www.cygwin.com/ml/cygwin/2003-04/png00001.png";
+
+static const char versionID[] = "1.2.hippotter";
 /* for future CVS */
 static const char revID[] =
 	"$Id: cygstart.c,v 1.4 2005/05/16 20:18:52 cwilson Exp $";
@@ -107,7 +111,7 @@
 
     /* Show options */
     struct poptOption showOptionsTable[] = {
-        { "hide",  '\0',  POPT_ARG_NONE, NULL, 'H', \
+        { "hide",  '\0',  POPT_ARG_NONE, NULL, 'i', \
           "Hides the window and activates another window", NULL},
         { "maximize",  '\0',  POPT_ARG_NONE, NULL, 'M', \
           "Maximizes the specified window", NULL},
@@ -135,7 +139,7 @@
         { "shownoactivate",  '\0',  POPT_ARG_NONE, NULL, 'V', \
           "Displays a window in its most recent size and position. The "
           "active window remains active", NULL},
-        { "shownormal",  '\0',  POPT_ARG_NONE, NULL, 'O', \
+        { "shownormal",  '\0',  POPT_ARG_NONE, NULL, 'n', \
           "Activates and displays a window. If the window is minimized or "
           "maximized, Windows restores it to its original size and position. "
           "An application should specify this flag when displaying the window "
@@ -155,6 +159,10 @@
           "Display licensing information", NULL},
         { "reference", '\0', POPT_ARG_NONE, NULL, 'r', \
           "Open MSDN reference for ShellExecute", NULL},
+        { "hippo", 'H', POPT_ARG_NONE, NULL, 'H', \
+          "Show me the Hippo!", NULL},
+        { "otter", 'O', POPT_ARG_NONE, NULL, 'O', \
+          "Show me the Otter!", NULL},
         { NULL, '\0', 0, NULL, 0, NULL, NULL }
     };
 
@@ -226,6 +234,24 @@
                 if (workDir)
                     free(workDir);
                 return(0);
+            case 'H':
+                cygStart(HIPPO_URL, NULL, NULL, NULL, SW_NORMAL);
+                poptFreeContext(optCon);
+                free(program_name);
+                if (action)
+                    free(action);
+                if (workDir)
+                    free(workDir);
+                return(0);
+            case 'O':
+                cygStart(OTTER_URL, NULL, NULL, NULL, SW_NORMAL);
+                poptFreeContext(optCon);
+                free(program_name);
+                if (action)
+                    free(action);
+                if (workDir)
+                    free(workDir);
+                return(0);
 
             /* Action options */
             case 'a':
@@ -280,7 +306,7 @@
                 break;
 
             /* Show options */
-            case 'H':
+            case 'i':
                 show = SW_HIDE;
                 break;
             case 'M':
@@ -310,7 +336,7 @@
             case 'V':
                 show = SW_SHOWNOACTIVATE;
                 break;
-            case 'O':
+            case 'n':
                 show = SW_SHOWNORMAL;
                 break;
         }
@@ -471,6 +497,7 @@
 {
     fprintf(f, "\n");
     fprintf(f, "With thanks to MSDN: <%s>\n\n", MSDN_URL);
+    fprintf(f, "No hippopotami or otters were hurt in the production of this software.\n\n");
     fprintf(f, "Please report any bugs to <cygwin(at)cygwin.com>.\n");
 }