Changeset 356 for trunk

Timestamp:

Sep 5, 2011, 9:31:27 PM (13 years ago)

Author:

katerina

Message:

Patch for ticket #261: show policy for checked files in verbose mode.

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• include/sh_hash.h (modified) (1 diff)
• src/sh_cat.c (modified) (4 diffs)
• src/sh_files.c (modified) (2 diffs)
• src/sh_hash.c (modified) (1 diff)

trunk/docs/Changelog

@@ -1 +1 @@
 2.8.6:
+        * List the policy under which a directory/file is checked
         * Option to use a textfile with a list of files for update
         * Fix --enable-db-reload option (reported by David L.)

trunk/include/sh_hash.h

@@ -27 +27 @@
 #include "sh_unix.h"
 #include "sh_error.h"
+
+/* convert to policy string
+ */
+const char * sh_hash_getpolicy(int class);
 
 /* format a uint64

trunk/src/sh_cat.c

@@ -40 +40 @@
   { MSG_FI_CSUM,     SH_ERR_ALL,     FIL,   N_("msg=\"Checksum\" chk=\"%s\" path=\"%s\"")},
   { MSG_FI_DSUM,     SH_ERR_INFO,    FIL,   N_("msg=\"d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld\"")},
-  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=\"Checking\" path=\"%s\"")},
+  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=\"Checking %16s\" path=\"%s\"")},
 #endif
 
@@ -181 +181 @@
   { MSG_FI_CSUM,     SH_ERR_ALL,     FIL,   N_("msg=\"Checksum\" chk=\"%s\" path=\"%s\"")},
   { MSG_FI_DSUM,     SH_ERR_INFO,    FIL,   N_("msg=\"d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld\"")},
-  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=\"Checking\" path=\"%s\"")},
+  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=\"Checking %16s\" path=\"%s\"")},
 #endif
 
@@ -382 +382 @@
   { MSG_FI_CSUM,     SH_ERR_ALL,     FIL,   N_("msg=<Checksum>, chk=<%s>, path=<%s>")},
   { MSG_FI_DSUM,     SH_ERR_INFO,    FIL,   N_("msg=<d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld>")},
-  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=<Checking>, path=<%s>")},
+  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=<Checking %16s>, path=<%s>")},
 #endif
 
@@ -522 +522 @@
   { MSG_FI_CSUM,     SH_ERR_ALL,     FIL,   N_("msg=<Checksum>, chk=<%s>, path=<%s>")},
   { MSG_FI_DSUM,     SH_ERR_INFO,    FIL,   N_("msg=<d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld>")},
-  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=<Checking>, path=<%s>")},
+  { MSG_FI_CHK,      SH_ERR_INFO,    FIL,   N_("msg=<Checking %16s>, path=<%s>")},
 #endif
 

trunk/src/sh_files.c

@@ -351 +351 @@
           if (flag_err_info == SL_TRUE)
             {
+              char pstr[32];
 #if !defined(WITH_TPT)
               tmp = sh_util_safe_name (ptr->name);
 #endif
-              sh_error_handle ((-1),  FIL__, __LINE__, 0, MSG_FI_CHK, tmp);
+              sl_strlcpy(pstr, sh_hash_getpolicy(ptr->class), sizeof(pstr));
+              sh_error_handle ((-1),  FIL__, __LINE__, 0, MSG_FI_CHK, pstr, tmp);
             }
 
@@ -1808 +1810 @@
   if (flag_err_info == SL_TRUE)
     {
-      sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_FI_CHK, tmpname);
+      char pstr[32];
+
+      sl_strlcpy(pstr, sh_hash_getpolicy(iclass), sizeof(pstr));
+      sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_FI_CHK, pstr, tmpname);
     }
 

trunk/src/sh_hash.c

@@ -307 +307 @@
   };
 
+const char * sh_hash_getpolicy(int class)
+{
+  if (class > 0 && class < SH_ERR_T_DIR)
+    return _(policy[class]);
+  return _("[indef]");
+}
 
 /**********************************