dmesg: add support for reserved and local facilities

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index e64d36a3376107b027b48885b139f53a8458c3ee..69bdad71a682083db3bc9a24b0d69c8e325548a9 100644 (file)
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -141,6 +141,18 @@ static const struct dmesg_name facility_names[] =
        [FAC_BASE(LOG_CRON)]     = { "cron",     N_("clock daemon") },
        [FAC_BASE(LOG_AUTHPRIV)] = { "authpriv", N_("security/authorization messages (private)") },
        [FAC_BASE(LOG_FTP)]      = { "ftp",      N_("FTP daemon") },
+       [FAC_BASE(LOG_FTP) + 1]  = { "res0",     N_("reserved 0") },
+       [FAC_BASE(LOG_FTP) + 2]  = { "res1",     N_("reserved 1") },
+       [FAC_BASE(LOG_FTP) + 3]  = { "res2",     N_("reserved 2") },
+       [FAC_BASE(LOG_FTP) + 4]  = { "res3",     N_("reserved 3") },
+       [FAC_BASE(LOG_LOCAL0)]   = { "local0",   N_("local use 0") },
+       [FAC_BASE(LOG_LOCAL1)]   = { "local1",   N_("local use 1") },
+       [FAC_BASE(LOG_LOCAL2)]   = { "local2",   N_("local use 2") },
+       [FAC_BASE(LOG_LOCAL3)]   = { "local3",   N_("local use 3") },
+       [FAC_BASE(LOG_LOCAL4)]   = { "local4",   N_("local use 4") },
+       [FAC_BASE(LOG_LOCAL5)]   = { "local5",   N_("local use 5") },
+       [FAC_BASE(LOG_LOCAL6)]   = { "local6",   N_("local use 6") },
+       [FAC_BASE(LOG_LOCAL7)]   = { "local7",   N_("local use 7") },
 };
 
 /* supported methods to read message buffer

diff --git a/tests/expected/dmesg/colors b/tests/expected/dmesg/colors
index 40aca73b3931117d915dd81c518332d3bddc4696..7a5035e483d8113656035373682b15558d254e15 100644 (file)
--- a/tests/expected/dmesg/colors
+++ b/tests/expected/dmesg/colors
@@ -94,12 +94,13 @@ ftp   :warn  : \e[32m[778688.000000] \e[0m\e[1mexample[92]\e[0m
 ftp   :notice: \e[32m[804357.000000] \e[0mexample[93]
 ftp   :info  : \e[32m[830584.000000] \e[0mexample[94]
 ftp   :debug : \e[32m[857375.000000] \e[0mexample[95]
-\e[32m[884736.000000] \e[0mexample[96]
-\e[32m[912673.000000] \e[0m\e[7m\e[31mexample[97]\e[0m
-\e[32m[941192.000000] \e[0m\e[1m\e[31mexample[98]\e[0m
-\e[32m[970299.000000] \e[0m\e[31mexample[99]\e[0m
-\e[32m[1000000.000000] \e[0m\e[1mexample[100]\e[0m
-\e[32m[1030301.000000] \e[0mexample[101]
-\e[32m[1061208.000000] \e[0mexample[102]
-\e[32m[1092727.000000] \e[0mexample[103]
-\e[32m[1124864.000000] \e[0mexample[104]
+res0  :emerg : \e[32m[884736.000000] \e[0mexample[96]
+res0  :alert : \e[32m[912673.000000] \e[0m\e[7m\e[31mexample[97]\e[0m
+res0  :crit  : \e[32m[941192.000000] \e[0m\e[1m\e[31mexample[98]\e[0m
+res0  :err   : \e[32m[970299.000000] \e[0m\e[31mexample[99]\e[0m
+res0  :warn  : \e[32m[1000000.000000] \e[0m\e[1mexample[100]\e[0m
+res0  :notice: \e[32m[1030301.000000] \e[0mexample[101]
+res0  :info  : \e[32m[1061208.000000] \e[0mexample[102]
+res0  :debug : \e[32m[1092727.000000] \e[0mexample[103]
+res1  :emerg : \e[32m[1124864.000000] \e[0mexample[104]
+local2:info  : \e[32m[4557523.000000] \e[0mexample[105]

diff --git a/tests/expected/dmesg/console-levels b/tests/expected/dmesg/console-levels
index 43615f8ba9ef364919c2f894e27d3d949e092041..7229e8c70827a11641c74abb0d425eba65780729 100644 (file)
--- a/tests/expected/dmesg/console-levels
+++ b/tests/expected/dmesg/console-levels
@@ -11,6 +11,7 @@
 [512000.000000] example[80]
 [681472.000000] example[88]
 [884736.000000] example[96]
+[1124864.000000] example[104]
 [    1.000000] example[1]
 [  729.000000] example[9]
 [ 4913.000000] example[17]
@@ -89,6 +90,7 @@
 [636056.000000] example[86]
 [830584.000000] example[94]
 [1061208.000000] example[102]
+[4557523.000000] example[105]
 [  343.000000] example[7]
 [ 3375.000000] example[15]
 [12167.000000] example[23]
@@ -154,6 +156,7 @@
 [912673.000000] example[97]
 [941192.000000] example[98]
 [970299.000000] example[99]
+[1124864.000000] example[104]
 [    0.000000] example[0]
 [  512.000000] example[8]
 [ 4096.000000] example[16]
@@ -167,6 +170,7 @@
 [512000.000000] example[80]
 [681472.000000] example[88]
 [884736.000000] example[96]
+[1124864.000000] example[104]
 [   27.000000] example[3]
 [   64.000000] example[4]
 [  125.000000] example[5]
@@ -232,6 +236,7 @@
 [1030301.000000] example[101]
 [1061208.000000] example[102]
 [1092727.000000] example[103]
+[4557523.000000] example[105]
 [  343.000000] example[7]
 [ 3375.000000] example[15]
 [12167.000000] example[23]

diff --git a/tests/expected/dmesg/decode b/tests/expected/dmesg/decode
index f3541a6bfe93699e1588d31d3b69f6dfba0c0a72..f8088d07a92ac00b371464025456b0d571c899de 100644 (file)
--- a/tests/expected/dmesg/decode
+++ b/tests/expected/dmesg/decode
@@ -94,12 +94,13 @@ ftp   :warn  : [778688.000000] example[92]
 ftp   :notice: [804357.000000] example[93]
 ftp   :info  : [830584.000000] example[94]
 ftp   :debug : [857375.000000] example[95]
-[884736.000000] example[96]
-[912673.000000] example[97]
-[941192.000000] example[98]
-[970299.000000] example[99]
-[1000000.000000] example[100]
-[1030301.000000] example[101]
-[1061208.000000] example[102]
-[1092727.000000] example[103]
-[1124864.000000] example[104]
+res0  :emerg : [884736.000000] example[96]
+res0  :alert : [912673.000000] example[97]
+res0  :crit  : [941192.000000] example[98]
+res0  :err   : [970299.000000] example[99]
+res0  :warn  : [1000000.000000] example[100]
+res0  :notice: [1030301.000000] example[101]
+res0  :info  : [1061208.000000] example[102]
+res0  :debug : [1092727.000000] example[103]
+res1  :emerg : [1124864.000000] example[104]
+local2:info  : [4557523.000000] example[105]

diff --git a/tests/expected/dmesg/delta b/tests/expected/dmesg/delta
index 01dfec3bcfae1ee1583d1c3421c9dd9c1bbed3e7..d90d4946a884ed91807be2b4b0b8595445e73284 100644 (file)
--- a/tests/expected/dmesg/delta
+++ b/tests/expected/dmesg/delta
@@ -103,3 +103,4 @@
 [1061208.000000 <30907.000000>] example[102]
 [1092727.000000 <31519.000000>] example[103]
 [1124864.000000 <32137.000000>] example[104]
+[4557523.000000 <3432659.000000>] example[105]

diff --git a/tests/expected/dmesg/facilities b/tests/expected/dmesg/facilities
index 9733e56ea777df89b1be6c026194cd4b18aea615..d5c4c43273ce9c53c9cce9177d189c48e4ae918a 100644 (file)
--- a/tests/expected/dmesg/facilities
+++ b/tests/expected/dmesg/facilities
@@ -94,3 +94,11 @@
 [804357.000000] example[93]
 [830584.000000] example[94]
 [857375.000000] example[95]
+[884736.000000] example[96]
+[912673.000000] example[97]
+[941192.000000] example[98]
+[970299.000000] example[99]
+[1000000.000000] example[100]
+[1030301.000000] example[101]
+[1061208.000000] example[102]
+[1092727.000000] example[103]

diff --git a/tests/expected/dmesg/json b/tests/expected/dmesg/json
index e2319117a5eeb4d4b9b423a1b1d998d829eff553..894d6299590dfea3ad300c2af34dff21092d5480 100644 (file)
--- a/tests/expected/dmesg/json
+++ b/tests/expected/dmesg/json
@@ -385,32 +385,45 @@
          "time": 857375.000000,
          "msg": "example[95]"
       },{
+         "pri": 96,
          "time": 884736.000000,
          "msg": "example[96]"
       },{
+         "pri": 97,
          "time": 912673.000000,
          "msg": "example[97]"
       },{
+         "pri": 98,
          "time": 941192.000000,
          "msg": "example[98]"
       },{
+         "pri": 99,
          "time": 970299.000000,
          "msg": "example[99]"
       },{
+         "pri": 100,
          "time": 1000000.000000,
          "msg": "example[100]"
       },{
+         "pri": 101,
          "time": 1030301.000000,
          "msg": "example[101]"
       },{
+         "pri": 102,
          "time": 1061208.000000,
          "msg": "example[102]"
       },{
+         "pri": 103,
          "time": 1092727.000000,
          "msg": "example[103]"
       },{
+         "pri": 104,
          "time": 1124864.000000,
          "msg": "example[104]"
+      },{
+         "pri": 150,
+         "time": 4557523.000000,
+         "msg": "example[105]"
       }
    ]
 }

diff --git a/tests/ts/dmesg/input b/tests/ts/dmesg/input
index 98307df491c7116af6c7eac5f699f6d1fe6e487f..bcec23e77982e460a20069e56e04b5a7ed5433ad 100644 (file)
--- a/tests/ts/dmesg/input
+++ b/tests/ts/dmesg/input
@@ -103,3 +103,4 @@
 <102>[1061208.000000] example[102]
 <103>[1092727.000000] example[103]
 <104>[1124864.000000] example[104]
+<150>[4557523.000000] example[105]