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

Diff for /src/usr.bin/cvs/commit.c between version 1.128 and 1.129

version 1.128, 2008/02/10 13:07:58 version 1.129, 2008/02/11 20:33:11
Line 446 
Line 446 
         } else if (onbranch == 1) {          } else if (onbranch == 1) {
                 b = commit_diff(cf, crev, 1);                  b = commit_diff(cf, crev, 1);
         } else {          } else {
                 if ((b = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)                  b = cvs_buf_load_fd(cf->fd);
                         fatal("cvs_commit_local: failed to load file");  
         }          }
   
         if (isnew == 0 && onbranch == 0) {          if (isnew == 0 && onbranch == 0) {
Line 557 
Line 556 
   
         if (cf->file_status == FILE_MODIFIED ||          if (cf->file_status == FILE_MODIFIED ||
             cf->file_status == FILE_ADDED) {              cf->file_status == FILE_ADDED) {
                 if ((b = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)                  b = cvs_buf_load_fd(cf->fd);
                         fatal("commit_diff: failed to load '%s'",  
                             cf->file_path);  
                 cvs_buf_write_stmp(b, p1, NULL);                  cvs_buf_write_stmp(b, p1, NULL);
                 cvs_buf_free(b);                  cvs_buf_free(b);
         } else {          } else {
Line 569 
Line 566 
         (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);          (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir);
         rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE);          rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE);
   
         if ((b = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL)          b = cvs_buf_alloc(128);
                 fatal("commit_diff: failed to create diff buf");  
   
         diff_format = D_RCSDIFF;          diff_format = D_RCSDIFF;
   
Line 602 
Line 598 
         if ((fd = open(desc_path, O_RDONLY)) == -1)          if ((fd = open(desc_path, O_RDONLY)) == -1)
                 return;                  return;
   
         bp = cvs_buf_load_fd(fd, BUF_AUTOEXT);          bp = cvs_buf_load_fd(fd);
         cvs_buf_putc(bp, '\0');          cvs_buf_putc(bp, '\0');
         desc = cvs_buf_release(bp);          desc = cvs_buf_release(bp);
   
Legend:
Removed from v.1.128  
changed lines
  Added in v.1.129