#2100 Diff stops reading files at certain position

closed-invalid
nobody
5
2012-03-04
2012-03-03
No

I am attaching two sample files. I WinMerge 2.12.4.0 (German, Unicode) diffing stops in the middle(!) of line 108 (strace_no_subshell.log, left panel) and at the end of line 110 (strace_subshell.log, right panel). I have no idea why this happens. In the left panel, the full line 108 reads:

access("/bin/bash", X_OK) = -1 ENOENT (No such file or directory)

WinMerge only shows:

access("/bin/bash", X

When using "Tools - Create patch" from the menu, the resulting patch seems to be okay, though. The corresponding hunk looks like this:

@@ -107,7 +107,7 @@
getuid() = 0
access("/bin/bash", X_OK) = -1 ENOENT (No such file or directory)
open("/etc/passwd", O_RDONLY) = 3
-ioctl(3, TIOCNXCL, 0x7fc104c8) = -1 ENOTTY (Inappropriate ioctl for device)
+ioctl(3, TIOCNXCL, 0x7f9054c8) = -1 ENOTTY (Inappropriate ioctl for device)
brk(0x4fc000) = 0x4fc000
read(3, "root:x:0:0:root:/mod/root:/bin/s"..., 4096) = 265
close(3) = 0

Discussion

  • Jochen Tucht

    Jochen Tucht - 2012-03-04

    Open the Plugins menu and switch to Manual Unpacking.

     
  • Alexander Kriegisch

    Thanks for the hint, it works as a temporary workaround until the bug is fixed. The fact remains that the two files are *not* archives, so there is no point in trying to "unpack" them. Can you comment on the root cause of the bug, please? Have you found it? Will you fix it?

     
  • Christian List

    Christian List - 2012-03-04
    • status: open --> closed-invalid
     
  • Christian List

    Christian List - 2012-03-04

    This is not a bug, it's a feature.
    It's the WatchBeginningOfLog.dll and WatchEndOfLog.dll unpackers that does what they are supposed to do whne you have automatic unpacking on.
    If you don't need this feature, then you can safely delete the two files WatchBeginningOfLog.dll and WatchEndOfLog.dll to disable it.

     

Log in to post a comment.