From: Martin Mares <mj@ucw.cz>
Date: Thu, 19 Feb 2009 16:27:18 +0000 (+0100)
Subject: Logging: Adapted the `logger' utility to the new numbering of levels.
X-Git-Tag: holmes-import~59
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=003ca21e49148941c07f69c87e2553f660913b65;p=libucw.git

Logging: Adapted the `logger' utility to the new numbering of levels.
---

diff --git a/ucw/shell/logger.c b/ucw/shell/logger.c
index 8d67abec..7e88b4b6 100644
--- a/ucw/shell/logger.c
+++ b/ucw/shell/logger.c
@@ -1,13 +1,14 @@
 /*
  *	UCW Library Utilities -- A Simple Logger for use in shell scripts
  *
- *	(c) 2001 Martin Mares <mj@ucw.cz>
+ *	(c) 2001--2009 Martin Mares <mj@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
  */
 
 #include "ucw/lib.h"
+#include "ucw/log.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -28,15 +29,22 @@ main(int argc, char **argv)
     }
   else
     log_init(argv[1]);
+
+  uns level = 0;
+  while (level < L_MAX && LS_LEVEL_LETTER(level) != argv[2][0])
+    level++;
+  if (level >= L_MAX)
+    die("Unknown logging level `%s'", argv[2]);
+
   if (argc > 3)
-    msg(argv[2][0], argv[3]);
+    msg(level, argv[3]);
   else
     while (fgets(buf, sizeof(buf), stdin))
       {
 	c = strchr(buf, '\n');
 	if (c)
 	  *c = 0;
-	msg(argv[2][0], buf);
+	msg(level, buf);
       }
   return 0;
 }