[BACK]Return to diff.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / diff

Diff for /src/usr.bin/diff/diff.c between version 1.56 and 1.57

version 1.56, 2010/02/21 15:24:01 version 1.57, 2010/07/16 23:27:58
Line 265 
Line 265 
                                 err(2, "%s", argv[1]);                                  err(2, "%s", argv[1]);
                 }                  }
                 print_status(diffreg(argv[0], argv[1], dflags), argv[0], argv[1],                  print_status(diffreg(argv[0], argv[1], dflags), argv[0], argv[1],
                     NULL);                      "");
         }          }
         exit(status);          exit(status);
 }  }
Line 360 
Line 360 
                 break;                  break;
         case D_COMMON:          case D_COMMON:
                 printf("Common subdirectories: %s%s and %s%s\n",                  printf("Common subdirectories: %s%s and %s%s\n",
                     path1, entry ? entry : "", path2, entry ? entry : "");                      path1, entry, path2, entry);
                 break;                  break;
         case D_BINARY:          case D_BINARY:
                 printf("Binary files %s%s and %s%s differ\n",                  printf("Binary files %s%s and %s%s differ\n",
                     path1, entry ? entry : "", path2, entry ? entry : "");                      path1, entry, path2, entry);
                 break;                  break;
         case D_DIFFER:          case D_DIFFER:
                 if (diff_format == D_BRIEF)                  if (diff_format == D_BRIEF)
                         printf("Files %s%s and %s%s differ\n",                          printf("Files %s%s and %s%s differ\n",
                             path1, entry ? entry : "",                              path1, entry, path2, entry);
                             path2, entry ? entry : "");  
                 break;                  break;
         case D_SAME:          case D_SAME:
                 if (sflag)                  if (sflag)
                         printf("Files %s%s and %s%s are identical\n",                          printf("Files %s%s and %s%s are identical\n",
                             path1, entry ? entry : "",                              path1, entry, path2, entry);
                             path2, entry ? entry : "");  
                 break;                  break;
         case D_MISMATCH1:          case D_MISMATCH1:
                 printf("File %s%s is a directory while file %s%s is a regular file\n",                  printf("File %s%s is a directory while file %s%s is a regular file\n",
                     path1, entry ? entry : "", path2, entry ? entry : "");                      path1, entry, path2, entry);
                 break;                  break;
         case D_MISMATCH2:          case D_MISMATCH2:
                 printf("File %s%s is a regular file while file %s%s is a directory\n",                  printf("File %s%s is a regular file while file %s%s is a directory\n",
                     path1, entry ? entry : "", path2, entry ? entry : "");                      path1, entry, path2, entry);
                 break;                  break;
         case D_SKIPPED1:          case D_SKIPPED1:
                 printf("File %s%s is not a regular file or directory and was skipped\n",                  printf("File %s%s is not a regular file or directory and was skipped\n",
                     path1, entry ? entry : "");                      path1, entry);
                 break;                  break;
         case D_SKIPPED2:          case D_SKIPPED2:
                 printf("File %s%s is not a regular file or directory and was skipped\n",                  printf("File %s%s is not a regular file or directory and was skipped\n",
                     path2, entry ? entry : "");                      path2, entry);
                 break;                  break;
         }          }
 }  }
Legend:
Removed from v.1.56  
changed lines
  Added in v.1.57