Revert "oosplash - daemonize to help mutt users recover their sanity"

For one, it leaves detached oosplash processes behind (the forked oosplash
instance waits for the soffice.bin child forked from the original oosplash
instance in vain).  For another, it makes unavailable the soffice.bin exit code.

This reverts commits aacf55db and
62ebb119.

desktop/unx/source/args.c

@@ -48,33 +48,29 @@ static struct {
     unsigned int  bInhibitSplash : 1;
     unsigned int  bInhibitPagein : 1;
     unsigned int  bInhibitJavaLdx : 1;
-    unsigned int  bInhibitDemon : 1;
     const char   *pPageinType;
 } pArgDescr[] = {
     /* have a trailing argument */
-    { "pt",         1, 0, 0, 0, 0, NULL },
-    { "display",    1, 0, 0, 0, 0, NULL },
+    { "pt",         1, 0, 0, 0, NULL },
+    { "display",    1, 0, 0, 0, NULL },
 
     /* no splash */
-    { "nologo",     0, 1, 0, 0, 0, NULL },
-    { "headless",   0, 1, 0, 0, 0, NULL },
-    { "invisible",  0, 1, 0, 0, 0, NULL },
-    { "minimized",  0, 1, 0, 0, 0, NULL },
+    { "nologo",     0, 1, 0, 0, NULL },
+    { "headless",   0, 1, 0, 0, NULL },
+    { "invisible",  0, 1, 0, 0, NULL },
+    { "minimized",  0, 1, 0, 0, NULL },
 
     /* pagein bits */
-    { "writer",     0, 0, 0, 0, 0, "pagein-writer"  },
-    { "calc",       0, 0, 0, 0, 0, "pagein-calc"    },
-    { "draw",       0, 0, 0, 0, 0, "pagein-draw"    },
-    { "impress",    0, 0, 0, 0, 0, "pagein-impress" },
+    { "writer",     0, 0, 0, 0, "pagein-writer"  },
+    { "calc",       0, 0, 0, 0, "pagein-calc"    },
+    { "draw",       0, 0, 0, 0, "pagein-draw"    },
+    { "impress",    0, 0, 0, 0, "pagein-impress" },
 
     /* nothing much */
-    { "version",    0, 1, 1, 1, 0, NULL },
-    { "help",       0, 1, 1, 1, 0, NULL },
-    { "h",          0, 1, 1, 1, 0, NULL },
-    { "?",          0, 1, 1, 1, 0, NULL },
-
-    /* UNO remote controlled process */
-    { "accept",     0, 0, 0, 0, 1, NULL },
+    { "version",    0, 1, 1, 1, NULL },
+    { "help",       0, 1, 1, 1, NULL },
+    { "h",          0, 1, 1, 1, NULL },
+    { "?",          0, 1, 1, 1, NULL },
 };
 
 Args *args_parse (void)
@@ -135,7 +131,6 @@ Args *args_parse (void)
                 args->bInhibitSplash  |= pArgDescr[j].bInhibitSplash;
                 args->bInhibitPagein  |= pArgDescr[j].bInhibitPagein;
                 args->bInhibitJavaLdx |= pArgDescr[j].bInhibitJavaLdx;
-                args->bInhibitDemon   |= pArgDescr[j].bInhibitDemon;
                 if (pArgDescr[j].pPageinType)
                     args->pPageinType = pArgDescr[j].pPageinType;
             }

desktop/unx/source/args.h

@@ -38,7 +38,6 @@ typedef struct {
   sal_Bool     bInhibitSplash;  // should we show a splash screen
   sal_Bool     bInhibitPagein;  // should we run pagein ?
   sal_Bool     bInhibitJavaLdx; // should we run javaldx ?
-  sal_Bool     bInhibitDemon;   // we want to match the lifecycle of soffice.bin
 
   sal_uInt32   nArgsEnv;        // number of -env: style args
   sal_uInt32   nArgsTotal;      // number of -env: as well as -writer style args

desktop/unx/source/start.c

@@ -882,13 +882,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
                     splash_destroy(splash);
                     splash = NULL;
                     bShortWait = sal_False;
-
-                    if (!args->bInhibitDemon)
-                    {
-                        /* Since a client can't distinguish between a first-start and
-                           a factory re-use, we return control to them here. */
-                        daemon( 1 /* don't chdir */, 1 /* don't re-direct output */ );
-                    }
                 }
 
 #if OSL_DEBUG_LEVEL > 1