[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.35 and 1.36

version 1.35, 2003/07/17 21:54:28 version 1.36, 2003/07/21 15:56:48
Line 77 
Line 77 
 #include <errno.h>  #include <errno.h>
 #include <fcntl.h>  #include <fcntl.h>
 #include <libgen.h>  #include <libgen.h>
   #include <stddef.h>
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
 #include <string.h>  #include <string.h>
Line 163 
Line 164 
         int value;          int value;
 } *file[2];  } *file[2];
   
   /*
    * The following struct is used to record change information when
    * doing a "context" or "unified" diff.  (see routine "change" to
    * understand the highly mnemonic field names)
    */
   struct context_vec {
           int a;                  /* start line in old file */
           int b;                  /* end line in old file */
           int c;                  /* start line in new file */
           int d;                  /* end line in new file */
   };
   
 static int  *J;                 /* will be overlaid on class */  static int  *J;                 /* will be overlaid on class */
 static int  *class;             /* will be overlaid on file[0] */  static int  *class;             /* will be overlaid on file[0] */
 static int  *klist;             /* will be overlaid on file[0] after class */  static int  *klist;             /* will be overlaid on file[0] after class */
Line 178 
Line 191 
 static struct cand *clist;      /* merely a free storage pot for candidates */  static struct cand *clist;      /* merely a free storage pot for candidates */
 static struct line *sfile[2];   /* shortened by pruning common prefix/suffix */  static struct line *sfile[2];   /* shortened by pruning common prefix/suffix */
 static u_char *chrtran;         /* translation table for case-folding */  static u_char *chrtran;         /* translation table for case-folding */
   static struct context_vec *context_vec_start;
   static struct context_vec *context_vec_end;
   static struct context_vec *context_vec_ptr;
   
 static FILE *opentemp(const char *);  static FILE *opentemp(const char *);
 static void fetch(long *, int, int, FILE *, char *, int);  static void fetch(long *, int, int, FILE *, char *, int);
Line 272 
Line 288 
         pid_t pid = -1;          pid_t pid = -1;
   
         anychange = 0;          anychange = 0;
           context_vec_ptr = context_vec_start - 1;
         chrtran = (iflag ? cup2low : clow2low);          chrtran = (iflag ? cup2low : clow2low);
         if (S_ISDIR(stb1.st_mode) != S_ISDIR(stb2.st_mode))          if (S_ISDIR(stb1.st_mode) != S_ISDIR(stb2.st_mode))
                 return (D_MISMATCH);                  return (D_MISMATCH);
Line 908 
Line 925 
 }  }
   
 /*  /*
  * The following struct is used to record change information when  
  * doing a "context" or "unified" diff.  (see routine "change" to  
  * understand the highly mnemonic field names)  
  */  
 struct context_vec {  
         int a;                  /* start line in old file */  
         int b;                  /* end line in old file */  
         int c;                  /* start line in new file */  
         int d;                  /* end line in new file */  
 };  
   
 struct context_vec *context_vec_start, *context_vec_end, *context_vec_ptr;  
   
 #define MAX_CONTEXT     128  
   
 /*  
  * Indicate that there is a difference between lines a and b of the from file   * Indicate that there is a difference between lines a and b of the from file
  * to get to lines c to d of the to file.  If a is greater then b then there   * to get to lines c to d of the to file.  If a is greater then b then there
  * are no lines in the from file involved and this means that there were   * are no lines in the from file involved and this means that there were
Line 933 
Line 934 
 static void  static void
 change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d)  change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d)
 {  {
           static size_t max_context = 64;
   
         if (format != D_IFDEF && a > b && c > d)          if (format != D_IFDEF && a > b && c > d)
                 return;                  return;
         if (anychange == 0) {          if (format == D_CONTEXT || format == D_UNIFIED) {
                 anychange = 1;                  /*
                 if (format == D_CONTEXT || format == D_UNIFIED) {                   * Allocate change records as needed.
                    */
                   if (context_vec_ptr == context_vec_end - 1) {
                           ptrdiff_t offset = context_vec_ptr - context_vec_start;
                           max_context <<= 1;
                           context_vec_start = erealloc(context_vec_start,
                               max_context * sizeof(struct context_vec));
                           context_vec_end = context_vec_start + max_context;
                           context_vec_ptr = context_vec_start + offset;
                   }
                   if (anychange == 0) {
                           /*
                            * Print the context/unidiff header first time through.
                            */
                         printf("%s %s   %s", format == D_CONTEXT ? "***" : "---",                          printf("%s %s   %s", format == D_CONTEXT ? "***" : "---",
                            file1, ctime(&stb1.st_mtime));                             file1, ctime(&stb1.st_mtime));
                         printf("%s %s   %s", format == D_CONTEXT ? "---" : "+++",                          printf("%s %s   %s", format == D_CONTEXT ? "---" : "+++",
                             file2, ctime(&stb2.st_mtime));                              file2, ctime(&stb2.st_mtime));
                         if (context_vec_start == NULL)                          anychange = 1;
                                 context_vec_start = emalloc(MAX_CONTEXT *                  } else if (a > context_vec_ptr->b + (2 * context) &&
                                     sizeof(struct context_vec));                      c > context_vec_ptr->d + (2 * context)) {
                         context_vec_end = context_vec_start + MAX_CONTEXT;                          /*
                         context_vec_ptr = context_vec_start - 1;                           * If this change is more than 'context' lines from the
                 }                           * previous change, dump the record and reset it.
         }                           */
         if (format == D_CONTEXT || format == D_UNIFIED) {  
                 /*  
                  * If this new change is within 'context' lines of  
                  * the previous change, just add it to the change  
                  * record.  If the record is full or if this  
                  * change is more than 'context' lines from the previous  
                  * change, dump the record, reset it & add the new change.  
                  */  
                 if (context_vec_ptr >= context_vec_end ||  
                     (context_vec_ptr >= context_vec_start &&  
                     a > (context_vec_ptr->b + 2 * context) &&  
                     c > (context_vec_ptr->d + 2 * context))) {  
                         if (format == D_CONTEXT)                          if (format == D_CONTEXT)
                                 dump_context_vec(f1, f2);                                  dump_context_vec(f1, f2);
                         else                          else
Line 973 
Line 977 
                 context_vec_ptr->d = d;                  context_vec_ptr->d = d;
                 return;                  return;
         }          }
           if (anychange == 0)
                   anychange = 1;
         switch (format) {          switch (format) {
   
         case D_NORMAL:          case D_NORMAL:
Legend:
Removed from v.1.35  
changed lines
  Added in v.1.36