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

Diff for /src/usr.bin/cvs/diff3.c between version 1.25 and 1.26

version 1.25, 2006/06/14 14:10:50 version 1.26, 2006/07/08 09:25:44
Line 188 
Line 188 
         diffb = cvs_buf_alloc((size_t)128, BUF_AUTOEXT);          diffb = cvs_buf_alloc((size_t)128, BUF_AUTOEXT);
   
         strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));          strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));
         cvs_buf_write_stmp(b1, path1, 0600, NULL);          cvs_buf_write_stmp(b1, path1, NULL);
   
         strlcpy(path2, "/tmp/diff2.XXXXXXXXXX", sizeof(path2));          strlcpy(path2, "/tmp/diff2.XXXXXXXXXX", sizeof(path2));
         cvs_buf_write_stmp(b2, path2, 0600, NULL);          cvs_buf_write_stmp(b2, path2, NULL);
   
         strlcpy(path3, "/tmp/diff3.XXXXXXXXXX", sizeof(path3));          strlcpy(path3, "/tmp/diff3.XXXXXXXXXX", sizeof(path3));
         cvs_buf_write_stmp(b3, path3, 0600, NULL);          cvs_buf_write_stmp(b3, path3, NULL);
   
         cvs_buf_free(b2);          cvs_buf_free(b2);
         b2 = NULL;          b2 = NULL;
Line 203 
Line 203 
         cvs_diffreg(path2, path3, d2);          cvs_diffreg(path2, path3, d2);
   
         strlcpy(dp13, "/tmp/d13.XXXXXXXXXX", sizeof(dp13));          strlcpy(dp13, "/tmp/d13.XXXXXXXXXX", sizeof(dp13));
         cvs_buf_write_stmp(d1, dp13, 0600, NULL);          cvs_buf_write_stmp(d1, dp13, NULL);
   
         cvs_buf_free(d1);          cvs_buf_free(d1);
         d1 = NULL;          d1 = NULL;
   
         strlcpy(dp23, "/tmp/d23.XXXXXXXXXX", sizeof(dp23));          strlcpy(dp23, "/tmp/d23.XXXXXXXXXX", sizeof(dp23));
         cvs_buf_write_stmp(d2, dp23, 0600, NULL);          cvs_buf_write_stmp(d2, dp23, NULL);
   
         cvs_buf_free(d2);          cvs_buf_free(d2);
         d2 = NULL;          d2 = NULL;

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.26