November 2007 - launchd-changes - lists.macosforge.org

[23452] trunk/launchd/src
by source_changes＠macosforge.org 30 Nov '07

30 Nov '07

Revision: 23452 http://trac.macosforge.org/projects/launchd/changeset/23452 Author: zarzycki(a)apple.com Date: 2007-11-30 13:00:42 -0800 (Fri, 30 Nov 2007) Log Message: ----------- Random changes. Modified Paths: -------------- trunk/launchd/src/launchctl.c trunk/launchd/src/launchd_unix_ipc.c trunk/launchd/src/liblaunch_private.h Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-11-30 20:47:06 UTC (rev 23451) +++ trunk/launchd/src/launchctl.c 2007-11-30 21:00:42 UTC (rev 23452) @@ -79,7 +79,7 @@ extern char **environ; -#define LAUNCH_SECDIR "/tmp/launch-XXXXXX" +#define LAUNCH_SECDIR _PATH_TMP "launch-XXXXXX" #define MACHINIT_JOBKEY_ONDEMAND "OnDemand" #define MACHINIT_JOBKEY_SERVICENAME "ServiceName" Modified: trunk/launchd/src/launchd_unix_ipc.c =================================================================== --- trunk/launchd/src/launchd_unix_ipc.c 2007-11-30 20:47:06 UTC (rev 23451) +++ trunk/launchd/src/launchd_unix_ipc.c 2007-11-30 21:00:42 UTC (rev 23452) @@ -123,7 +123,7 @@ } } } else { - snprintf(ourdir, sizeof(ourdir), "/tmp/launchd-%u.XXXXXX", getpid()); + snprintf(ourdir, sizeof(ourdir), _PATH_TMP "launchd-%u.XXXXXX", getpid()); if (mkdtemp(ourdir) == NULL) { runtime_syslog(LOG_ERR, "Could not create critical directory \"%s\": %m", ourdir); goto out_bad; Modified: trunk/launchd/src/liblaunch_private.h =================================================================== --- trunk/launchd/src/liblaunch_private.h 2007-11-30 20:47:06 UTC (rev 23451) +++ trunk/launchd/src/liblaunch_private.h 2007-11-30 21:00:42 UTC (rev 23452) @@ -24,6 +24,7 @@ #include <sys/types.h> #include <launch.h> #include <unistd.h> +#include <paths.h> #include <quarantine.h> #pragma GCC visibility push(default) @@ -40,7 +41,7 @@ #define LAUNCH_KEY_GETRUSAGECHILDREN "GetResourceUsageChildren" #define LAUNCHD_SOCKET_ENV "LAUNCHD_SOCKET" -#define LAUNCHD_SOCK_PREFIX "/var/tmp/launchd" +#define LAUNCHD_SOCK_PREFIX _PATH_VARTMP "launchd" #define LAUNCHD_TRUSTED_FD_ENV "__LAUNCHD_FD" #define LAUNCHD_ASYNC_MSG_KEY "_AsyncMessage" #define LAUNCH_KEY_BATCHCONTROL "BatchControl"

1 0

[23451] trunk/launchd/src/launchd_unix_ipc.c
by source_changes＠macosforge.org 30 Nov '07

30 Nov '07

Revision: 23451 http://trac.macosforge.org/projects/launchd/changeset/23451 Author: zarzycki(a)apple.com Date: 2007-11-30 12:47:06 -0800 (Fri, 30 Nov 2007) Log Message: ----------- <rdar://problem/5622365> launchd should provide error message when it can't write to /tmp Modified Paths: -------------- trunk/launchd/src/launchd_unix_ipc.c Modified: trunk/launchd/src/launchd_unix_ipc.c =================================================================== --- trunk/launchd/src/launchd_unix_ipc.c 2007-11-30 00:18:44 UTC (rev 23450) +++ trunk/launchd/src/launchd_unix_ipc.c 2007-11-30 20:47:06 UTC (rev 23451) @@ -124,7 +124,8 @@ } } else { snprintf(ourdir, sizeof(ourdir), "/tmp/launchd-%u.XXXXXX", getpid()); - if (!launchd_assumes(mkdtemp(ourdir) != NULL)) { + if (mkdtemp(ourdir) == NULL) { + runtime_syslog(LOG_ERR, "Could not create critical directory \"%s\": %m", ourdir); goto out_bad; } snprintf(sun.sun_path, sizeof(sun.sun_path), "%s/sock", ourdir);

1 0

[23450] trunk/launchd/src
by source_changes＠macosforge.org 30 Nov '07

30 Nov '07

Revision: 23450 http://trac.macosforge.org/projects/launchd/changeset/23450 Author: zarzycki(a)apple.com Date: 2007-11-29 16:18:44 -0800 (Thu, 29 Nov 2007) Log Message: ----------- The -Os optimization defeats our various assumes() macros, despite the fact that __builtin_expect() is used. Therefore, let us turn on -freorder-blocks to get the semantics we want out of the compiler. Modified Paths: -------------- trunk/launchd/src/Makefile.am trunk/launchd/src/Makefile.in Modified: trunk/launchd/src/Makefile.am =================================================================== --- trunk/launchd/src/Makefile.am 2007-11-13 18:54:51 UTC (rev 23449) +++ trunk/launchd/src/Makefile.am 2007-11-30 00:18:44 UTC (rev 23450) @@ -1,4 +1,4 @@ -AM_CFLAGS = -no-cpp-precomp -F/System/Library/PrivateFrameworks -Wall -Wextra -Waggregate-return -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror -D__MigTypeCheck=1 -fvisibility=hidden -Dmig_external=__private_extern__ +AM_CFLAGS = -F/System/Library/PrivateFrameworks -Wall -Wextra -Waggregate-return -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror -D__MigTypeCheck=1 -fvisibility=hidden -freorder-blocks -Dmig_external=__private_extern__ CLEANFILES = protocol_vproc.h protocol_vprocServer.c protocol_vprocUser.c protocol_vprocServer.h \ launchd_internal.h launchd_internalServer.h launchd_internalServer.c launchd_internalUser.c \ Modified: trunk/launchd/src/Makefile.in =================================================================== --- trunk/launchd/src/Makefile.in 2007-11-13 18:54:51 UTC (rev 23449) +++ trunk/launchd/src/Makefile.in 2007-11-30 00:18:44 UTC (rev 23450) @@ -238,7 +238,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CFLAGS = -no-cpp-precomp -F/System/Library/PrivateFrameworks -Wall -Wextra -Waggregate-return -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror -D__MigTypeCheck=1 -fvisibility=hidden -Dmig_external=__private_extern__ +AM_CFLAGS = -F/System/Library/PrivateFrameworks -Wall -Wextra -Waggregate-return -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror -D__MigTypeCheck=1 -fvisibility=hidden -freorder-blocks -Dmig_external=__private_extern__ CLEANFILES = protocol_vproc.h protocol_vprocServer.c protocol_vprocUser.c protocol_vprocServer.h \ launchd_internal.h launchd_internalServer.h launchd_internalServer.c launchd_internalUser.c \ notifyServer.c notifyServer.h job_replyUser.c job_reply.h __version.c mach_excServer.c mach_excServer.h

1 0

[23449] branches/SULeopard/launchd/src/launchctl.c
by source_changes＠macosforge.org 13 Nov '07

13 Nov '07

Revision: 23449 http://trac.macosforge.org/projects/launchd/changeset/23449 Author: zarzycki(a)apple.com Date: 2007-11-13 10:54:51 -0800 (Tue, 13 Nov 2007) Log Message: ----------- <rdar://problem/5567165> SULeoNext: do not stop boot if fsck_hfs repair fails on journaled boot volume Modified Paths: -------------- branches/SULeopard/launchd/src/launchctl.c Modified: branches/SULeopard/launchd/src/launchctl.c =================================================================== --- branches/SULeopard/launchd/src/launchctl.c 2007-11-13 18:53:47 UTC (rev 23448) +++ branches/SULeopard/launchd/src/launchctl.c 2007-11-13 18:54:51 UTC (rev 23449) @@ -2764,8 +2764,11 @@ goto out; } - fprintf(stderr, "fsck failed! Leaving the root file system read-only...\n"); + fprintf(stderr, "fsck failed!\n"); + /* someday, we should keep booting read-only, but as of today, other sub-systems cannot handle that scenario */ + assumes(reboot(RB_HALT) != -1); + return; out: /*

1 0

[23448] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 13 Nov '07

13 Nov '07

Revision: 23448 http://trac.macosforge.org/projects/launchd/changeset/23448 Author: zarzycki(a)apple.com Date: 2007-11-13 10:53:47 -0800 (Tue, 13 Nov 2007) Log Message: ----------- <rdar://problem/5567165> SULeoNext: do not stop boot if fsck_hfs repair fails on journaled boot volume Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-10-30 21:41:05 UTC (rev 23447) +++ trunk/launchd/src/launchctl.c 2007-11-13 18:53:47 UTC (rev 23448) @@ -2763,8 +2763,11 @@ goto out; } - fprintf(stderr, "fsck failed! Leaving the root file system read-only...\n"); + fprintf(stderr, "fsck failed!\n"); + /* someday, we should keep booting read-only, but as of today, other sub-systems cannot handle that scenario */ + assumes(reboot(RB_HALT) != -1); + return; out: /*

1 0