Merge pull request #285 from mariux64/mxvmem-maintenance

Mxvmem maintenance
mariux64 · Dec 7, 2022 · 08dbbfb · 08dbbfb
2 parents a5fe6e8 + 8d9c2f5
commit 08dbbfb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mxvmem/mxvmem → forensics/mxvmem b/mxvmem/mxvmem → forensics/mxvmem
@@ -110,7 +110,7 @@ class ProcBuffer():
   def readfile(self, fn):
     lines = 0
     try:
-      f = open(fn)
+      f = open(fn, errors='backslashreplace')
     except (FileNotFoundError, PermissionError): # do nothing
       return 0
     for line in f:
@@ -155,7 +155,7 @@ class ProcInfo(ProcInfoBase):
 class ProcInfoSaved(ProcInfoBase): # aka forensics
   ''' Read from forensics file. '''
   def __init__(self, logfile):
-    self.file = open(logfile)
+    self.file = open(logfile, errors='backslashreplace')
     self.source = logfile
 
   def __next__(self):

diff --git a/install.sh b/install.sh
@@ -254,7 +254,7 @@ install_exec forensics/forensicsd                         "$DESTDIR$usr_sbindir/
 install_data forensics/forensicsd.service                 "$DESTDIR$systemdunitdir/forensicsd.service"
 install_data forensics/forensicsd.timer                   "$DESTDIR$systemdunitdir/forensicsd.timer"
 install_data misc_etc_files/modprobe.d/ixgbe_sfp.conf     "$DESTDIR$sysconfdir/modprobe.d/ixgbe_sfp.conf"
-install_exec mxvmem/mxvmem                                "$DESTDIR$usr_bindir/mxvmem"
+install_exec forensics/mxvmem                             "$DESTDIR$usr_bindir/mxvmem"
 install_data misc_systemd_units/sshd.service              "$DESTDIR$systemdunitdir/sshd.service"
 install_data misc_systemd_units/pacbio-sshd.service       "$DESTDIR$systemdunitdir/pacbio-sshd.service"