12:05 p.m.
---
cat/Makefile.am | 1 +
cat/log.c | 114 ++---------------------------------------
fish/Makefile.am | 1 +
fish/journal.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
fish/journal.h | 26 ++++++++++
5 files changed, 183 insertions(+), 111 deletions(-)
create mode 100644 fish/journal.c
create mode 100644 fish/journal.h
diff --git a/cat/Makefile.am b/cat/Makefile.am
index d0db6fa..d472100 100644
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -38,6 +38,7 @@ bin_PROGRAMS = virt-cat virt-filesystems virt-log virt-ls
SHARED_SOURCE_FILES = \
../fish/domain.c \
../fish/inspect.c \
+ ../fish/journal.c \
../fish/keys.c \
../fish/options.h \
../fish/options.c \
diff --git a/cat/log.c b/cat/log.c
index 5069398..b092667 100644
--- a/cat/log.c
+++ b/cat/log.c
@@ -36,6 +36,7 @@
#include "guestfs.h"
#include "options.h"
+#include "fish/journal.h"
/* Currently open libguestfs handle. */
guestfs_h *g;
@@ -273,128 +274,19 @@ do_log (void)
return 0;
}
-/* Find the value of the named field from the list of attributes. If
- * not found, returns NULL (not an error). If found, returns a
- * pointer to the field, and the length of the field. NOTE: The field
- * is NOT \0-terminated, so you have to print it using "%.*s".
- *
- * There may be multiple fields with the same name. In this case, the
- * function returns the first entry.
- */
-static const char *
-get_journal_field (const struct guestfs_xattr_list *xattrs, const char *name,
- size_t *len_rtn)
-{
- uint32_t i;
-
- for (i = 0; i < xattrs->len; ++i) {
- if (STREQ (name, xattrs->val[i].attrname)) {
- *len_rtn = xattrs->val[i].attrval_len;
- return xattrs->val[i].attrval;
- }
- }
-
- return NULL; /* not found */
-}
-
-static const char *const log_level_table[] = {
- [LOG_EMERG] = "emerg",
- [LOG_ALERT] = "alert",
- [LOG_CRIT] = "crit",
- [LOG_ERR] = "err",
- [LOG_WARNING] = "warning",
- [LOG_NOTICE] = "notice",
- [LOG_INFO] = "info",
- [LOG_DEBUG] = "debug"
-};
-
static int
do_log_journal (void)
{
- int r;
- unsigned errors = 0;
-
if (guestfs_journal_open (g, JOURNAL_DIR) == -1)
return -1;
- while ((r = guestfs_journal_next (g)) > 0) {
- CLEANUP_FREE_XATTR_LIST struct guestfs_xattr_list *xattrs = NULL;
- const char *priority_str, *identifier, *comm, *pid, *message;
- size_t priority_len, identifier_len, comm_len, pid_len, message_len;
- int priority = LOG_INFO;
- int64_t ts;
-
- /* The question is what fields to display. We should probably
- * make this configurable, but for now use the "short" format from
- * journalctl. (XXX)
- */
-
- xattrs = guestfs_journal_get (g);
- if (xattrs == NULL)
- return -1;
-
- ts = guestfs_journal_get_realtime_usec (g); /* error checked below */
-
- priority_str = get_journal_field (xattrs, "PRIORITY", &priority_len);
- //hostname = get_journal_field (xattrs, "_HOSTNAME", &hostname_len);
- identifier = get_journal_field (xattrs, "SYSLOG_IDENTIFIER",
- &identifier_len);
- comm = get_journal_field (xattrs, "_COMM", &comm_len);
- pid = get_journal_field (xattrs, "_PID", &pid_len);
- message = get_journal_field (xattrs, "MESSAGE", &message_len);
-
- /* Timestamp. */
- if (ts >= 0) {
- char buf[64];
- time_t t = ts / 1000000;
- struct tm tm;
-
- if (strftime (buf, sizeof buf, "%b %d %H:%M:%S",
- localtime_r (&t, &tm)) <= 0) {
- fprintf (stderr, _("%s: could not format journal entry timestamp\n"),
- guestfs_int_program_name);
- errors++;
- continue;
- }
- fputs (buf, stdout);
- }
-
- /* Hostname. */
- /* We don't print this because it is assumed each line from the
- * guest will have the same hostname. (XXX)
- */
- //if (hostname)
- // printf (" %.*s", (int) hostname_len, hostname);
-
- /* Identifier. */
- if (identifier)
- printf (" %.*s", (int) identifier_len, identifier);
- else if (comm)
- printf (" %.*s", (int) comm_len, comm);
-
- /* PID */
- if (pid)
- printf ("[%.*s]", (int) pid_len, pid);
-
- /* Log level. */
- if (priority_str && *priority_str >= '0' && *priority_str
<= '7')
- priority = *priority_str - '0';
-
- printf (" %s:", log_level_table[priority]);
-
- /* Message. */
- if (message)
- printf (" %.*s", (int) message_len, message);
-
- printf ("\n");
- }
- if (r == -1) /* error from guestfs_journal_next */
+ if (journal_view () == -1)
return -1;
if (guestfs_journal_close (g) == -1)
return -1;
- return errors > 0 ? -1 : 0;
+ return 0;
}
static int
diff --git a/fish/Makefile.am b/fish/Makefile.am
index c4b82ae..e4b4fcf 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -94,6 +94,7 @@ guestfish_SOURCES = \
glob.c \
help.c \
hexedit.c \
+ journal.c \
lcd.c \
man.c \
more.c \
diff --git a/fish/journal.c b/fish/journal.c
new file mode 100644
index 0000000..15d058a
--- /dev/null
+++ b/fish/journal.c
@@ -0,0 +1,152 @@
+/* guestfish - guest filesystem shell
+ * Copyright (C) 2009-2015 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <libintl.h>
+#include <time.h>
+#include <syslog.h>
+
+#include "fish.h"
+#include "journal.h"
+
+/* Find the value of the named field from the list of attributes. If
+ * not found, returns NULL (not an error). If found, returns a
+ * pointer to the field, and the length of the field. NOTE: The field
+ * is NOT \0-terminated, so you have to print it using "%.*s".
+ *
+ * There may be multiple fields with the same name. In this case, the
+ * function returns the first entry.
+ */
+static const char *
+get_journal_field (const struct guestfs_xattr_list *xattrs, const char *name,
+ size_t *len_rtn)
+{
+ uint32_t i;
+
+ for (i = 0; i < xattrs->len; ++i) {
+ if (STREQ (name, xattrs->val[i].attrname)) {
+ *len_rtn = xattrs->val[i].attrval_len;
+ return xattrs->val[i].attrval;
+ }
+ }
+
+ return NULL; /* not found */
+}
+
+static const char *const log_level_table[] = {
+ [LOG_EMERG] = "emerg",
+ [LOG_ALERT] = "alert",
+ [LOG_CRIT] = "crit",
+ [LOG_ERR] = "err",
+ [LOG_WARNING] = "warning",
+ [LOG_NOTICE] = "notice",
+ [LOG_INFO] = "info",
+ [LOG_DEBUG] = "debug"
+};
+
+int
+journal_view (void)
+{
+ int r;
+ unsigned errors = 0;
+
+ while ((r = guestfs_journal_next (g)) > 0) {
+ CLEANUP_FREE_XATTR_LIST struct guestfs_xattr_list *xattrs = NULL;
+ const char *priority_str, *identifier, *comm, *pid, *message;
+ size_t priority_len, identifier_len, comm_len, pid_len, message_len;
+ int priority = LOG_INFO;
+ int64_t ts;
+
+ /* The question is what fields to display. We should probably
+ * make this configurable, but for now use the "short" format from
+ * journalctl. (XXX)
+ */
+
+ xattrs = guestfs_journal_get (g);
+ if (xattrs == NULL)
+ return -1;
+
+ ts = guestfs_journal_get_realtime_usec (g); /* error checked below */
+
+ priority_str = get_journal_field (xattrs, "PRIORITY", &priority_len);
+ //hostname = get_journal_field (xattrs, "_HOSTNAME", &hostname_len);
+ identifier = get_journal_field (xattrs, "SYSLOG_IDENTIFIER",
+ &identifier_len);
+ comm = get_journal_field (xattrs, "_COMM", &comm_len);
+ pid = get_journal_field (xattrs, "_PID", &pid_len);
+ message = get_journal_field (xattrs, "MESSAGE", &message_len);
+
+ /* Timestamp. */
+ if (ts >= 0) {
+ char buf[64];
+ time_t t = ts / 1000000;
+ struct tm tm;
+
+ if (strftime (buf, sizeof buf, "%b %d %H:%M:%S",
+ localtime_r (&t, &tm)) <= 0) {
+ fprintf (stderr, _("could not format journal entry timestamp\n"));
+ errors++;
+ continue;
+ }
+ fputs (buf, stdout);
+ }
+
+ /* Hostname. */
+ /* We don't print this because it is assumed each line from the
+ * guest will have the same hostname. (XXX)
+ */
+ //if (hostname)
+ // printf (" %.*s", (int) hostname_len, hostname);
+
+ /* Identifier. */
+ if (identifier)
+ printf (" %.*s", (int) identifier_len, identifier);
+ else if (comm)
+ printf (" %.*s", (int) comm_len, comm);
+
+ /* PID */
+ if (pid)
+ printf ("[%.*s]", (int) pid_len, pid);
+
+ /* Log level. */
+ if (priority_str && *priority_str >= '0' && *priority_str
<= '7')
+ priority = *priority_str - '0';
+
+ printf (" %s:", log_level_table[priority]);
+
+ /* Message. */
+ if (message)
+ printf (" %.*s", (int) message_len, message);
+
+ printf ("\n");
+ }
+ if (r == -1) /* error from guestfs_journal_next */
+ return -1;
+
+ if (guestfs_journal_close (g) == -1)
+ return -1;
+
+ return errors > 0 ? -1 : 0;
+}
diff --git a/fish/journal.h b/fish/journal.h
new file mode 100644
index 0000000..556324e
--- /dev/null
+++ b/fish/journal.h
@@ -0,0 +1,26 @@
+/* guestfish - guest filesystem shell
+ * Copyright (C) 2009-2015 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <config.h>
+
+#ifndef JOURNAL_H
+#define JOURNAL_H
+
+/* in journal.c */
+extern int journal_view (void);
+#endif /* JOURNAL_H */
--
1.9.3