Changeset 488 for trunk/src/sh_files.c

Timestamp:

Sep 18, 2015, 7:39:03 PM (9 years ago)

Author:

katerina

Message:

Fix for tickets #386 (silent check) and #387 (linux audit support).

File:

• trunk/src/sh_files.c (modified) (8 diffs)

trunk/src/sh_files.c

@@ -393 +393 @@
                 if (tmp == NULL) 
                   tmp = sh_util_safe_name (ptr->name);
-                sh_error_handle ((ptr->class == SH_LEVEL_ALLIGNORE) ? 
-                                 ShDFLevel[ptr->class] : 
-                                 ShDFLevel[SH_ERR_T_FILE],
-                                 FIL__, __LINE__, 0, MSG_FI_MISS,
-                                 tmp);
+                if (!sh_global_check_silent)
+                  sh_error_handle ((ptr->class == SH_LEVEL_ALLIGNORE) ? 
+                                   ShDFLevel[ptr->class] : 
+                                   ShDFLevel[SH_ERR_T_FILE],
+                                   FIL__, __LINE__, 0, MSG_FI_MISS,
+                                   tmp);
                 ++sh.statistics.files_report;
               }
@@ -447 +448 @@
                     if (tmp == NULL) 
                       tmp = sh_util_safe_name (ptr->name);
-                    sh_error_handle ((ptr->class == SH_LEVEL_ALLIGNORE)? 
-                                     ShDFLevel[ptr->class] : 
-                                     ShDFLevel[SH_ERR_T_FILE],
-                                     FIL__, __LINE__, 0, MSG_FI_MISS,
-                                     tmp);
+                    if (!sh_global_check_silent)
+                      sh_error_handle ((ptr->class == SH_LEVEL_ALLIGNORE)? 
+                                       ShDFLevel[ptr->class] : 
+                                       ShDFLevel[SH_ERR_T_FILE],
+                                       FIL__, __LINE__, 0, MSG_FI_MISS,
+                                       tmp);
                     ++sh.statistics.files_report;
                   }
@@ -953 +955 @@
         else if (0 == strcmp(myword, _("TXT")))
           sh_files_set_mask (mask, MODI_TXT, act);
-/* get content */
+/* get audit report */
         else if (0 == strcmp(myword, _("AUDIT")))
           sh_files_set_mask (mask, MODI_AUDIT, act);
@@ -1157 +1159 @@
       if (MODI_AUDIT_ENABLED(check_flags))
         {
+          sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, 0, MSG_E_SUBGPATH,
+                          _("Setting audit watch"),
+                          _("sh_files_push_file_int"), str_s);
           sh_audit_mark(str_s);
         }
@@ -1577 +1582 @@
                                               ShDFLevel[SH_ERR_T_DIR])) {
                     tmp = sh_util_safe_name (ptr->name);
-                    sh_error_handle ((ptr->class == SH_LEVEL_ALLIGNORE) ? 
-                                     ShDFLevel[ptr->class] : 
-                                     ShDFLevel[SH_ERR_T_DIR], FIL__, __LINE__,
-                                     0, MSG_FI_MISS, tmp);
+                    if (!sh_global_check_silent)
+                      sh_error_handle ((ptr->class == SH_LEVEL_ALLIGNORE) ? 
+                                       ShDFLevel[ptr->class] : 
+                                       ShDFLevel[SH_ERR_T_DIR], FIL__, __LINE__,
+                                       0, MSG_FI_MISS, tmp);
                     ++sh.statistics.files_report;
                     SH_FREE(tmp);
@@ -1601 +1607 @@
                    */
                   tmp = sh_util_safe_name (ptr->name);
-                  sh_error_handle ((ptr->class == SH_LEVEL_ALLIGNORE) ? 
-                                   ShDFLevel[ptr->class] : 
-                                   ShDFLevel[SH_ERR_T_DIR],
-                                   FIL__, __LINE__, 0, MSG_FI_ADD,
-                                   tmp);
+                  if (!sh_global_check_silent)
+                    sh_error_handle ((ptr->class == SH_LEVEL_ALLIGNORE) ? 
+                                     ShDFLevel[ptr->class] : 
+                                     ShDFLevel[SH_ERR_T_DIR],
+                                     FIL__, __LINE__, 0, MSG_FI_ADD,
+                                     tmp);
                   ++sh.statistics.files_report;
                   SH_FREE(tmp);
@@ -1778 +1785 @@
       if (MODI_AUDIT_ENABLED(check_flags))
         {
+          sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, 0, MSG_E_SUBGPATH,
+                          _("Setting audit watch"),
+                          _("sh_files_push_file_int"), tail);
           sh_audit_mark(tail);
         }
@@ -2156 +2166 @@
   if (theFile->c_mode[0] != 'd') 
     { 
-      sh_error_handle (ShDFLevel[SH_ERR_T_DIR], FIL__, __LINE__, 0,
-                       MSG_FI_NODIR,
-                       tmpname);
+      if (!sh_global_check_silent)
+        sh_error_handle (ShDFLevel[SH_ERR_T_DIR], FIL__, __LINE__, 0,
+                         MSG_FI_NODIR,
+                         tmpname);
       ++sh.statistics.files_nodir;
       if (theFile->attr_string) SH_FREE(theFile->attr_string);