[systemd-commits] 3 commits - man/systemd-cgtop.xml src/journal src/shared TODO

[Zbigniew Jędrzejewski-Szmek]

 TODO                              |    2 --
 man/systemd-cgtop.xml             |   30 ++++++++++++++++++++++++++++++
 src/journal/test-journal-stream.c |    2 +-
 src/journal/test-journal.c        |    2 +-
 src/shared/logs-show.c            |    2 +-
 5 files changed, 33 insertions(+), 5 deletions(-)

New commits:
commit 193556b69e982fd37f88209c26a5783245cf2437
Author: Shawn Landen <shawnlandden at gmail.com>
Date:   Fri Aug 3 02:28:28 2012 +0000

    logs-show: fix off-by-one error
    
    Ellipsize lines that are one character too long.

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index c72ebc1..b6e6a85 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -246,7 +246,7 @@ static int output_short(sd_journal *j, unsigned line, unsigned n_columns,
                 char bytes[FORMAT_BYTES_MAX];
                 printf(": [%s blob data]\n", format_bytes(bytes, sizeof(bytes), message_len));
         } else if ((flags & OUTPUT_FULL_WIDTH) ||
-                   (message_len + n < n_columns))
+                   (message_len + n + 1 < n_columns))
                 printf(": %s%.*s%s\n", color_on, (int) message_len, message, color_off);
         else if (n < n_columns && n_columns - n - 2 >= 3) {
                 char *e;

commit 871b876ecc6921a70b5f5e15cb9f85e0b6f2d1a5
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Fri Aug 3 17:42:04 2012 +0200

    man: document three new cgtop options

diff --git a/TODO b/TODO
index c8f872c..ac9bae4 100644
--- a/TODO
+++ b/TODO
@@ -41,8 +41,6 @@ Features:
 * remove Fedora /dev/null logic from localed.c, now that system-config-keyboard is gone
   delete /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf from spec file
 
-* update cgtop man page to be in sync with --help
-
 * journal: expose current disk usage
 
 * logind: return EBUSY when a session is created on a seat+VT that already has one.
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
index 14d4735..112e5ff 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -110,6 +110,13 @@
                         </varlistentry>
 
                         <varlistentry>
+                                <term><option>--version</option></term>
+
+                                <listitem><para>Prints a version string and
+                                exits.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
                                 <term><option>-p</option></term>
 
                                 <listitem><para>Order by control group
@@ -143,6 +150,29 @@
                         </varlistentry>
 
                         <varlistentry>
+                                <term><option>-b</option></term>
+                                <term><option>--batch</option></term>
+
+                                <listitem><para>Run in "batch" mode:
+                                do not accept input and run until the
+                                iteration limit set with
+                                <option>--iterations</option> is
+                                exhausted or until killed. This mode
+                                could be useful for sending output
+                                from <command>systemd-cgtop</command>
+                                to other programs or to a
+                                file.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-n</option></term>
+                                <term><option>--iterations=</option></term>
+
+                                <listitem><para>Perform only this many
+                                iterations.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
                                 <term><option>-d</option></term>
                                 <term><option>--delay=</option></term>
 

commit ab060556a9e1ebb2744719a29985e40919101a22
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Wed Aug 1 17:48:29 2012 +0200

    test: allow deletion of temporary files from normal fs
    
    Not everybody has /tmp on tmpfs, and this was breaking 'make check'.

diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c
index 627faa7..fd448cb 100644
--- a/src/journal/test-journal-stream.c
+++ b/src/journal/test-journal-stream.c
@@ -163,7 +163,7 @@ int main(int argc, char *argv[]) {
 
         sd_journal_close(j);
 
-        assert_se(rm_rf(t, false, true, false) >= 0);
+        assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
 
         return 0;
 }
diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 7271a3f..ca3b474 100644
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -118,7 +118,7 @@ int main(int argc, char *argv[]) {
 
         log_error("Exiting...");
 
-        assert_se(rm_rf(t, false, true, false) >= 0);
+        assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
 
         return 0;
 }