configd-699.1.5.tar.gz

[apple/configd.git] / configd.tproj / configd.m

diff --git a/configd.tproj/configd.m b/configd.tproj/configd.m
index 852c41af6d9c4babc7c354ab295a368436a73e93..c734112cba60aeb1f954981ad9f1dda84676fd73 100644 (file)
--- a/configd.tproj/configd.m
+++ b/configd.tproj/configd.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2011, 2013 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2011, 2013, 2014 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -71,9 +71,6 @@ CFMutableSetRef       _plugins_allowed        = NULL;         /* bundle identifiers to allow when lo
 __private_extern__
 CFMutableSetRef        _plugins_exclude        = NULL;         /* bundle identifiers to exclude from loading */
 
-__private_extern__
-Boolean        _plugins_fork                   = FALSE;        /* TRUE if plugins should be exec'd in their own process */
-
 __private_extern__
 CFMutableSetRef        _plugins_verbose        = NULL;         /* bundle identifiers to enable verbose logging */
 
@@ -85,7 +82,6 @@ static const struct option longopts[] = {
 //     { "no-bundles",         no_argument,            0,      'b' },
 //     { "exclude-plugin",     required_argument,      0,      'B' },
 //     { "no-fork",            no_argument,            0,      'd' },
-//     { "fork-all",           no_argument,            0,      'f' },
 //     { "test-bundle",        required_argument,      0,      't' },
 //     { "verbose",            no_argument,            0,      'v' },
 //     { "verbose-bundle",     required_argument,      0,      'V' },
@@ -245,11 +241,11 @@ fork_child()
                        (void) wait4(child_pid, (int *)&status, 0, 0);
                        if (WIFEXITED(status)) {
                                fprintf(stderr,
-                                       "*** configd (daemon) failed to start, exit status=%d",
+                                       "*** configd (daemon) failed to start, exit status=%d\n",
                                        WEXITSTATUS(status));
                        } else {
                                fprintf(stderr,
-                                       "*** configd (daemon) failed to start, received signal=%d",
+                                       "*** configd (daemon) failed to start, received signal=%d\n",
                                        WTERMSIG(status));
                        }
                        fflush (stderr);
@@ -301,7 +297,7 @@ main(int argc, char * const argv[])
 
        /* process any arguments */
 
-       while ((opt = getopt_long(argc, argv, "A:bB:dt:vV:f", longopts, NULL)) != -1) {
+       while ((opt = getopt_long(argc, argv, "A:bB:dt:vV:", longopts, NULL)) != -1) {
                switch(opt) {
                        case 'A':
                                str = CFStringCreateWithCString(NULL, optarg, kCFStringEncodingMacRoman);
@@ -334,9 +330,6 @@ main(int argc, char * const argv[])
                                        CFRelease(str);
                                }
                                break;
-                       case 'f':
-                               _plugins_fork = TRUE;
-                               break;
                        case '?':
                        default :
                                usage(prog);