[bug-diffutils] bug#64811: Win-version now broken

[Gisle Vanem]

Bruno Haible wrote:

> I took a stab at it and attempted to compile diffutils with mingw 10.0.0
> and with MSVC 14.30. Here are the compilation errors and link errors that
> I encountered. I'm attaching a fix for all issues. With it, the build
> succeeds, and there are
>    - 13 test failures on mingw,
>    - 14 test failures on MSVC.

But does a recursive diff work for you now (on Windows)?
Like:
     diff --recursive <rel-dir-1> <rel-dir-2>



Paul Eggert wrote:

  > A few minutes ago I also installed a patch that causes diff -r to use
  > readlinkat instead of readlink

Tried it, still the same error. And also this new issue;
with a trailing '\', e.g. this fails:
     diff.exe -r -u3 -Hb  %CD% %CD%\Git-latest\

with:
     diff.exe: F:\MinGW32\src\gnu\GNU-diff\Git-latest\: No such file or 
directory

('%CD%' is an internal shell-variable for CWD)

But this works for one level only:
     diff.exe -r -u3 -Hb %CD% %CD%\Git-latest

giving:
     Only in F:\MinGW32\src\gnu\GNU-diff\Git-latest: .git
     Only in F:\MinGW32\src\gnu\GNU-diff\Git-latest: .gitignore
     Only in F:\MinGW32\src\gnu\GNU-diff\Git-latest: .gitmodules
     Only in F:\MinGW32\src\gnu\GNU-diff\Git-latest: .prev-version
     Only in F:\MinGW32\src\gnu\GNU-diff: backup
     Only in F:\MinGW32\src\gnu\GNU-diff: check-for-unused-libs.py
     Only in F:\MinGW32\src\gnu\GNU-diff: clang-cl.args
     Only in F:\MinGW32\src\gnu\GNU-diff: diff.exe
     Only in F:\MinGW32\src\gnu\GNU-diff: diff.map
     Only in F:\MinGW32\src\gnu\GNU-diff: diff.pdb
     diff.exe: F:\MinGW32\src\gnu\GNU-diff/doc: No such file or directory
     diff.exe: F:\MinGW32\src\gnu\GNU-diff\Git-latest/doc: No such file or 
directory
     Only in F:\MinGW32\src\gnu\GNU-diff: Git-latest
     Only in F:\MinGW32\src\gnu\GNU-diff\Git-latest: GnuDiff.diff
     diff.exe: F:\MinGW32\src\gnu\GNU-diff/gnulib: No such file or directory
     ...


I also have to state, that merging these patches by hand (since
I've done a lot of private patches to 'src/*.c'), is very hard
due to your and my editors. I use visible TABs at 4 spaces (due
to GNU-make etc.)

Not sure if the attachment of my 'GnuDiff.diff' comes through.
Otherwise it's here:
    http://www.watt-32.net/misc/gnudiff-diff-before.jpg

Clear and understandable?

PS. this is the "after-diff" of the block above and *without*
'--ignore-space-change' printed with '--color':
   http://www.watt-32.net/misc/gnudiff-diff-before.jpg

So if these before and after diffs would be more similar,
I'd be happy.

--
--gv

gnudiff-diff-before.jpg
Description: JPEG image

gnudiff-diff-after.jpg
Description: JPEG image