Linux line by line diff

Diff Command in Linux

diff is a command-line utility that allows you to compare two files line by line. It can also compare the contents of directories.

The diff command is most commonly used to create a patch containing the differences between one or more files that can be applied using the patch command.

How to Use the diff Command #

The syntax for the diff command is as follows:

The diff command can display the output in several formats with the normal, context, and unified format being the most common ones. The output includes information about which lines in the files must be changed so that they become identical. If the files match, no output is produced.

To save the command output to a file, use the redirection operator:

In this article, we’ll use the following two files to explain how the diff command works:

Ubuntu Arch Linux Debian CentOS Fedora 

Kubuntu Ubuntu Debian Arch Linux Centos Fedora 

Normal Format #

In its simplest form when the diff command is run on two text files without any option, it produces an output in the normal format:

The output will look something like this:

0a1 > Kubuntu 2d2 < Arch Linux 4c4,5 < CentOS --- >Arch Linux > Centos 

The normal output format consists of one or more sections that describe the differences. Each section looks like this:

change-command < from-file-line. --- > to-file-line. 

0a1 , 2d2 and 4c4,5 are change commands. Each change command contains the following, from left to right:

• The line number or range of lines in the first file.
• A special change character.
• The line number or range of lines in the second file.

The change character can be one of the following:

The change command is followed by the complete lines that are removed ( < ) and added to the file ( >).

• 0a1 — Add line 1 of the second file at the beginning of the file1 (after the line 0 ).
  • > Kubuntu — The line from the second line that is added to the first file as described above.
  • < Arch Linux - the deleted line.
  • < CentOS - The line in the first file to be replaced.
  • — — Separator.
  • > Arch Linux and > Centos — Lines from the second file replacing the line in the first file.

  Context Format #

  When the context output format is used, the diff command displays several lines of context around the lines that differ between the files.

  The -c option tells diff to produce output in the context format:

  *** file1 2019-11-25 21:00:26.422426523 +0100 --- file2 2019-11-25 21:00:36.342231668 +0100 *************** *** 1,6 **** Ubuntu - Arch Linux Debian ! CentOS Fedora --- 1,7 ---- + Kubuntu Ubuntu Debian ! Arch Linux ! Centos Fedora 

  The output starts with the names and the timestamps if the files that are compared, and one or more sections that describe the differences. Each section looks like this:

  *************** *** from-file-line-numbers ****  from-file-line. --- to-file-line-numbers ----  to-file-line. 

  • from-file-line-numbers and to-file-line-numbers — The line numbers or comma-separated range of lines in the first and second file, respectively.
  • from-file-line and to-file-line — The lines that differ and the lines of context:
    • Lines starting with two spaces are lines of context, the lines that are the same in both files.
    • Lines starting with the minus symbol ( — ) are the lines that correspond to nothing in the second file. Lines missing in the second file.
    • Lines starting with the plus symbol ( + ) are the lines that correspond to nothing in the first file. Lines missing in the first file.
    • Lines starting with the exclamation mark ( ! ) are the lines that are changed between two files. Each group of lines starting with ! from the first file has a corresponding match in the second file.

    Let’s explain the most important parts of the output:

    • In this example we have only one section describing the differences.
    • *** 1,6 **** and — 1,7 —- tells us the range of the lines from the first and second files that are included in this section.
    • Lines Ubuntu , Debian , Fedora , and the last empty line are the same in both files. These lines are starting with double space.
    • Line — Arch Linux from the first file corresponds to nothing in the second file. Although this line also exists in the second file, the positions are different.
    • Line + Kubuntu from the second file corresponds to nothing in the first file.
    • Line ! CentOS from the first file and lines ! Arch Linux and ! CentOS from the second file are changed between the files.

    By default the number of the context lines defaults to three. To specify another number use the -C ( —contexts ) option:

    *** file1 2019-11-25 21:00:26.422426523 +0100 --- file2 2019-11-25 21:00:36.342231668 +0100 *************** *** 1,5 **** Ubuntu - Arch Linux Debian ! CentOS Fedora --- 1,6 ---- + Kubuntu Ubuntu Debian ! Arch Linux ! Centos Fedora 

    Unified Format #

    The unified output format is an improved version of the context format and produces a smaller output.

    Use the -u option to tell diff to print the output in the unified format:

    --- file1 2019-11-25 21:00:26.422426523 +0100 +++ file2 2019-11-25 21:00:36.342231668 +0100 @@ -1,6 +1,7 @@ +Kubuntu Ubuntu -Arch Linux Debian -CentOS +Arch Linux +Centos Fedora 

    The output begins with the names and the timestamps of the files and one or more sections that describe the differences. Each section takes the following form:

    *************** @@ from-file-line-numbers to-file-line-numbers @@  line-from-files. 

    • @@ from-file-line-numbers to-file-line-numbers @@ — The line number or range of the lines from the first and second files included in this section.
    • line-from-files — The lines that differ and the lines of context:
      • Lines starting with two spaces are lines of context, the lines that are the same in both files.
      • Lines starting with the minus symbol ( — ) are the lines that are removed from the first file.
      • Lines starting with the plus symbol ( + ) are the lines that are added from the first file.

      Ignore case #

      As you may notice in the above examples, the diff command is case sensitive by default.

      Use the -i option to tell diff to ignores case:

      --- file1 2019-11-25 21:00:26.422426523 +0100 +++ file2 2019-11-25 21:00:36.342231668 +0100 @@ -1,6 +1,7 @@ +Kubuntu Ubuntu -Arch Linux Debian +Arch Linux CentOS Fedora 

      Conclusion #

      Comparing text files for differences is one of the most common tasks for Linux systems administrators.

      The diff command compares files line by line. For more information, type man diff in your terminal.

      If you have any questions, please leave a comment below.

      Источник

      How can I compare two files line by line?

      The result should display the lines that are present in fileA but not in fileB.

      I tried tkdiff but since some lines are jumbled it shows many differences.

      6 Answers 6

      I can’t speak to how portable this is but I tried to cover all the bases. I did my best to replicate the two files in my testing based on your information. If you run into special character issues with sed they can be esacped in the second line of the cleanLine function.

      #!/bin/bash # compare two files and return lines in # first file that are missing in second file ProgName=$ Pid=$$ CHK_FILE="$1" REF_FILE="$2" D_BUG="$3" TMP_FILE="/tmp/REF_$.tmp" declare -a MISSING='()' m=0 scriptUsage() < cat  [-d|--debug] Lines in 'file_to_check' not present in 'reference_file' are printed to standard output. file_to_check: File being checked reference_file: File to be checked against -d|--debug: Run script in debug mode (Optional) -h|--help: Print this help message ENDUSE > # delete temp file on any exit trap 'rm $TMP_FILE > /dev/null 2>&1' EXIT #-- check args [[ $CHK_FILE == "-h" || $CHK_FILE == "--help" ]] && < scriptUsage; exit 0; >[[ -n $CHK_FILE && -n $REF_FILE ]] || < >&2 echo "Not enough arguments!"; scriptUsage; exit 1; > [[ $D_BUG == "-d" || $D_BUG == "--debug" ]] && set -x [[ -s $CHK_FILE ]] || < >&2 echo "File $CHK_FILE not found"; exit 1; > [[ -s $REF_FILE ]] || < >&2 echo "File $REF_FILE not found"; exit 1; > #-- #== edit temp file to 3 match comparison rules # copy ref file to temp for editing cp "$REF_FILE" $TMP_FILE || < >&2 echo "Unable to create temporary file"; exit 1; > # rule 3 - ignore empty lines sed -i '/^\s*$/d' $TMP_FILE # rule 1 - ignore begin/end of line spaces sed -i 's/^[[:space:]][[:space:]]*//;s/[[:space:]][[:space:]]*$//' $TMP_FILE # rule 2 - multi space/tab as single space sed -i 's/[[:space:]][[:space:]]*/ /g' $TMP_FILE #== # function to clean LINE to match 3 rules # & escape '/' and '.' for later sed command cleanLine() < var=$(echo "$1" | sed 's/^[[:space:]][[:space:]]*//;s/[[:space:]][[:space:]]*$//;s/[[:space:]][[:space:]]*/ /g') echo $var | sed 's/\//\\\//g;s/\./\\\./g' >### parse check file while IFS='' read -r LINE || [[ -n $LINE ]] do if [[ -z $LINE ]] then continue else CLN_LINE=$(cleanLine "$LINE") FOUND=$(sed -n "/$CLN_LINE/" $TMP_FILE) [[ -z $FOUND ]] && MISSING[$m]="$LINE" && ((m++)) FOUND="" fi done < "$CHK_FILE" ### #++ print missing line(s) (if any) if (( $m >0 )) then printf "\n Missing line(s) found:\n" #*SEE BELOW ON THIS for (( p=0; $p" done echo else printf "\n **No missing lines found**\n\n" fi #* using 'for p in $' causes: #* "SPACED LINES" to become: #* "SPACED" #* "LINES" when printed to stdout! #++ 

      Источник

      Читайте также:  Linux debian gui install