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

Diff for /src/usr.bin/diff/diffreg.c between version 1.45 and 1.46

version 1.45, 2003/07/29 18:38:47 version 1.46, 2003/07/31 02:53:57
Line 297 
Line 297 
         if (S_ISDIR(stb1.st_mode) != S_ISDIR(stb2.st_mode))          if (S_ISDIR(stb1.st_mode) != S_ISDIR(stb2.st_mode))
                 return (S_ISDIR(stb1.st_mode) ? D_MISMATCH1 : D_MISMATCH2);                  return (S_ISDIR(stb1.st_mode) ? D_MISMATCH1 : D_MISMATCH2);
         if (strcmp(file1, "-") == 0 && strcmp(file2, "-") == 0)          if (strcmp(file1, "-") == 0 && strcmp(file2, "-") == 0)
                 goto notsame;                  goto closem;
   
         if (flags & D_EMPTY1)          if (flags & D_EMPTY1)
                 f1 = fopen(_PATH_DEVNULL, "r");                  f1 = fopen(_PATH_DEVNULL, "r");
Line 352 
Line 352 
                 goto closem;                  goto closem;
         }          }
   
 notsame:  
         /*          /*
          * Files certainly differ at this point; set status accordingly           * Files certainly differ at this point; set status accordingly
          */           */
Line 520 
Line 519 
                 }                  }
         }          }
         close(ifd);          close(ifd);
           lseek(ofd, (off_t)0, SEEK_SET);
         return (fdopen(ofd, "r"));          return (fdopen(ofd, "r"));
 }  }
   
Legend:
Removed from v.1.45  
changed lines
  Added in v.1.46