* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
*
* i3-dump-log/main.c: Dumps the i3 SHM log to stdout.
*
*/
+#include <config.h>
+
#include <stdio.h>
#include <stdbool.h>
#include <sys/types.h>
#include "shmlog.h"
#include <i3/ipc.h>
-static uint32_t offset_next_write,
- wrap_count;
+#if !defined(__OpenBSD__)
+static uint32_t offset_next_write;
+#endif
+static uint32_t 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[]) {
int o, option_index = 0;
- bool verbose = false,
- follow = false;
+ bool verbose = false;
+#if !defined(__OpenBSD__)
+ bool follow = false;
+#endif
static struct option long_options[] = {
{"version", no_argument, 0, 'v'},
{"verbose", no_argument, 0, 'V'},
+#if !defined(__OpenBSD__)
{"follow", no_argument, 0, 'f'},
+#endif
{"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
};
+#if !defined(__OpenBSD__)
char *options_string = "s:vfVh";
+#else
+ char *options_string = "vVh";
+#endif
while ((o = getopt_long(argc, argv, options_string, long_options, &option_index)) != -1) {
if (o == 'v') {
return 0;
} else if (o == 'V') {
verbose = true;
+#if !defined(__OpenBSD__)
} else if (o == 'f') {
follow = true;
+#endif
} else if (o == 'h') {
printf("i3-dump-log " I3_VERSION "\n");
- printf("i3-dump-log [-f] [-s <socket>]\n");
+#if !defined(__OpenBSD__)
+ printf("i3-dump-log [-fhVv]\n");
+#else
+ printf("i3-dump-log [-hVv]\n");
+#endif
return 0;
}
}
- 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);
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",
header->offset_next_write, header->offset_last_wrap, header->size, shmname);
+ free(shmname);
walk = logbuffer + header->offset_next_write;
/* We first need to print old content in case there was at least one
walk = logbuffer + sizeof(i3_shmlog_header);
print_till_end();
+#if !defined(__OpenBSD__)
if (follow) {
/* Since pthread_cond_wait() expects a mutex, we need to provide one.
* To not lock i3 (that’s bad, mhkay?) we just define one outside of
}
}
}
+#endif
return 0;
}