Changeset 5 for trunk

Timestamp:

Dec 22, 2005, 11:52:26 PM (19 years ago)

Author:

rainer

Message:

Fixed a stupid bug in sh_files.c; released as 2.1.1a

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_error.c (modified) (1 diff)
• src/sh_files.c (modified) (7 diffs)
• src/slib.c (modified) (3 diffs)

trunk/configure.ac

@@ -37 +37 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.1.1)
+AM_INIT_AUTOMAKE(samhain, 2.1.1a)
 AC_CANONICAL_HOST
 

trunk/docs/Changelog

@@ -1 +1 @@
 
-2.1.1:
+2.1.1a (22-12-2005):
+        * fixed a stupid bug in sh_files.c (break if file = dir)
+
+2.1.1 (21-12-2005):
         * sh_calls.c: protect sh_calls_set_bind_addr against overriding
         * comINSTALL, updateDB: use locking

trunk/src/sh_error.c

@@ -1536 +1536 @@
                              SH_ERR_STAMP | SH_ERR_ERR    | SH_ERR_SEVERE |
                              SH_ERR_FATAL);
+  flag_err_info           = SL_TRUE;
 #endif
   errFlags.exportlevel    = (SH_ERR_STAMP | SH_ERR_ERR    | SH_ERR_SEVERE |

trunk/src/sh_files.c

@@ -941 +941 @@
                   dst_ptr->checked = S_TRUE;
                   status           = S_TRUE;
-                  break;
                 }
               else
                 {
                   status           = S_TRUE;
-                  break;
                 }
             }
@@ -1618 +1616 @@
         checked_flag       = dst_ptr->checked;
         cchecked_flag      = dst_ptr->childs_checked;
-        break;
       }
 
@@ -1634 +1631 @@
             checked_flag       = dst_ptr->checked;
             cchecked_flag      = dst_ptr->childs_checked;
-            break;
           }
       }
@@ -1649 +1645 @@
         checked_flag       = dst_ptr->checked;
         cchecked_flag      = dst_ptr->childs_checked;
-        break;
       }
     
@@ -1725 +1720 @@
                 cchecked_flag = dst_ptr->childs_checked;
                 checked_flag  = dst_ptr->checked;
-                break;
               }
             
@@ -1743 +1737 @@
                     cchecked_flag = dst_ptr->childs_checked;
                     checked_flag  = dst_ptr->checked;
-                    break;
                   }
               }
@@ -2157 +2150 @@
     aud_exit(FIL__, __LINE__, EXIT_FAILURE);
 
+
   /*
   retval = sh_files_test_double (zfileList,   NULL);

trunk/src/slib.c

@@ -2160 +2160 @@
         {
           byteread = read (fd, buf, count);
-          if (byteread > 0) 
+          if (byteread != -1 && byteread != 0) 
             {
               bytes += byteread; count -= byteread;
@@ -2252 +2252 @@
         }  
     } while ( byteread > 0 || 
-              ( byteread < 0 && (errno == EINTR || errno == EAGAIN)) 
+              ( byteread == -1 && (errno == EINTR || errno == EAGAIN)) 
               );
 
@@ -2297 +2297 @@
           return (byteread);
         }  
-    } while ( byteread < 0 && (errno == EINTR || errno == EAGAIN));
+    } while ( byteread == -1 && (errno == EINTR || errno == EAGAIN));