#include <i3/ipc.h>
static uint32_t offset_next_write,
- wrap_count;
+ wrap_count;
static i3_shmlog_header *header;
static char *logbuffer,
- *walk;
+ *walk;
static int check_for_wrap(void) {
if (wrap_count == header->wrap_count)
/* The log wrapped. Print the remaining content and reset walk to the top
* of the log. */
wrap_count = header->wrap_count;
- write(STDOUT_FILENO, walk, ((logbuffer + header->offset_last_wrap) - walk));
+ const int len = (logbuffer + header->offset_last_wrap) - walk;
+ swrite(STDOUT_FILENO, walk, len);
walk = logbuffer + sizeof(i3_shmlog_header);
return 1;
}
static void print_till_end(void) {
check_for_wrap();
- int n = write(STDOUT_FILENO, walk, ((logbuffer + header->offset_next_write) - walk));
- if (n > 0) {
- walk += n;
- }
+ const int len = (logbuffer + header->offset_next_write) - walk;
+ swrite(STDOUT_FILENO, walk, len);
+ walk += len;
}
int main(int argc, char *argv[]) {
{"verbose", no_argument, 0, 'V'},
{"follow", no_argument, 0, 'f'},
{"help", no_argument, 0, 'h'},
- {0, 0, 0, 0}
- };
+ {0, 0, 0, 0}};
char *options_string = "s:vfVh";
}
}
- char *shmname = root_atom_contents("I3_SHMLOG_PATH");
+ char *shmname = root_atom_contents("I3_SHMLOG_PATH", NULL, 0);
if (shmname == NULL) {
/* Something failed. Let’s invest a little effort to find out what it
* is. This is hugely helpful for users who want to debug i3 but are
fprintf(stderr, "FYI: The DISPLAY environment variable is set to \"%s\".\n", getenv("DISPLAY"));
exit(1);
}
- if (root_atom_contents("I3_CONFIG_PATH") != NULL) {
+ if (root_atom_contents("I3_CONFIG_PATH", conn, screen) != NULL) {
fprintf(stderr, "i3-dump-log: ERROR: i3 is running, but SHM logging is not enabled.\n\n");
if (!is_debug_build()) {
fprintf(stderr, "You seem to be using a release version of i3:\n %s\n\n", I3_VERSION);
struct stat statbuf;
- /* NB: While we must never read, we need O_RDWR for the pthread condvar. */
+ /* NB: While we must never write, we need O_RDWR for the pthread condvar. */
int logbuffer_shm = shm_open(shmname, O_RDWR, 0);
if (logbuffer_shm == -1)
err(EXIT_FAILURE, "Could not shm_open SHM segment for the i3 log (%s)", shmname);
if (fstat(logbuffer_shm, &statbuf) != 0)
err(EXIT_FAILURE, "stat(%s)", shmname);
- /* NB: While we must never read, we need O_RDWR for the pthread condvar. */
+ /* NB: While we must never write, we need PROT_WRITE for the pthread condvar. */
logbuffer = mmap(NULL, statbuf.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, logbuffer_shm, 0);
if (logbuffer == MAP_FAILED)
err(EXIT_FAILURE, "Could not mmap SHM segment for the i3 log");
- header = (i3_shmlog_header*)logbuffer;
+ header = (i3_shmlog_header *)logbuffer;
if (verbose)
printf("next_write = %d, last_wrap = %d, logbuffer_size = %d, shmname = %s\n",