Changeset 759 for branches/eraser6/Eraser/Program.cs

Timestamp:

12/9/2008 8:40:30 AM (5 years ago)

Author:

lowjoel

Message:

-Replace the Eraser program entry points with those that retunr ints for statuses to be returned to the shell extension
-Create a default constructor for the Handle class to allow for the initialisation of NULL handles
-Factor out the string formatting code to the FormatString? function. Allows for reuse later on
-Replace all new[]'s and selete[]'s with std::vector as the buffer to prevent memory leaks
-Implemented error checking when the Eraser binary is called from the shell extension. If the process returns an error status, we must be sure to read the output pipe for the error and display it to the user.

File:

• branches/eraser6/Eraser/Program.cs (modified) (5 diffs)

branches/eraser6/Eraser/Program.cs

@@ -41 +41 @@
         /// </summary>
         [STAThread]
-        static void Main(string[] commandLine)
+        static int Main(string[] commandLine)
         {
             //Trivial case: no command parameters
@@ -57 +57 @@
                 else
                 {
-                    CommandMain(commandLine);
+                    return CommandMain(commandLine);
                 }
             }
@@ -63 +63 @@
             //The other trivial case: definitely a console application.
             else
-                CommandMain(commandLine);
+                return CommandMain(commandLine);
+
+            //No error.
+            return 0;
         }
 
@@ -70 +73 @@
         /// </summary>
         /// <param name="commandLine">The command line parameters passed to Eraser.</param>
-        private static void CommandMain(string[] commandLine)
+        private static int CommandMain(string[] commandLine)
         {
             //True if the user specified a quiet command.
@@ -82 +85 @@
                 using (ManagerLibrary library = new ManagerLibrary(new Settings()))
                     program.Run();
+
+                return 1;
             }
             catch (Exception e)