X-Git-Url: https://git.saurik.com/apple/syslog.git/blobdiff_plain/c8dfc69ea66b9bda201a32fe874add2ab06f6fb7..HEAD:/syslogd.tproj/asl_action.c

diff --git a/syslogd.tproj/asl_action.c b/syslogd.tproj/asl_action.c
index 05c2d10..3e3e9ad 100644
--- a/syslogd.tproj/asl_action.c
+++ b/syslogd.tproj/asl_action.c
@@ -77,7 +77,7 @@ static dispatch_queue_t asl_action_queue;
 static dispatch_source_t checkpoint_timer;
 static time_t sweep_time = 0;
 
-#if TARGET_OS_EMBEDDED
+#if (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
 #ifndef CRASH_MOVER_SERVICE
 #define CRASH_MOVER_SERVICE "com.apple.crash_mover"
 #endif
@@ -208,7 +208,7 @@ _act_notify(asl_out_module_t *m, asl_out_rule_t *r)
 static void
 _act_broadcast(asl_out_module_t *m, asl_out_rule_t *r, asl_msg_t *msg)
 {
-#if !TARGET_OS_EMBEDDED
+#if !(TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
 	FILE *pw;
 	const char *val;
 
@@ -284,7 +284,7 @@ _act_access_control(asl_out_module_t *m, asl_out_rule_t *r, asl_msg_t *msg)
 	}
 }
 
-#if TARGET_OS_EMBEDDED
+#if (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
 static void
 _crashlog_queue_check(void)
 {
@@ -448,7 +448,7 @@ _asl_dir_storedata_open(asl_out_rule_t *r, uint64_t xid)
 			return -1;
 		}
 
-#if !TARGET_IPHONE_SIMULATOR
+#if !TARGET_OS_SIMULATOR
 		if (chown(dstpath, r->dst->uid[0], r->dst->gid[0]) != 0)
 		{
 			asldebug("_asl_dir_storedata_open: chown %d %d new %s: %s\n", dstpath, r->dst->uid[0], r->dst->gid[0], strerror(errno));
@@ -542,6 +542,7 @@ static int
 _act_checkpoint(asl_out_rule_t *r, uint32_t force)
 {
 	char tmpcurrent_name[MAXPATHLEN], *fn;
+	bool size_only = false;
 
 	if (r == NULL) return 0;
 	if (r->dst == NULL) return 0;
@@ -554,7 +555,12 @@ _act_checkpoint(asl_out_rule_t *r, uint32_t force)
 		fn = tmpcurrent_name;
 	}
 
-	if ((force == CHECKPOINT_TEST) && (r->dst->file_max == 0)) return 0;
+	if ((force == CHECKPOINT_TEST) || (r->dst->flags & MODULE_FLAG_SIZE_ONLY))
+	{
+		size_only = true;
+	}
+
+	if (size_only && (r->dst->file_max == 0)) return 0;
 
 	if ((r->dst->size == 0) || (r->dst->timestamp == 0))
 	{
@@ -573,7 +579,7 @@ _act_checkpoint(asl_out_rule_t *r, uint32_t force)
 		r->dst->size = sb.st_size;
 	}
 	
-	if ((force == CHECKPOINT_TEST) && (r->dst->size < r->dst->file_max)) return 0;
+	if (size_only && (r->dst->size < r->dst->file_max)) return 0;
 
 	if (r->dst->flags & MODULE_FLAG_BASESTAMP)
 	{
@@ -680,7 +686,7 @@ _asl_dir_today_open(asl_out_rule_t *r, const time_t *tick)
 		return -1;
 	}
 
-#if TARGET_IPHONE_SIMULATOR
+#if TARGET_OS_SIMULATOR
 	uid_t uid = -1;
 	gid_t gid = -1;
 #else
@@ -1281,7 +1287,7 @@ _act_store(asl_out_module_t *m, asl_out_rule_t *r, asl_msg_t *msg)
 		if (af_data != NULL) af_data->pending++;
 	}
 
-#if TARGET_OS_EMBEDDED
+#if (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
 	if (r->dst->flags & MODULE_FLAG_CRASHLOG)
 	{
 		_crashlog_queue_check();
@@ -1404,7 +1410,6 @@ _act_file_checkpoint(asl_out_module_t *m, const char *path, uint32_t force)
 
 	if (m == NULL) return 0;
 
-
 	for (r = m->ruleset; r != NULL; r = r->next)
 	{
 		if ((r->action == ACTION_FILE) || (r->action == ACTION_ASL_FILE))
@@ -1413,24 +1418,10 @@ _act_file_checkpoint(asl_out_module_t *m, const char *path, uint32_t force)
 			{
 				if (_act_file_equal(r->dst->path, path))
 				{
-					if (force & CHECKPOINT_CRASH)
+					if (_act_checkpoint(r, force) > 0)
 					{
-						if (r->dst->flags & MODULE_FLAG_CRASHLOG)
-						{
-							if (_act_checkpoint(r, CHECKPOINT_FORCE) > 0)
-							{
-								did_checkpoint = 1;
-								_act_dst_close(r, DST_CLOSE_CHECKPOINT);
-							}
-						}
-					}
-					else
-					{
-						if (_act_checkpoint(r, force) > 0)
-						{
-							did_checkpoint = 1;
-							_act_dst_close(r, DST_CLOSE_CHECKPOINT);
-						}
+						did_checkpoint = 1;
+						_act_dst_close(r, DST_CLOSE_CHECKPOINT);
 					}
 				}
 			}
@@ -1588,7 +1579,7 @@ _act_file(asl_out_module_t *m, asl_out_rule_t *r, asl_msg_t *msg)
 	f_data = (asl_action_file_data_t *)r->dst->private;
 	if (f_data != NULL) f_data->pending++;
 
-#if TARGET_OS_EMBEDDED
+#if (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
 	if (r->dst->flags & MODULE_FLAG_CRASHLOG)
 	{
 		_crashlog_queue_check();
@@ -1749,7 +1740,7 @@ asl_out_message(asl_msg_t *msg, int64_t msize)
 		if (p != NULL) asl_msg_set_key_val(msg, ASL_KEY_FREE_NOTE, p);
 
 		/* chain to the next output module (done this way to make queue size accounting easier */
-#if !TARGET_IPHONE_SIMULATOR
+#if !TARGET_OS_SIMULATOR
 		if (global.bsd_out_enabled) bsd_out_message(msg, msize);
 		else OSAtomicAdd64(-1ll * msize, &global.memory_size);
 #else
@@ -2102,7 +2093,7 @@ asl_action_init(void)
 
 	dispatch_once(&once, ^{
 		asl_action_queue = dispatch_queue_create("ASL Action Queue", NULL);
-#if TARGET_OS_EMBEDDED
+#if (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
 		crashlog_queue = dispatch_queue_create("iOS CrashLog Queue", NULL);
 		notify_register_dispatch(CRASH_MOVER_SERVICE, &crashmover_token, asl_action_queue, ^(int unused) {
 			uint64_t cmstate = 0;
@@ -2209,7 +2200,7 @@ _asl_action_free_modules(asl_out_module_t *m)
 static int
 _asl_action_close_internal(void)
 {
-#if TARGET_OS_EMBEDDED
+#if (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
 	if (crashmover_state != 0)
 	{
 		dispatch_resume(crashlog_queue);
@@ -2447,18 +2438,6 @@ asl_action_control_set_param(const char *s)
 	return 0;
 }
 
-int
-asl_action_file_checkpoint(const char *module, const char *path)
-{
-	/* Note this is synchronous on asl_action queue */
-	dispatch_sync(asl_action_queue, ^{
-		asl_out_module_t *m = _asl_action_module_with_name(module);
-		_act_file_checkpoint(m, path, CHECKPOINT_FORCE);
-	});
-
-	return 0;
-}
-
 void
 asl_action_out_module_query(asl_msg_t *q, asl_msg_t *m, bool all)
 {