Changeset 491 for trunk/src/sh_dbIO.c

Timestamp:

Oct 31, 2015, 10:36:55 PM (9 years ago)

Author:

katerina

Message:

Fix for ticket #389 (libwrap) and #390 (update on FreeBSD).

File:

• trunk/src/sh_dbIO.c (modified) (4 diffs)

trunk/src/sh_dbIO.c

@@ -156 +156 @@
 {
   FILE * fdp;
-
+  
   SL_ENTER(_("sh_dbIO_setdataent_old"));
 
@@ -163 +163 @@
   if (0 != seek_sof(fdp, line, size, file))
     SL_RETURN( SL_EREAD, _("sh_dbIO_setdataent_old"));
+
+  lseek(fileno(fdp), ftello(fdp), SEEK_SET);
+
   if (0 != ftruncate(fileno(fdp), ftello(fdp)))
     {
@@ -406 +409 @@
        _("There is a record with a bad version number in the file signature database: %s\n"),
        (NULL == filepath) ? _("(null)") : filepath);
-  sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_SUBGPATH,
+  sh_error_handle((-1), file, line, 0, MSG_E_SUBGPATH,
                   _("Record with bad version number in file signature database"), 
                   _("sh_dbIO_getdataent"),
@@ -1331 +1334 @@
   if (pushdata_stdout == S_FALSE)
     {
-      sl_write           (fd,        p, sizeof(sh_filestore_t));
-      sl_write_line_fast (fd, fullpath, sl_strlen(fullpath));
-      sl_write_line_fast (fd,    lpath, sl_strlen(lpath));
+      if (SL_ENONE != sl_write (fd,        p, sizeof(sh_filestore_t)))
+        {
+          char * tmp = sh_util_safe_name(fullpath);
+          sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_SUBGPATH,
+                          _("Failed to write record to baseline database"),
+                          _("write_record"),
+                          tmp);
+          SH_FREE(tmp);
+          aud_exit(FIL__, __LINE__,  EXIT_FAILURE );
+        }
+      if (SL_ENONE != sl_write_line_fast (fd, fullpath, sl_strlen(fullpath)))
+        {
+          char * tmp = sh_util_safe_name(fullpath);
+          sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_SUBGPATH,
+                          _("Failed to write path to baseline database"),
+                          _("write_record"),
+                          tmp);
+          SH_FREE(tmp);
+          aud_exit(FIL__, __LINE__,  EXIT_FAILURE );
+        }
+      if (SL_ENONE != sl_write_line_fast (fd,    lpath, sl_strlen(lpath)))
+        {
+          char * tmp = sh_util_safe_name(fullpath);
+          sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_SUBGPATH,
+                          _("Failed to write lpath to baseline database"),
+                          _("write_record"),
+                          tmp);
+          SH_FREE(tmp);
+          aud_exit(FIL__, __LINE__,  EXIT_FAILURE );
+        }
       if (attr_string)
         sl_write_line_fast (fd, attr_string, sl_strlen(attr_string));