Changeset 23553

Timestamp:

2008-03-12 15:13:45 (6 months ago)

Author:

zarzycki@…

Message:

Misc.

Location:

trunk/launchd/src

Files:

• launchd.c (modified) (1 diff)
• launchd_unix_ipc.c (modified) (9 diffs)

trunk/launchd/src/launchd.c

@@ -115 +115 @@
         testfd_or_openfd(STDERR_FILENO, stdouterr_path, O_WRONLY);
 
+#if 0
+        if (pid1_magic) {
+                if (!getenv("DYLD_INSERT_LIBRARIES")) {
+                        setenv("DYLD_INSERT_LIBRARIES", "/usr/lib/libgmalloc.dylib", 1);
+                        setenv("MALLOC_STRICT_SIZE", "1", 1);
+                        execv(argv[0], argv);
+                } else {
+                        unsetenv("DYLD_INSERT_LIBRARIES");
+                        unsetenv("MALLOC_STRICT_SIZE");
+                }
+        }
+#endif
+
         while ((ch = getopt(argc, argv, "s")) != -1) {
                 switch (ch) {

trunk/launchd/src/launchd_unix_ipc.c

@@ -82 +82 @@
 
         if (-1 == unlink(sockpath)) {
-                runtime_syslog(LOG_WARNING, "unlink(\"%s\"): %m", sockpath);
+                runtime_syslog(LOG_WARNING, "unlink(\"%s\"): %s", sockpath, strerror(errno));
         } else if (-1 == rmdir(sockdir)) {
-                runtime_syslog(LOG_WARNING, "rmdir(\"%s\"): %m", sockdir);
+                runtime_syslog(LOG_WARNING, "rmdir(\"%s\"): %s", sockdir, strerror(errno));
         }
 }
@@ -116 +116 @@
                                 if (!S_ISDIR(sb.st_mode)) {
                                         errno = EEXIST;
-                                        runtime_syslog(LOG_ERR, "mkdir(\"%s\"): %m", LAUNCHD_SOCK_PREFIX);
+                                        runtime_syslog(LOG_ERR, "mkdir(\"%s\"): %s", LAUNCHD_SOCK_PREFIX, strerror(errno));
                                         goto out_bad;
                                 }
                         } else {
-                                runtime_syslog(LOG_ERR, "mkdir(\"%s\"): %m", ourdir);
+                                runtime_syslog(LOG_ERR, "mkdir(\"%s\"): %s", ourdir, strerror(errno));
                                 goto out_bad;
                         }
@@ -127 +127 @@
                 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);
+                        runtime_syslog(LOG_ERR, "Could not create critical directory \"%s\": %s", ourdir, strerror(errno));
                         goto out_bad;
                 }
@@ -135 +135 @@
         if (unlink(sun.sun_path) == -1 && errno != ENOENT) {
                 if (errno != EROFS) {
-                        runtime_syslog(LOG_ERR, "unlink(\"thesocket\"): %m");
+                        runtime_syslog(LOG_ERR, "unlink(\"thesocket\"): %s", strerror(errno));
                 }
                 goto out_bad;
@@ -150 +150 @@
         if (r == -1) {
                 if (errno != EROFS) {
-                        runtime_syslog(LOG_ERR, "bind(\"thesocket\"): %m");
+                        runtime_syslog(LOG_ERR, "bind(\"thesocket\"): %s", strerror(errno));
                 }
                 goto out_bad;
@@ -156 +156 @@
 
         if (listen(fd, SOMAXCONN) == -1) {
-                runtime_syslog(LOG_ERR, "listen(\"thesocket\"): %m");
+                runtime_syslog(LOG_ERR, "listen(\"thesocket\"): %s", strerror(errno));
                 goto out_bad;
         }
 
         if (kevent_mod(fd, EVFILT_READ, EV_ADD, 0, 0, &kqipc_listen_callback) == -1) {
-                runtime_syslog(LOG_ERR, "kevent_mod(\"thesocket\", EVFILT_READ): %m");
+                runtime_syslog(LOG_ERR, "kevent_mod(\"thesocket\", EVFILT_READ): %s", strerror(errno));
                 goto out_bad;
         }
@@ -215 +215 @@
                 if (launchd_msg_recv(c->conn, ipc_readmsg, c) == -1 && errno != EAGAIN) {
                         if (errno != ECONNRESET) {
-                                runtime_syslog(LOG_DEBUG, "%s(): recv: %m", __func__);
+                                runtime_syslog(LOG_DEBUG, "%s(): recv: %s", __func__, strerror(errno));
                         }
                         ipc_close(c);
@@ -223 +223 @@
                 if (r == -1) {
                         if (errno != EAGAIN) {
-                                runtime_syslog(LOG_DEBUG, "%s(): send: %m", __func__);
+                                runtime_syslog(LOG_DEBUG, "%s(): send: %s", __func__, strerror(errno));
                                 ipc_close(c);
                         }
@@ -324 +324 @@
                         kevent_mod(launchd_getfd(rmc.c->conn), EVFILT_WRITE, EV_ADD, 0, 0, &rmc.c->kqconn_callback);
                 } else {
-                        runtime_syslog(LOG_DEBUG, "launchd_msg_send() == -1: %m");
+                        runtime_syslog(LOG_DEBUG, "launchd_msg_send() == -1: %s", strerror(errno));
                         ipc_close(rmc.c);
                 }