Changeset 23303

Timestamp:

07/11/07 11:10:33 (17 months ago)

Author:

zarzycki@…

Message:

Misc fixes.

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (11 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -168 +168 @@
 static void socketgroup_callback(job_t j);
 static void socketgroup_setup(launch_data_t obj, const char *key, void *context);
+static void socketgroup_kevent_mod(job_t j, struct socketgroup *sg, bool do_add);
 
 struct calendarinterval {
@@ -181 +182 @@
 static bool calendarinterval_new(job_t j, struct tm *w);
 static bool calendarinterval_new_from_obj(job_t j, launch_data_t obj);
+static void calendarinterval_new_from_obj_dict_walk(launch_data_t obj, const char *key, void *context);
 static void calendarinterval_delete(job_t j, struct calendarinterval *ci);
 static void calendarinterval_setalarm(job_t j, struct calendarinterval *ci);
@@ -403 +405 @@
 static void job_log_error(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4)));
 static void job_log_bug(job_t j, const char *rcs_rev, const char *path, unsigned int line, const char *test);
+static void job_log_stdouterr2(job_t j, const char *msg, ...);
 static void job_set_exeception_port(job_t j, mach_port_t port);
 static kern_return_t job_handle_mpm_wait(job_t j, mach_port_t srp, int *waitstatus);
@@ -430 +433 @@
 static bool cronemu_min(struct tm *wtm, int min);
 
-static unsigned int total_children;
+/* miscellaneous file local functions */
 static void ensure_root_bkgd_setup(void);
 static int dir_has_files(job_t j, const char *path);
 static char **mach_cmd2argv(const char *string);
 static size_t our_strhash(const char *s) __attribute__((pure));
+static void extract_rcsid_substr(const char *i, char *o, size_t osz);
+static void do_first_per_user_launchd_hack(void);
+
+/* file local globals */
+static unsigned int total_children;
 static mach_port_t the_exception_server;
 static bool did_first_per_user_launchd_BootCache_hack;
-
+static jobmgr_t background_jobmgr;
+
+/* process wide globals */
 jobmgr_t root_jobmgr;
-static jobmgr_t background_jobmgr;
 
 void
@@ -2003 +2012 @@
 }
 
-static void
+void
 job_log_stdouterr2(job_t j, const char *msg, ...)
 {
@@ -2353 +2362 @@
 }
 
-static void
+void
 do_first_per_user_launchd_hack(void)
 {
@@ -2813 +2822 @@
 }
 
-static void
+void
 extract_rcsid_substr(const char *i, char *o, size_t osz)
 {
@@ -2994 +3003 @@
         int fflags = 0;
         
+        strlcpy(parentdir_path, dirname(si->what), sizeof(parentdir_path));
+
         switch (si->why) {
         case PATH_EXISTS:
                 fflags = NOTE_DELETE|NOTE_RENAME|NOTE_REVOKE|NOTE_EXTEND|NOTE_WRITE;
-                strlcpy(parentdir_path, dirname(si->what), sizeof(parentdir_path));
-                which_path = parentdir_path;
                 break;
         case PATH_MISSING:
@@ -3012 +3021 @@
 
         if (si->fd == -1) {
-                si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY));
+                if ((si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY))) == -1) {
+                        which_path = parentdir_path;
+                        si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY));
+                }
         }
 
@@ -3087 +3099 @@
 }
 
-static void
+void
 calendarinterval_new_from_obj_dict_walk(launch_data_t obj, const char *key, void *context)
 {
@@ -3246 +3258 @@
 }
 
-static void
+void
 socketgroup_kevent_mod(job_t j, struct socketgroup *sg, bool do_add)
 {