Diff Utility for the PC..._(re)

Tue, 26 Aug 1997 11:57:45 +0200 (MEST)

According to Orlando Llanes:
> 
> Does anybody know of a non-cryptic Diff utility for the PC?

What do you consider "non-cryptic"?  And what do you mean with "PC"?

On my PC I use GNU diff exclusively, on Linux or FreeBSD as well as
on [Caldera|DR|Novell|MS]-DOS (DJGPP); probably an OS/2 port (EMX)
also exists.

GNU diff is very configurable.  If you don't like its default output


    # diff gpc-oldgcc/p/gpc-lex.c gpc-egcs/p/gpc-lex.c
    [...]
    1966c1971
    <           error ("integer constant does not fit in integer type");
    ---
    >           error ("value does not fit in longest integer type");


use either the `-c' option to get a "context diff":


    # diff -c gpc-oldgcc/p/gpc-lex.c gpc-egcs/p/gpc-lex.c
    [...]
    *** 1963,1969 ****
              else
                {
                  /* should be effectively unreachable */
    !           error ("integer constant does not fit in integer type");
                type = integer_type_node;
              }
            TREE_TYPE (yylval.ttype) = type;
    --- 1968,1974 ----
              else
                {
                  /* should be effectively unreachable */
    !           error ("value does not fit in longest integer type");
                type = integer_type_node;
              }
            TREE_TYPE (yylval.ttype) = type;


or the `-u' option to get a "unified diff" (my preferred format):


    # diff -u gpc-oldgcc/p/gpc-lex.c gpc-egcs/p/gpc-lex.c
    [...]
    @@ -1963,7 +1968,7 @@
             else
               {
                 /* should be effectively unreachable */
    -           error ("integer constant does not fit in integer type");
    +           error ("value does not fit in longest integer type");
                type = integer_type_node;
              }
            TREE_TYPE (yylval.ttype) = type;


or type `diff --help' to get all options listed.

Hope this helps,

    Peter

 Dipl.-Phys. Peter Gerwinski, Essen, Germany, free physicist and programmer
peter.gerwinski@uni-essen.de - http://home.pages.de/~peter.gerwinski/ [970201]
 maintainer GNU Pascal [970714] - http://home.pages.de/~gnu-pascal/ [970125]

Peter Gerwinski (peter@agnes.dida.physik.uni-essen.de)