Changeset 23324

Timestamp:

08/01/07 08:38:50 (16 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5374857> launchd unnecessarily logs a warning when there is nothing to load in StandardIO

Files:

• trunk/launchd/src/launchctl.c (modified) (2 diffs)

trunk/launchd/src/launchctl.c

@@ -211 +211 @@
 };
 
-static bool istty = false;
-static bool verbose = false;
+static bool istty;
+static bool verbose;
+static bool is_managed;
 
 int
 main(int argc, char *const argv[])
 {
-        int64_t is_managed = 0;
+        int64_t is_managed_val = 0;
         char *l;
 
-        if ((getuid() == 0) && (vproc_swap_integer(NULL, VPROC_GSK_IS_MANAGED, NULL, &is_managed) == NULL) && (is_managed == 0)) {
+        if (vproc_swap_integer(NULL, VPROC_GSK_IS_MANAGED, NULL, &is_managed_val) == NULL && is_managed_val) {
+                is_managed = true;
+        }
+
+        if (getuid() && !is_managed) {
                 mach_port_t root_bs = str2bsport("/");
                 task_set_bootstrap_port(mach_task_self(), root_bs);
@@ -1720 +1725 @@
                         launch_data_array_get_count(lus.pass1) == 0 &&
                         launch_data_array_get_count(lus.pass2) == 0) {
-                fprintf(stderr, "nothing found to %s\n", lus.load ? "load" : "unload");
+                if (!is_managed) {
+                        fprintf(stderr, "nothing found to %s\n", lus.load ? "load" : "unload");
+                }
                 launch_data_free(lus.pass0);
                 launch_data_free(lus.pass1);
                 launch_data_free(lus.pass2);
-                return 1;
+                return is_managed ? 0 : 1;
         }