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

Diff for /src/usr.bin/diff/diffdir.c between version 1.8 and 1.9

version 1.8, 2003/06/25 03:39:23 version 1.9, 2003/06/25 03:44:49
Line 84 
Line 84 
 static void scanpr(struct dir *, int, char *, char *, char *, char *, char *);  static void scanpr(struct dir *, int, char *, char *, char *, char *, char *);
 static int entcmp(const void *, const void *);  static int entcmp(const void *, const void *);
   
   
 void  void
 diffdir(char **argv)  diffdir(char **argv)
 {  {
         struct dir *d1, *d2;  
         struct dir *dir1, *dir2;          struct dir *dir1, *dir2;
         int i;          struct dir *d1, *d2;
         int cmp;          int i, cmp;
   
         if (opt == D_IFDEF) {          if (opt == D_IFDEF) {
                 fprintf(stderr, "diff: can't specify -I with directories\n");                  fprintf(stderr, "diff: can't specify -I with directories\n");
Line 268 
Line 266 
 static void  static void
 compare(struct dir *dp)  compare(struct dir *dp)
 {  {
         int i, j;  
         int f1, f2, fmt1, fmt2;  
         struct stat stb1, stb2;  
         char buf1[BUFSIZ], buf2[BUFSIZ];          char buf1[BUFSIZ], buf2[BUFSIZ];
           int i, j, f1, f2, fmt1, fmt2;
           struct stat stb1, stb2;
   
         strcpy(efile1, dp->d_entry);          strcpy(efile1, dp->d_entry);
         strcpy(efile2, dp->d_entry);          strcpy(efile2, dp->d_entry);
Line 361 
Line 358 
 static void  static void
 calldiff(char *wantpr)  calldiff(char *wantpr)
 {  {
         int pid, lstatus, lstatus2, pv[2];          int lstatus, lstatus2, pv[2];
           pid_t pid;
   
         prargs[2] = wantpr;          prargs[2] = wantpr;
         fflush(stdout);          fflush(stdout);
Line 420 
Line 418 
 int  int
 ascii(int f)  ascii(int f)
 {  {
         char buf[BUFSIZ];          char buf[BUFSIZ], *cp;
         int cnt;          int cnt;
         char *cp;  
   
         lseek(f, (off_t)0, SEEK_SET);          lseek(f, (off_t)0, SEEK_SET);
         cnt = read(f, buf, BUFSIZ);          cnt = read(f, buf, BUFSIZ);

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9